kotlin 2.0.0-RC1, compose 1.6.10-beta02, moko-resources 0.24.0-beta-1

.gitignore

@@ -3,7 +3,7 @@
 out
 gen
 *.hprof
-
+/.kotlin/
 build
 **/build/
 /.gradle/

README.md

@@ -28,7 +28,7 @@ fun App() = PreferableMaterialTheme { // provides composition locals
     }
 }
 ```
-
+The [NoteDelight](https://github.com/softartdev/NoteDelight/blob/master/shared-compose-ui/src/commonMain/kotlin/com/softartdev/notedelight/ui/SettingsScreen.kt#L104) app is a real example.   
 ## Installation
 The latest release is available on [Maven Central](https://repo1.maven.org/maven2/io/github/softartdev/theme-material/).
 ### Gradle

build.gradle.kts

@@ -2,16 +2,16 @@ buildscript {
     extra["android_min_sdk_version"] = 21
     extra["android_compile_sdk_version"] = 34
     extra["jdk_version"] = 17
-    extra["moko_resources_version"] = "0.24.0-alpha-5"
+    extra["moko_resources_version"] = "0.24.0-beta-1"
     repositories {
         gradlePluginPortal()
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
-        classpath("com.android.tools.build:gradle:8.3.0")
-        classpath("org.jetbrains.compose:compose-gradle-plugin:1.6.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-RC1")
+        classpath("com.android.tools.build:gradle:8.3.2")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:1.6.10-beta02")
         classpath("dev.icerock.moko:resources-generator:${rootProject.extra["moko_resources_version"]}")
     }
 }

convention-plugins/src/main/kotlin/convention.publication.gradle.kts

@@ -87,7 +87,10 @@ publishing {
 }
 
 signing {
-    sign(publishing.publications)
+    val isLocalPublication = gradle.startParameter.taskNames.any { taskName ->
+        taskName.contains("publishToMavenLocal")
+    }
+    if (!isLocalPublication) sign(publishing.publications)
 }
 
 nexusStaging {

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=io.github.softartdev
-VERSION=0.6.5
+VERSION=0.6.8
 
 org.gradle.jvmargs=-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx16g" -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 11 01:58:16 GET 2024
+#Sun Apr 14 10:29:49 GET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/android/build.gradle.kts

@@ -16,12 +16,10 @@ android {
         sourceCompatibility = JavaVersion.toVersion(rootProject.extra["jdk_version"] as Int)
         targetCompatibility = JavaVersion.toVersion(rootProject.extra["jdk_version"] as Int)
     }
-    kotlinOptions {
-        jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-    }
+    kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
     namespace = "com.softartdev.sample"
 }
 dependencies {
     implementation(project(":sample:shared"))
-    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.activity:activity-compose:1.9.0")
 }

sample/desktop/build.gradle.kts

@@ -1,4 +1,7 @@
+@file:Suppress("OPT_IN_USAGE")
+
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform")
@@ -11,10 +14,8 @@ version = "1.0"
 kotlin {
     jvmToolchain(rootProject.extra["jdk_version"] as Int)
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-        }
-        withJava()
+        compilerOptions.jvmTarget = JvmTarget.fromTarget("${rootProject.extra["jdk_version"]}")
+//        withJava()
     }
     sourceSets {
         jvmMain.dependencies {

sample/ios/build.gradle.kts

@@ -15,20 +15,12 @@ val binConfig: KotlinNativeTarget.() -> Unit = {
     }
 }
 kotlin {
-    iosX64(binConfig)
-    iosArm64(binConfig)
+//    iosX64(binConfig)
+//    iosArm64(binConfig)
     iosSimulatorArm64(binConfig)
     sourceSets {
         commonMain.dependencies {
             implementation(project(":sample:shared"))
-            implementation(project(":theme:theme-material"))
-            implementation(project(":theme:theme-material3"))
-            implementation(compose.ui)
-            implementation(compose.foundation)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.runtime)
-            implementation("dev.icerock.moko:resources:${rootProject.extra["moko_resources_version"]}")
         }
     }
 }

sample/ios/src/iosMain/kotlin/com/softartdev/sample/main.kt

@@ -4,9 +4,10 @@ import androidx.compose.ui.main.defaultUIKitMain
 import androidx.compose.ui.window.ComposeUIViewController
 import com.softartdev.shared.App
 import com.softartdev.theme.pref.MR
-import dev.icerock.moko.resources.desc.desc
+import dev.icerock.moko.resources.desc.Utils
 
 fun main() = defaultUIKitMain(
-    executableName = MR.strings.material_theme_prefs.desc().localized(),
+    //TODO MR.strings.material_theme_prefs.desc().localized()
+    executableName = Utils.localizedString(MR.strings.material_theme_prefs),
     rootViewController = ComposeUIViewController { App() }
 )

sample/shared/build.gradle.kts

@@ -1,3 +1,9 @@
+@file:Suppress("OPT_IN_USAGE")
+
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
@@ -7,25 +13,16 @@ plugins {
 kotlin {
     jvmToolchain(rootProject.extra["jdk_version"] as Int)
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-        }
+        compilerOptions.jvmTarget = JvmTarget.fromTarget("${rootProject.extra["jdk_version"]}")
     }
     androidTarget()
-    iosX64()
-    iosArm64()
+//    iosX64()
+//    iosArm64()
     iosSimulatorArm64()
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":theme:theme-prefs"))
-            implementation(project(":theme:theme-material"))
-            implementation(project(":theme:theme-material3"))
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.materialIconsExtended)
-            implementation("dev.icerock.moko:resources-compose:${rootProject.extra["moko_resources_version"]}")
+            api(project(":theme:theme-material"))
+            api(project(":theme:theme-material3"))
         }
         jvmMain.dependencies {
             implementation(compose.preview)
@@ -42,4 +39,10 @@ android {
         targetCompatibility = JavaVersion.toVersion(rootProject.extra["jdk_version"] as Int)
     }
     namespace = "com.softartdev.shared"
-}
+}
+tasks.withType<AndroidLintAnalysisTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelWriterTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}

theme/theme-material/build.gradle.kts

@@ -1,3 +1,9 @@
+@file:Suppress("OPT_IN_USAGE")
+
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
@@ -10,9 +16,7 @@ version = project.property("VERSION").toString()
 kotlin {
     jvmToolchain(rootProject.extra["jdk_version"] as Int)
     jvm("desktop") {
-        compilations.all {
-            kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-        }
+        compilerOptions.jvmTarget = JvmTarget.fromTarget("${rootProject.extra["jdk_version"]}")
     }
     androidTarget {
         publishLibraryVariants("release", "debug")
@@ -23,11 +27,9 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":theme:theme-prefs"))
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material)
-            implementation(compose.materialIconsExtended)
-            implementation("dev.icerock.moko:resources-compose:${rootProject.extra["moko_resources_version"]}")
+            api(compose.foundation)
+            api(compose.material)
+            api(compose.materialIconsExtended)
         }
         commonTest.dependencies {
             implementation(kotlin("test"))
@@ -47,3 +49,9 @@ android {
 tasks.withType<AbstractPublishToMaven>().configureEach {
     dependsOn(tasks.withType<Sign>())
 }
+tasks.withType<AndroidLintAnalysisTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelWriterTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}

theme/theme-material3/build.gradle.kts

@@ -1,3 +1,9 @@
+@file:Suppress("OPT_IN_USAGE")
+
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
@@ -10,9 +16,7 @@ version = project.property("VERSION").toString()
 kotlin {
     jvmToolchain(rootProject.extra["jdk_version"] as Int)
     jvm("desktop") {
-        compilations.all {
-            kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-        }
+        compilerOptions.jvmTarget = JvmTarget.fromTarget("${rootProject.extra["jdk_version"]}")
     }
     androidTarget {
         publishLibraryVariants("release", "debug")
@@ -23,11 +27,9 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":theme:theme-prefs"))
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material3)
-            implementation(compose.materialIconsExtended)
-            implementation("dev.icerock.moko:resources-compose:${rootProject.extra["moko_resources_version"]}")
+            api(compose.foundation)
+            api(compose.material3)
+            api(compose.materialIconsExtended)
         }
         commonTest.dependencies {
             implementation(kotlin("test"))
@@ -47,3 +49,9 @@ android {
 tasks.withType<AbstractPublishToMaven>().configureEach {
     dependsOn(tasks.withType<Sign>())
 }
+tasks.withType<AndroidLintAnalysisTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelWriterTask>{
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}

theme/theme-prefs/build.gradle.kts

@@ -1,3 +1,7 @@
+@file:Suppress("OPT_IN_USAGE")
+
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
@@ -11,9 +15,7 @@ version = project.property("VERSION").toString()
 kotlin {
     jvmToolchain(rootProject.extra["jdk_version"] as Int)
     jvm("desktop") {
-        compilations.all {
-            kotlinOptions.jvmTarget = "${rootProject.extra["jdk_version"] as Int}"
-        }
+        compilerOptions.jvmTarget = JvmTarget.fromTarget("${rootProject.extra["jdk_version"]}")
     }
     androidTarget {
         publishLibraryVariants("release", "debug")
@@ -25,9 +27,9 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation("dev.icerock.moko:resources:${rootProject.extra["moko_resources_version"]}")
-            implementation("dev.icerock.moko:resources-compose:${rootProject.extra["moko_resources_version"]}")
+            api(compose.runtime)
+            api("dev.icerock.moko:resources:${rootProject.extra["moko_resources_version"]}")
+            api("dev.icerock.moko:resources-compose:${rootProject.extra["moko_resources_version"]}")
         }
         commonTest.dependencies {
             implementation(kotlin("test"))