add proguard optimization

Author: NikkyAI

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     kotlin("plugin.power-assert")
 //    kotlin("plugin.parcelize")
     id("dev.reformator.stacktracedecoroutinator")
-    id("org.bytedeco.gradle-javacpp-platform") version "1.5.10"
+//    id("org.bytedeco.gradle-javacpp-platform") version "1.5.10"
 }
 
 //val appVersionCode = 1
@@ -24,6 +24,14 @@ repositories {
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     google()
 }
+
+java {
+    toolchain {
+        vendor = JvmVendorSpec.ADOPTIUM
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 kotlin {
     jvm("desktop")
     sourceSets {
@@ -34,7 +42,7 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.material3)
-////            implementation(compose.material3AdaptiveNavigationSuite)
+            implementation(compose.material3AdaptiveNavigationSuite)
             implementation(compose.materialIconsExtended)
 //            implementation(compose.material3AdaptiveNavigationSuite)
 
@@ -54,19 +62,23 @@ kotlin {
         }
 
         desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
+            implementation(compose.desktop.currentOs){
+                exclude("org.jetbrains.compose.material")
+            }
 
             implementation(Kotlin.stdlib)
             implementation(Kotlin.stdlib.common)
 
             implementation(KotlinX.coroutines.core)
+            // explicit include to fix proguard warning
+            implementation(KotlinX.serialization.core)
             implementation(KotlinX.serialization.json)
             implementation(KotlinX.datetime)
 
             implementation(Ktor.client.core)
             implementation(Ktor.client.json)
             implementation(Ktor.client.cio)
-            implementation("io.ktor:ktor-network:_")
+//            implementation("io.ktor:ktor-network:_")
 
 //            implementation("org.deepsymmetry:lib-carabiner:_")
 
@@ -75,20 +87,18 @@ kotlin {
 
 //            implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:_")
 
-            // MIDI xperiments.. WIP
-            implementation("dev.atsushieno:ktmidi:_")
-            implementation("dev.atsushieno:ktmidi-jvm-desktop:_")
-            api("dev.atsushieno:libremidi-javacpp:_")
-            api("dev.atsushieno:libremidi-javacpp-platform:_")
+            // MIDI experiments.. WIP
+//            implementation("dev.atsushieno:ktmidi:_")
+//            implementation("dev.atsushieno:ktmidi-jvm-desktop:_")
+//            api("dev.atsushieno:libremidi-javacpp:_")
+//            api("dev.atsushieno:libremidi-javacpp-platform:_")
 
             implementation("io.github.pdvrieze.xmlutil:serialization:_")
 //            implementation("com.ryanharter.kotlinx.serialization:kotlinx-serialization-xml:_")
             implementation("io.github.xn32:json5k:_")
 
             implementation("com.github.doyaaaaaken:kotlin-csv-jvm:_")
 
-            implementation("io.obs-websocket.community:client:_")
-
             implementation("io.github.cdimascio:dotenv-kotlin:_")
 
             implementation("io.github.oshai:kotlin-logging:_")
@@ -98,12 +108,16 @@ kotlin {
 
             implementation("io.github.kdroidfilter:platformtools.core:_")
             implementation("io.github.kdroidfilter:platformtools.appmanager:_")
-            implementation("io.github.kdroidfilter:platformtools.releasefetcher:_")
+            implementation("io.github.kdroidfilter:platformtools.releasefetcher:_") {
+                exclude("org.slf4j", "slf4j-simple")
+            }
             implementation("io.github.kdroidfilter:platformtools.darkmodedetector:_")
             implementation("io.github.kdroidfilter:platformtools.permissionhandler:_")
 
             implementation("org.jetbrains.kotlinx:kotlinx-coroutines-debug:_")
-            implementation("dev.reformator.stacktracedecoroutinator:stacktrace-decoroutinator-jvm-legacy:_")
+            implementation("io.projectreactor.tools:blockhound:_")
+
+//            implementation("dev.reformator.stacktracedecoroutinator:stacktrace-decoroutinator-jvm-legacy:_")
 
             // Include the Test API
 //    testImplementation(compose.desktop.uiTestJUnit4)
@@ -166,10 +180,14 @@ compose.desktop {
     application {
         buildTypes.release {
             proguard {
-                isEnabled = false
-                version = "7.4.0" // may break with compose-navigation
+                // isEnabled = false
+                version = "7.7.0"
 //                optimize = false
 //                obfuscate = false
+
+                configurationFiles.from(
+                    project.file("compose-desktop.pro")
+                )
             }
         }
         mainClass = "Main"
@@ -179,7 +197,9 @@ compose.desktop {
         )
         jvmArgs += listOf(
             "-Xmx1G",
-            "--add-opens", "java.base/java.lang=ALL-UNNAMED"
+            "--add-opens", "java.base/java.lang=ALL-UNNAMED",
+            // required by blockhound
+            "-XX:+AllowRedefinitionToAddDeleteMethods",
         )
 
 //        nativeDistributions {
@@ -208,7 +228,7 @@ compose.desktop {
 //                TargetFormat.Exe,
 //                TargetFormat.Deb,
             )
-            packageName = "moe.nikky.nestctrl"
+            packageName = "nestctrl"
             packageVersion = appVersion
             vendor = "nikkyai"
 //            this.vendor = null
@@ -249,7 +269,7 @@ project.afterEvaluate {
         val runDistributable by getting(AbstractRunDistributableTask::class) {
 //            appImageRootDir.
         }
-        val packageJar by creating {
+        val packageJar by registering {
             group = "package"
             dependsOn(getByName("packageUberJarForCurrentOS"))
             doLast {
@@ -267,8 +287,9 @@ project.afterEvaluate {
                 }
             }
         }
-        val packageDistributable by creating(Zip::class) {
+        val packageDistributable by registering(Zip::class) {
             group = "package"
+//            from(createDistributable)
             from(createReleaseDistributable)
             from(project.file("README.md"))
             archiveBaseName.set("nestctrl")
@@ -288,7 +309,7 @@ project.afterEvaluate {
 //                }
 //            }
         }
-        val deployDistributable by creating(Copy::class) {
+        val deployDistributable by registering(Copy::class) {
             group = "package"
             doFirst {
                 File(System.getProperty("user.home")).resolve("VJ").resolve("nestctrl").deleteRecursively()

compose-desktop.pro

@@ -0,0 +1,81 @@
+# from: https://github.com/Anamorphosee/stacktrace-decoroutinator#using-proguard
+-keep @kotlin.coroutines.jvm.internal.DebugMetadata class * { *; }
+-keep @dev.reformator.stacktracedecoroutinator.provider.DecoroutinatorTransformed class * { *; }
+
+
+
+# from: https://github.com/java-native-access/jna/issues/1187#issuecomment-626251894
+-keep class com.sun.jna.** { *; }
+-keep class * implements com.sun.jna.** { *; }
+
+
+
+# from: https://github.com/JetBrains/compose-multiplatform/issues/4883#issuecomment-2156012785
+-keep class androidx.compose.runtime.** { *; }
+-keep class androidx.collection.** { *; }
+-keep class androidx.lifecycle.** { *; }
+-keep class androidx.compose.ui.text.platform.ReflectionUtil { *; }
+
+# We're excluding Material 2 from the project as we're using Material 3
+-dontwarn androidx.compose.material.**
+
+# Kotlinx coroutines rules seems to be outdated with the latest version of Kotlin and Proguard
+-keep class kotlinx.coroutines.** { *; }
+
+
+
+# from: https://github.com/Kotlin/kotlinx.serialization/issues/2719#issuecomment-2189193638
+-keepclassmembers public class **$$serializer {
+    private ** descriptor;
+}
+
+# attempting to fix json5k
+-keep class io.github.xn32.json5k.** { *; }
+
+# -keepattributes *Annotation*
+
+# -keepclassmembers public class **$$serializer$annotationImpl$** {
+#     private ** value;
+#     private ** namespace;
+#     private ** prefix;
+# }
+#
+#
+# -keep @nl.adaptivity.xmlutil.serialization.XmlSerialName public class *
+
+## remove some stupid warnings for things we do not use
+-dontwarn jakarta.**
+-dontwarn org.tukaani.xz.**
+-dontwarn lombok.**
+-dontwarn edu.umd.cs.findbugs.**
+-dontwarn org.junit.**
+-dontwarn org.codehaus.commons.**
+-dontwarn org.codehaus.janino.**
+-dontwarn com.oracle.svm.**
+-dontwarn javax.servlet.**
+-dontwarn org.eclipse.jetty.**
+-dontwarn ch.qos.cal10n.**
+-dontwarn javassist.**
+
+# -dontwarn reactor.blockhound.**
+-dontwarn javassist.**
+
+# logging
+
+-keep public class org.slf4j.** { *; }
+-keep public class ch.** { *; }
+
+# blockhound
+-dontnote reactor.blockhound
+-dontwarn reactor.blockhound
+# -keep class reactor.blockhound.** { *; }
+-dontwarn reactor.core.scheduler.NonBlocking
+-dontwarn io.reactivex.internal.schedulers.NonBlockingThread
+-dontwarn **.AutoService
+-dontwarn javax.annotation.**
+
+-printmapping mapping.txt
+# -dontoptimize
+
+
+-ignorewarnings

settings.gradle.kts

@@ -37,4 +37,10 @@ dependencyResolutionManagement {
 plugins {
     // See https://jmfayard.github.io/refreshVersions
     id("de.fayard.refreshVersions") version "0.60.5"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+////                                                   # available:"0.6.0"
+////                                                   # available:"0.7.0"
+////                                                   # available:"0.8.0"
+////                                                   # available:"0.9.0"
+////                                                   # available:"0.10.0"
 }

src/desktopMain/kotlin/Config.kt

@@ -17,7 +17,7 @@ import kotlinx.serialization.Serializable
 import nestdrop.deck.Deck
 import nestdrop.deck.applyConfig
 import nestdrop.deck.configFlow
-import obs.LOOM
+import utils.LOOM
 import tags.PresetPlaylist
 import ui.screens.customSearches
 import utils.prettyPrint

src/desktopMain/kotlin/Main.kt

@@ -27,12 +27,12 @@ import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.awaitApplication
 import androidx.compose.ui.window.rememberDialogState
 import androidx.compose.ui.window.rememberWindowState
-import dev.reformator.stacktracedecoroutinator.runtime.DecoroutinatorRuntime
 import io.github.kdroidfilter.platformtools.appmanager.WindowsInstallerConfig
 import io.github.kdroidfilter.platformtools.darkmodedetector.isSystemInDarkMode
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.debug.CoroutinesBlockHoundIntegration
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flowOn
@@ -53,9 +53,11 @@ import nestdrop.watchNestdropConfig
 import org.jetbrains.compose.resources.painterResource
 import osc.runNestDropSend
 import osc.startNestdropOSC
+import reactor.blockhound.BlockHound
 import tags.startTagsFileWatcher
 import ui.App
 import ui.components.verticalScroll
+import utils.className
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.time.Duration.Companion.milliseconds
@@ -77,8 +79,19 @@ val decks = List(4) { index ->
     }
 }.filterNotNull()
 
-object Main {
+val isObfuscated by lazy {
+    try {
+        Class.forName("tKredilSlacitreV".reversed()).also {
+            logger.info { it }
+        }
+        false
+    } catch (e: ClassNotFoundException) {
+        logger.error(e) { "failed to load class" }
+        true
+    }
+}
 
+object Main {
     @OptIn(FlowPreview::class)
     suspend fun initApplication(
         queues: Queues,
@@ -225,12 +238,28 @@ object Main {
     @JvmStatic
     fun main(args: Array<String>) {
         WindowsInstallerConfig.requireAdmin = false
-        if (dotenv.get("DEBUG", "false").toBooleanStrictOrNull() == true) {
-//        if(true) {
-            val state = DecoroutinatorRuntime.load()
-            logger.info { "enabling De-Corouti-nator: $state" }
+//        blockhound.main()
+
+        println("Main: ${Main.toString()}")
+        logger.info { Main.toString() }
+
+
+        if(!isObfuscated) {
+            logger.info { "not obfuscated" }
+            logger.info { "installing blockhound" }
+            BlockHound.install(CoroutinesBlockHoundIntegration())
+
+//            if (dotenv.get("DEBUG", "false").toBooleanStrictOrNull() == true) {
+////        if(true) {
+//                val state = DecoroutinatorRuntime.load()
+//                logger.info { "enabling De-Corouti-nator: $state" }
+//            }
+        } else {
+            logger.info { "obfuscated: ${Main.className}" }
         }
 
+
+
 //        Activator.createParserTypes().forEach { (k,v) ->
 //            logger.info { "parser $k: $v" }
 //        }