issues and improvements (#5)

release (0.1.1) issues and improvements

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

processor/build.gradle

@@ -1,4 +1,4 @@
 apply from: "${project.rootDir}/gradle/kotlin/processor.gradle"
 
 group = 'com.kotlitecture.kotli'
-version = '0.1.0'
+version = '0.1.1'

processor/src/main/kotlin/kotli/template/multiplatform/compose/platform/android/AndroidPlatformProcessor.kt

@@ -26,6 +26,7 @@ object AndroidPlatformProcessor : PlatformProcessor() {
         state.onApplyRules(
             VersionCatalogRules(
                 RemoveMarkedLine("agp"),
+                RemoveMarkedLine("android-jvmTarget"),
                 RemoveMarkedLine("android-compileSdk"),
                 RemoveMarkedLine("android-minSdk"),
                 RemoveMarkedLine("android-targetSdk"),

processor/src/main/resources/kotli/template/multiplatform/compose/platform/android/usage.md

@@ -0,0 +1,3 @@
+## Run
+
+https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-create-first-app.html#run-your-application-on-android

processor/src/main/resources/kotli/template/multiplatform/compose/platform/ios/usage.md

@@ -0,0 +1,3 @@
+## Run
+
+https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-multiplatform-create-first-app.html#run-your-application-on-ios

processor/src/main/resources/kotli/template/multiplatform/compose/platform/js/usage.md

@@ -0,0 +1,5 @@
+## Run
+
+```
+./gradlew jsBrowserRun
+```

processor/src/main/resources/kotli/template/multiplatform/compose/platform/jvm/usage.md

@@ -0,0 +1,5 @@
+## Run
+
+```
+./gradlew run
+```

template/build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
-    alias(libs.plugins.androidApplication) apply false
-    alias(libs.plugins.androidLibrary) apply false
-    alias(libs.plugins.composeCompiler) apply false
-    alias(libs.plugins.composeMultiplatform) apply false
-    alias(libs.plugins.kotlinMultiplatform) apply false
-    alias(libs.plugins.kotlinxSerialization) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.compose.multiplatform) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlinx.serialization) apply false
 }

template/composeApp/assemble/proguard-rules.pro

@@ -7,6 +7,9 @@
 
 -dontwarn kotlinx.**
 -dontwarn org.slf4j.**
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn java.lang.management.RuntimeMXBean
 
 -keep,includedescriptorclasses class kotli.app.**$$serializer { *; }
 -keepclassmembers class kotli.app.** {

template/composeApp/build.gradle.kts

@@ -1,11 +1,11 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat // {platform.jvm}
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig // {platform.js}
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.kotlinxSerialization)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidApplication) // {platform.android}
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.compose.multiplatform)
+    alias(libs.plugins.android.application) // {platform.android}
     alias(libs.plugins.skie) // {platform.ios}
 }
 
@@ -14,7 +14,7 @@ kotlin {
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = libs.versions.android.jvmTarget.get()
             }
         }
     }
@@ -104,13 +104,16 @@ android {
         }
     }
     buildTypes {
-        getByName("release") {
+        named("release") {
+            isDebuggable = false
             isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "assemble/proguard-rules.pro")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility(libs.versions.android.jvmTarget.get())
+        targetCompatibility(libs.versions.android.jvmTarget.get())
     }
     dependencies {
         debugImplementation(libs.compose.ui.tooling)

template/gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 agp = "8.2.2"
 android-compileSdk = "34"
+android-jvmTarget = "11"
 android-minSdk = "24"
 android-targetSdk = "34"
 androidx-activity = "1.9.0"
@@ -15,10 +16,10 @@ compose-multiplatform = "1.6.10"
 junit = "4.13.2"
 koin = "3.6.0-Beta4"
 kotlin = "2.0.0"
-kotlinx-coroutines = "1.8.0"
+kotlinx-coroutines = "1.9.0-RC"
 kotlinx-datetime = "0.6.0"
 kotlinx-serialization-json = "1.6.3"
-ktor = "2.3.10"
+ktor = "2.3.11"
 multiplatform-settings = "1.1.1"
 napier = "2.7.1"
 skie = "0.8.0"
@@ -58,15 +59,15 @@ multiplatform-settings-test = { module = "com.russhwolf:multiplatform-settings-t
 napier = { module = "io.github.aakira:napier", version.ref = "napier" }
 touchlab-kermit = { module = "co.touchlab:kermit", version.ref = "touchlab-kermit" }
 
-[plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-androidLibrary = { id = "com.android.library", version.ref = "agp" }
-composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-skie = { id = "co.touchlab.skie", version.ref = "skie" }
-
 [bundles]
 ktor-common = ["ktor-client-core", "ktor-client-logging", "ktor-client-serialization", "ktor-client-contentNegotiation", "ktor-client-websockets"]
 
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+skie = { id = "co.touchlab.skie", version.ref = "skie" }
+

template/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

template/shared/core/build.gradle.kts

@@ -1,17 +1,17 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.kotlinxSerialization)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary) // {platform.android}
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.compose.multiplatform)
+    alias(libs.plugins.android.library) // {platform.android}
 }
 
 kotlin {
     // {platform.android.target}
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = libs.versions.android.jvmTarget.get()
             }
         }
     }
@@ -64,8 +64,8 @@ android {
     namespace = "shared.core"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility(libs.versions.android.jvmTarget.get())
+        targetCompatibility(libs.versions.android.jvmTarget.get())
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()

template/shared/data/build.gradle.kts

@@ -1,15 +1,15 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.kotlinxSerialization)
-    alias(libs.plugins.androidLibrary) // {platform.android}
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.android.library) // {platform.android}
 }
 
 kotlin {
     // {platform.android.target}
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = libs.versions.android.jvmTarget.get()
             }
         }
     }
@@ -71,8 +71,8 @@ android {
     namespace = "shared.data"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility(libs.versions.android.jvmTarget.get())
+        targetCompatibility(libs.versions.android.jvmTarget.get())
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()

template/shared/design/build.gradle.kts

@@ -1,16 +1,16 @@
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.composeMultiplatform)
-    alias(libs.plugins.androidLibrary) // {platform.android}
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.compose.multiplatform)
+    alias(libs.plugins.android.library) // {platform.android}
 }
 
 kotlin {
     // {platform.android.target}
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = libs.versions.android.jvmTarget.get()
             }
         }
     }
@@ -52,8 +52,8 @@ android {
     namespace = "shared.design"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility(libs.versions.android.jvmTarget.get())
+        targetCompatibility(libs.versions.android.jvmTarget.get())
     }
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()