From 68b37fa4a1e642ec9ba3917ea44b71f4ee7f128d Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Fri, 26 Mar 2021 20:16:10 +0800
Subject: [PATCH] [app] Add missing proguard rules (#413)

---
 app/proguard-rules.pro           | 12 ++++++++++++
 manager-service/build.gradle.kts |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 01d834a0..6c153c0d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -25,3 +25,15 @@
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.
 -keepattributes Signature,InnerClasses
+
+-dontwarn org.jetbrains.annotations.NotNull
+-dontwarn org.jetbrains.annotations.Nullable
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
\ No newline at end of file
diff --git a/manager-service/build.gradle.kts b/manager-service/build.gradle.kts
index ad00ced2..6a35baeb 100644
--- a/manager-service/build.gradle.kts
+++ b/manager-service/build.gradle.kts
@@ -50,3 +50,9 @@ android {
         targetCompatibility = androidTargetCompatibility
     }
 }
+
+configurations.all {
+    resolutionStrategy {
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+    }
+}
\ No newline at end of file