Kotlin 2.0

.gitignore

@@ -23,3 +23,6 @@ xcuserdata
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
+
+# Kotlin
+.kotlin

compose-demo/build.gradle.kts

@@ -1,9 +1,13 @@
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import com.android.build.gradle.internal.tasks.LintModelMetadataTask
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
     id("com.android.application")
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin {
@@ -44,6 +48,17 @@ kotlin {
     }
 }
 
+// https://github.com/JetBrains/compose-multiplatform/issues/4739
+tasks.withType<LintModelWriterTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelMetadataTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<AndroidLintAnalysisTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+
 android {
     namespace = "org.kodein.emoji.compose.demo"
     setCompileSdkVersion(34)

emoji-compose-m2/build.gradle.kts

@@ -1,6 +1,10 @@
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import com.android.build.gradle.internal.tasks.LintModelMetadataTask
+
 plugins {
     kodein.library.mppWithAndroid
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin.kodein {
@@ -16,6 +20,14 @@ kotlin.kodein {
     }
 }
 
+// https://github.com/JetBrains/compose-multiplatform/issues/4739
+tasks.withType<LintModelWriterTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelMetadataTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+
 android {
     namespace = "org.kodein.emoji.compose.m2"
 }

emoji-compose-m3/build.gradle.kts

@@ -1,6 +1,10 @@
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import com.android.build.gradle.internal.tasks.LintModelMetadataTask
+
 plugins {
     kodein.library.mppWithAndroid
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin.kodein {
@@ -16,6 +20,14 @@ kotlin.kodein {
     }
 }
 
+// https://github.com/JetBrains/compose-multiplatform/issues/4739
+tasks.withType<LintModelWriterTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelMetadataTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+
 android {
     namespace = "org.kodein.emoji.compose.m3"
 }

emoji-compose/build.gradle.kts

@@ -1,6 +1,10 @@
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+import com.android.build.gradle.internal.tasks.LintModelMetadataTask
+
 plugins {
     kodein.library.mppWithAndroid
     alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
 }
 
 kotlin.kodein {
@@ -26,6 +30,14 @@ kotlin.kodein {
     }
 }
 
+// https://github.com/JetBrains/compose-multiplatform/issues/4739
+tasks.withType<LintModelWriterTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+tasks.withType<LintModelMetadataTask> {
+    dependsOn("generateResourceAccessorsForAndroidUnitTest")
+}
+
 android {
     namespace = "org.kodein.emoji.compose"
 }

emoji-kt/build.gradle.kts

@@ -6,7 +6,7 @@ val genEmojis = tasks.create<GenEmojis>("genEmojis")
 
 kotlin.kodein {
     all {
-        compilations.main {
+        target.compilations.named("main") {
             compileTaskProvider { dependsOn(genEmojis) }
         }
     }

gradle/libs.versions.toml

@@ -1,11 +1,13 @@
 [versions]
-compose = "1.6.1"
+compose = "1.6.10-beta03"
+compose-compiler = "2.0.0-RC2"
 android-activityCompose = "1.8.2"
 android-svg = "1.4"
 android-lottie = "6.3.0"
 
 [plugins]
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "compose-compiler" }
 
 [libraries]
 android-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "android-activityCompose" }

settings.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.6.1")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.7.0-kotlin-2.0.0-RC2-SNAPSHOT")
     }
 }