Fix channel creation flow issues, bump JVM & proguard

Author: hypergonial

.github/workflows/ci.yaml

@@ -14,11 +14,11 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: "Setup | JBR 21"
       uses: actions/setup-java@v4
       with:
         distribution: 'jetbrains'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
 
     - name: "Setup | Gradle"
@@ -33,11 +33,11 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: "Setup | JBR 21"
       uses: actions/setup-java@v4
       with:
         distribution: 'jetbrains'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
 
     - name: "Setup | Gradle"
@@ -52,11 +52,11 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: "Setup | JBR 21"
       uses: actions/setup-java@v4
       with:
         distribution: 'jetbrains'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
     - name: Generate and submit dependency graph
       uses: gradle/actions/dependency-submission@v4

.github/workflows/publish.yaml

@@ -28,10 +28,10 @@ jobs:
       - name: "Setup | Checkout"
         uses: actions/checkout@v4
 
-      - name: "Setup | JDK 17"
+      - name: "Setup | JDK 21"
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: 21
           distribution: 'jetbrains'
           cache: 'gradle'
         env:
@@ -83,10 +83,10 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: 21
           distribution: 'jetbrains'
           cache: 'gradle'
         env:
@@ -120,7 +120,6 @@ jobs:
           path: composeApp/build/outputs/apk/release/artifacts
           overwrite: true
 
-
   github_release:
     name: Create GitHub Release
     needs: [build-desktop, build-android]

README.md

@@ -6,7 +6,7 @@ It runs natively on Android and iOS, desktop via the JVM, and experimentally in
 
 ## Building
 
-The recommended JDK version for this project is **OpenJDK 17**. Higher versions may not work, especially in release builds due to lacking Proguard support.
+The recommended JDK version for this project is **OpenJDK 21**. Higher versions may not work, especially in release builds due to lacking Proguard support.
 
 ### Desktop
 

composeApp/build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
 }
 
 kotlin {
-    androidTarget { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } }
+    androidTarget { compilerOptions { jvmTarget.set(JvmTarget.JVM_21) } }
 
     listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach { iosTarget ->
         iosTarget.binaries.framework {
@@ -207,8 +207,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
@@ -228,6 +228,7 @@ compose.desktop {
         }
 
         buildTypes.release.proguard {
+            version.set("7.6.1")
             configurationFiles.from("proguard-desktop-rules.pro")
             joinOutputJars = true
             optimize = true
@@ -256,6 +257,7 @@ detekt {
     config.setFrom("$projectDir/detekt.yml")
     source.setFrom(
         "src/commonMain/kotlin",
+        "src/commonTest/kotlin",
         "src/androidMain/kotlin",
         "src/desktopMain/kotlin",
         "src/iosMain/kotlin",
@@ -273,6 +275,6 @@ tasks.withType<Detekt>().configureEach {
     }
 }
 
-tasks.withType<Detekt>().configureEach { jvmTarget = "17" }
+tasks.withType<Detekt>().configureEach { jvmTarget = "21" }
 
-tasks.withType<DetektCreateBaselineTask>().configureEach { jvmTarget = "17" }
+tasks.withType<DetektCreateBaselineTask>().configureEach { jvmTarget = "21" }

composeApp/proguard-desktop-rules.pro

@@ -13,7 +13,7 @@
 -keep class org.freedesktop.dbus.** { *; }
 -keep class * implements org.freedesktop.dbus.** { *; }
 
--keepclasseswithmembers public class com.hypergonial.chat.Mainkt {
+-keepclasseswithmembers public class com.hypergonial.chat.MainKt {
     public static void main(java.lang.String[]);
 }
 -keep class kotlin.** { *; }
@@ -29,6 +29,20 @@
     void sourceInformationMarkerEnd(androidx.compose.runtime.Composer);
 }
 
+# Fix for VerifyError in androidx.compose.runtime
+-keep class androidx.compose.runtime.State { *; }
+-keep class androidx.compose.runtime.DerivedSnapshotState { *; }
+-keep class androidx.compose.runtime.SnapshotStateKt { *; }
+-keep class androidx.compose.runtime.SnapshotStateKt__DerivedStateKt { *; }
+
+# Keep all implementations of State
+-keep class * implements androidx.compose.runtime.State { *; }
+
+# Keep derivedStateOf function and related classes
+-keepclassmembers class androidx.compose.runtime.** {
+    ** derivedStateOf(...);
+}
+
 # Keep all implementations of TextRangeScopeMeasurePolicy (including lambdas)
 -keep class * implements androidx.compose.foundation.text.TextRangeScopeMeasurePolicy { *; }
 

composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/MainComponent.kt

@@ -491,7 +491,7 @@ class DefaultMainComponent(
             data.value = data.value.copy(channels = (data.value.channels + event.channel).sortedBy { it.id })
 
             // Leave fallback slot if it was active
-            if (data.value.selectedChannel == null || data.value.selectedGuild != null) {
+            if (data.value.selectedChannel == null && data.value.selectedGuild != null) {
                 navigateToChannel(event.channel.id)
             }
         }

composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/prompts/CreateChannelComponent.kt

@@ -73,7 +73,7 @@ class DefaultCreateChannelComponent(
         data.value =
             data.value.copy(
                 channelName = channelName.replace(Regex("\\s+"), "_").lowercase().trim().take(32),
-                isCreateButtonEnabled = channelName.isNotBlank(),
+                isCreateButtonEnabled = channelName.length >= 3 && channelName.isNotBlank(),
             )
     }
 

composeApp/src/commonMain/kotlin/com/hypergonial/chat/view/components/prompts/CreateGuildComponent.kt

@@ -71,7 +71,7 @@ class DefaultCreateGuildComponent(
         data.value =
             data.value.copy(
                 guildName = guildName.replace(Regex("\\s+"), " ").take(32),
-                isCreateButtonEnabled = guildName.isNotBlank(),
+                isCreateButtonEnabled = guildName.length >= 3 && guildName.isNotBlank(),
             )
     }