From 18867495d972126d08a89902de25e92f0d0cfc8d Mon Sep 17 00:00:00 2001
From: Infi <wingit@geist.ga>
Date: Sun, 23 Apr 2023 19:25:23 +0200
Subject: [PATCH] chore: bump to 0.2.0 and prepare release

Signed-off-by: Infi <wingit@geist.ga>
---
 app/build.gradle       |  6 +++---
 app/proguard-rules.pro | 12 +++++++++++-
 build.gradle           |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4286475e..cbd33524 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "chat.revolt"
         minSdk 24
         targetSdk 33
-        versionCode Integer.parseInt("000_001_000".replaceAll("_", ""), 10)
-        versionName "0.1.0"
+        versionCode Integer.parseInt("000_002_000".replaceAll("_", ""), 10)
+        versionName "0.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -132,10 +132,10 @@ dependencies {
 
     // KTOR - HTTP+WebSocket Library
     implementation "io.ktor:ktor-client-core:$ktor_version"
-    implementation "io.ktor:ktor-client-okhttp:$ktor_version"
     implementation "io.ktor:ktor-client-logging:$ktor_version"
     implementation "io.ktor:ktor-client-content-negotiation:$ktor_version"
     implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version"
+    implementation "io.ktor:ktor-client-okhttp:$ktor_version"
 
     // Screen Navigation
     implementation "androidx.navigation:navigation-compose:$nav_version"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index b022c270..3e2a9afd 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -57,4 +57,14 @@
 #}
 #-keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept.
 #    static <1>$$serializer INSTANCE;
-#}
\ No newline at end of file
+#}
+
+# Excerpt of https://raw.githubusercontent.com/square/okhttp/f408411/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro
+# (Licensed under Apache 2.0. No modifications.)
+# OkHttp platform used only on JVM and when Conscrypt and other security providers are available.
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+# End of excerpt.
+-dontwarn org.slf4j.impl.**
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fb21acbd..d6eaeb26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         hilt_version = '2.44'
         coil_version = '2.2.2'
         glide_version = '4.14.2'
-        ktor_version = '2.1.3'
+        ktor_version = '2.3.0'
         aboutlibraries_version = '10.5.2'
         media3_version = '1.0.1'
     }