From 03df369e0b99750fbcebc1c946d8c66b04918edd Mon Sep 17 00:00:00 2001 From: Thomas Andres Gomez Date: Fri, 28 Feb 2025 15:43:48 +0100 Subject: [PATCH] Fix coil runtine loading issue in release by disabling shrinking. --- composeApp/build.gradle.kts | 6 +----- composeApp/compose-desktop.pro | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 75bb726..1382bfa 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -66,7 +66,7 @@ compose.desktop { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "Table de Lwa" - packageVersion = "1.1.0" + packageVersion = "1.1.1" description = "Application de support au jeux de rôle dans l'univers de Lwa." copyright = "© 2020 Pixelized. All rights reserved." vendor = "Pixelized" @@ -78,10 +78,6 @@ compose.desktop { } buildTypes.release.proguard { - obfuscate.set(false) // Obfuscation doesn't work because of netty. -// optimize.set(false) -// isEnabled.set(false) - configurationFiles.from(project.file("compose-desktop.pro")) } } diff --git a/composeApp/compose-desktop.pro b/composeApp/compose-desktop.pro index d853df1..379991b 100644 --- a/composeApp/compose-desktop.pro +++ b/composeApp/compose-desktop.pro @@ -1,7 +1,7 @@ - --keep class androidx.compose.runtime.** { *; } --keep class androidx.collection.** { *; } --keep class androidx.lifecycle.** { *; } +# proguard-rules.pro +-dontoptimize +-dontobfuscate +-dontshrink # We're excluding Material 2 from the project as we're using Material 3 -dontwarn androidx.compose.material.** @@ -11,12 +11,17 @@ # OkHttp comming from COIL. -dontwarn okhttp3.internal.platform.** --keep class coil3.compose.** { *; } --keep class coil3.network.ktor3.** { *; } +-keep class coil3.** { *; } # Serialization -keep class io.ktor.serialization.kotlinx.json.** { *; } -keep class com.pixelized.shared.lwa.model.** { *; } -keep class com.pixelized.shared.lwa.protocol.rest.** { *; } -keep class com.pixelized.desktop.lwa.repository.settings.model.** { *; } --keep @kotlinx.serialization.Serializable class * { *; } \ No newline at end of file +-keep @kotlinx.serialization.Serializable class * { *; } + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} \ No newline at end of file