Fixing release builds (#1418)

android · Jun 28, 2024 · e0b7c30 · e0b7c30
2 parents 00f882f + 184f7c3
commit e0b7c30
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/JetNews/app/proguard-rules.pro b/JetNews/app/proguard-rules.pro
@@ -33,3 +33,5 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+-keep class androidx.compose.ui.platform.AndroidCompositionLocals_androidKt { *; }
diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts
@@ -56,7 +56,7 @@ android {
         }
 
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),

diff --git a/Jetcaster/mobile/proguard-rules.pro b/Jetcaster/mobile/proguard-rules.pro
@@ -25,9 +25,9 @@
 
 # Rome reflectively loads classes referenced in com/rometools/rome/rome.properties.
 -adaptresourcefilecontents com/rometools/rome/rome.properties
--keep,allowobfuscation class * implements com.rometools.rome.feed.synd.Converter
--keep,allowobfuscation class * implements com.rometools.rome.io.ModuleParser
--keep,allowobfuscation class * implements com.rometools.rome.io.WireFeedParser
+-keep class * implements com.rometools.rome.feed.synd.Converter
+-keep class * implements com.rometools.rome.io.ModuleParser
+-keep class * implements com.rometools.rome.io.WireFeedParser
 
 # Disable warnings for missing classes from OkHttp.
 -dontwarn org.conscrypt.ConscryptHostnameVerifier
@@ -48,3 +48,5 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+-keep class androidx.compose.ui.platform.AndroidCompositionLocals_androidKt { *; }
diff --git a/Jetchat/app/proguard-rules.pro b/Jetchat/app/proguard-rules.pro
@@ -33,3 +33,6 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+
+-keep class androidx.compose.ui.platform.AndroidCompositionLocals_androidKt { *; }
diff --git a/Jetsnack/app/proguard-rules.pro b/Jetsnack/app/proguard-rules.pro
@@ -33,3 +33,5 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+-keep class androidx.compose.ui.platform.AndroidCompositionLocals_androidKt { *; }
diff --git a/Jetsurvey/app/build.gradle.kts b/Jetsurvey/app/build.gradle.kts
@@ -37,13 +37,30 @@ android {
         }
     }
 
+    signingConfigs {
+        // Important: change the keystore for a production deployment
+        val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
+        val localKeystore = rootProject.file("debug_2.keystore")
+        val hasKeyInfo = userKeystore.exists()
+        create("release") {
+            // get from env variables
+            storeFile = if (hasKeyInfo) userKeystore else localKeystore
+            storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
+            keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
+            keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
+        }
+    }
     buildTypes {
         release {
             isMinifyEnabled = false
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+
+
+
         }
     }
     compileOptions {