Skip to content

Commit 4509c26

Browse files
committed
Fix proguard on desktop
1 parent 889982b commit 4509c26

File tree

3 files changed

+34
-3
lines changed

3 files changed

+34
-3
lines changed

.claude/settings.local.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
"WebFetch(domain:chrisbanes.github.io)",
5454
"WebFetch(domain:composables.com)",
5555
"mcp__XcodeBuildMCP__session_show_defaults",
56-
"mcp__XcodeBuildMCP__session_set_defaults"
56+
"mcp__XcodeBuildMCP__session_set_defaults",
57+
"WebFetch(domain:maven.pkg.jetbrains.space)",
58+
"WebFetch(domain:central.sonatype.com)"
5759
],
5860
"deny": []
5961
}

desktopApp/compose-desktop.pro

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@
186186
# Because of coil crash: Error: java.io.IOException: canceled due to java.lang.VerifyError: Bad return type
187187
-keep class okio.** { *; }
188188

189+
# Navigation3: ProGuard optimization strips class hierarchy causing VerifyError
190+
# (NavigationEventInfo not assignable to SceneInfo)
191+
-keep class androidx.navigation3.** { *; }
192+
-keep class androidx.navigationevent.** { *; }
193+
189194

190195
# ---- Targeted fixes for Kotlinx Serialization + Ktor Resources VerifyError (keep optimizations on) ----
191196
# Keep the internal descriptor class to avoid optimizer rewriting causing bad bytecode
@@ -247,6 +252,30 @@
247252
-dontnote sun.misc.Unsafe
248253
-dontwarn sun.misc.Unsafe
249254

255+
# HtmlUnit + Apache Commons Logging
256+
# Commons Logging uses reflection to find LogFactoryImpl at runtime
257+
-keep class org.apache.commons.logging.** { *; }
258+
-keep class org.htmlunit.** { *; }
259+
-dontwarn org.htmlunit.**
260+
-dontwarn org.apache.commons.logging.**
261+
262+
# HtmlUnit transitive dependencies loaded via reflection/ServiceLoader
263+
-dontwarn net.sourceforge.htmlunit.**
264+
-dontwarn org.apache.http.**
265+
-dontwarn org.eclipse.jetty.**
266+
267+
# HtmlUnit + Apache Commons Logging
268+
# Commons Logging uses reflection to find LogFactoryImpl at runtime
269+
-keep class org.apache.commons.logging.** { *; }
270+
-keep class org.htmlunit.** { *; }
271+
-dontwarn org.htmlunit.**
272+
-dontwarn org.apache.commons.logging.**
273+
274+
# HtmlUnit transitive dependencies loaded via reflection/ServiceLoader
275+
-dontwarn net.sourceforge.htmlunit.**
276+
-dontwarn org.apache.http.**
277+
-dontwarn org.eclipse.jetty.**
278+
250279
# FlatLaF Look and Feel
251280
-keep class com.formdev.flatlaf.** { *; }
252281
-keep class com.formdev.flatlaf.extras.** { *; }

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ arrow = "2.2.1.1"
1111
compose-material3 = "1.5.0-alpha15"
1212
compose-multiplatform = "1.10.2"
1313
compose-multiplatform-material3-adaptive = "1.9.0"
14-
compose-multiplatform-material3-adaptive-layout = "1.2.0"
14+
compose-multiplatform-material3-adaptive-layout = "1.3.0-alpha02"
1515
compose-multiplatform-material-icons = "1.7.3"
1616
compose-unstyled = "1.49.6"
1717
compose-webview = "2.0.3"
@@ -61,7 +61,7 @@ multiplatformMarkdownRendererM3 = "0.39.2"
6161
nav3 = "1.0.0"
6262
nav3-multiplatform = "1.0.0-alpha06"
6363
lifecycle-viewmodel-nav3 = "2.10.0"
64-
lifecycle-viewmodel-nav3-multiplatform = "2.10.0-alpha06"
64+
lifecycle-viewmodel-nav3-multiplatform = "2.10.0-beta01"
6565
org-robolectric = "4.16.1"
6666
play-review = "2.0.2"
6767
rss-parser = "6.1.4"

0 commit comments

Comments
 (0)