Move gestalt proguard rules to IDriveConnectKit

BimmerGestalt · Feb 13, 2024 · 0b30005 · 0b30005
1 parent 652076a
commit 0b30005
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -202,5 +202,5 @@ dependencies {
 
     // BimmerGestalt
     gestaltImplementation 'io.bimmergestalt:IDriveConnectKit:0.6'
-    gestaltImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.5'
+    gestaltImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.6'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -36,9 +36,3 @@
 
 # Provider API
 -keep class me.ash.reader.infrastructure.** { *; }
-
-# Apache Etch and Gestalt
--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 io.bimmergestalt.reader.carapp.* { *; }
diff --git a/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt b/app/src/gestalt/java/io/bimmergestalt/reader/carapp/ReadoutController.kt
@@ -1,6 +1,7 @@
 package io.bimmergestalt.reader.carapp
 
 import android.util.Log
+import androidx.annotation.Keep
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIApplication
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIEvent
 import io.bimmergestalt.idriveconnectkit.rhmi.RHMIModel
@@ -10,9 +11,11 @@ import kotlin.math.max
 import kotlin.math.min
 
 
+@Keep
 data class HMITTS(  // the json decoder object
 	val TTSState: TTSState
 )
+@Keep
 data class TTSState(    // the actual state
 	val state: Int?,
 	val currentblock: Int?,