Simplifies proguard by using IDriveConnectKitAndroid

BimmerGestalt · Feb 12, 2024 · c3fb4c8 · c3fb4c8
1 parent 7e8b9b9
commit c3fb4c8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -304,10 +304,10 @@ dependencies {
     androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5'
     androidTestImplementation 'org.awaitility:awaitility-scala:3.1.5'
     implementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    implementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.5'
+    implementation 'io.bimmergestalt:IDriveConnectKitAndroid:proguard-SNAPSHOT'
     testImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
     androidTestImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.2'
+    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:proguard-SNAPSHOT'
     androidTestImplementation "org.bouncycastle:bcmail-jdk16:1.46"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_version"
     testImplementation "org.powermock:powermock-core:2.0.9"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -32,16 +32,17 @@
 -keep public class * extends android.content.ContentProvider
 
 # randomly hardcoding things to make connected tests pass
--keep class kotlin.collections.** { *; }
--keep class kotlin.coroutines.** { *; }
--keep class androidx.drawerlayout.widget.** { *; }
--keep class com.google.** { *; }
+-keep class kotlin.collections.CollectionsKt
+-keep class kotlin.collections.MapsKt
+-keep class kotlin.coroutines.intrinsics.IntrinsicsKt
 -keep class io.wax911.emojify.model.Emoji { *; }
--keep class io.bimmergestalt.idriveconnectkit.rhmi.* { *; }
--keep class io.bimmergestalt.idriveconnectkit.android.security.* { *; }
--keep public class * extends org.apache.etch.bindings.java.transport.FormatFactory
 -keep class me.hufman.androidautoidrive.** { *; }
 
+# remove the null pointer checking https://stackoverflow.com/questions/33547643/how-to-use-kotlin-with-proguard
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
 -keepclasseswithmembernames class * {
     native <methods>;
 }