Fix bug preventing Android app from launching

DRSchlaubi · Nov 2, 2023 · 4f5a13a · 4f5a13a
1 parent 33cd67d
commit 4f5a13a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
@@ -43,7 +43,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = true
-            proguardFile("proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     buildFeatures {

diff --git a/app/android/proguard-rules.pro b/app/android/proguard-rules.pro
@@ -53,4 +53,6 @@
   <1>.<2>$Companion Companion;
 }
 
--dontobfuscate
+# compose
+-keep class androidx.compose.ui.text.platform.Platform { *; }
+-keep class androidx.compose.runtime.** { *; }
diff --git a/app/desktop/src/commonMain/kotlin/Main.kt b/app/desktop/src/commonMain/kotlin/Main.kt
@@ -29,7 +29,7 @@ import java.awt.Window as AWTWindow
 
 private val LOG = KotlinLogging.logger { }
 
-fun main(array: Array<String>) = start(arrayOf("tonbrett://login?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwczovL211c2lrdXMuZ3V0aWt1cy5zY2hsYXUuYmkiLCJ1c2VySWQiOjQxNjkwMjM3OTU5ODc3NDI3MywicmVmcmVzaFRva2VuIjoiVTNtdXV4WE1WTW9uQkU4RGFQOW1jRkN4dUQzMkRlIiwiZXhwIjoxNjk5NDg2NDM4fQ.lLXjSeynjaHiCXbO5lJh6fWb9rKjBfOGii9mDT-yK40"))
+fun main(array: Array<String>) = start(array)
 
 fun startApplication(forAuth: Boolean = false) = application {
     val sessionExpired = remember { mutableStateOf(false) }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.16.4"
+    version = "1.16.5"
 
     repositories {
         mavenCentral()