diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts index 533b7522..a12744ed 100644 --- a/desktopApp/build.gradle.kts +++ b/desktopApp/build.gradle.kts @@ -24,7 +24,7 @@ compose.desktop { targetFormats(TargetFormat.Dmg, TargetFormat.Pkg, TargetFormat.Msi, TargetFormat.Deb) packageName = "CPU-Info" - packageVersion = "1.9.0" + packageVersion = "1.8.1" modules("jdk.unsupported") modules("jdk.unsupported.desktop") diff --git a/desktopApp/rules.pro b/desktopApp/rules.pro index e9ecdb32..af0c0f6b 100644 --- a/desktopApp/rules.pro +++ b/desktopApp/rules.pro @@ -15,6 +15,10 @@ -keep class com.kgurgul.cpuinfo.utils.WindowsExeIconDecoder { *; } -keep class com.kgurgul.cpuinfo.utils.WindowsExeIconDecoder$* { *; } +# MacOSIconDecoder - Coil decoder for .icns files, loaded dynamically +-keep class com.kgurgul.cpuinfo.utils.MacOSIconDecoder { *; } +-keep class com.kgurgul.cpuinfo.utils.MacOSIconDecoder$* { *; } + # OSHI -keep class oshi.** { *; } -dontnote oshi.** @@ -33,5 +37,20 @@ # SLF4J -dontnote org.slf4j.** -# TwelveMonkeys +# TwelveMonkeys - ImageIO plugin for ICNS files, loaded via Java SPI +-keep class com.twelvemonkeys.** { *; } -dontnote com.twelvemonkeys.** + +# Java ImageIO SPI - keep service provider implementations +-keep class javax.imageio.** { *; } +-keepclassmembers class * implements javax.imageio.spi.ImageReaderSpi { *; } +-keepclassmembers class * implements javax.imageio.spi.ImageWriterSpi { *; } +-keepclassmembers class * extends javax.imageio.spi.IIOServiceProvider { *; } + +# Skia - used by MacOSIconDecoder for bitmap conversion +-keep class org.jetbrains.skia.** { *; } +-dontnote org.jetbrains.skia.** + +# Coil3 - image loading library, uses reflection for decoder registration +-keep class coil3.** { *; } +-dontnote coil3.**