Update Kotlin to 1.9.0.

.gitignore

@@ -25,4 +25,8 @@ docs/0.x
 # Testing
 zipline-gradle-plugin/src/test/projects/**/gradle/wrapper
 
+# Yarn
+samples/**/yarn.lock
+zipline-gradle-plugin/src/test/projects/**/yarn.lock
+
 generated-zipline-webpack-config.js

gradle.properties

@@ -14,7 +14,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 kotlin.js.compiler=ir
 kotlin.native.ignoreDisabledTargets=true
-kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.commonizerLogLevel=info
 kotlin.mpp.enableCInteropCommonization=true

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 androidx-compose = "1.4.3"
-androidx-compose-compiler = "1.4.8"
+androidx-compose-compiler = "1.5.0"
 auto-service="1.1.1"
 compileSdk = "33"
 http4k = "4.48.0.0"
-kotlin = "1.8.22"
+kotlin = "1.9.0"
 kotlinx-coroutines = "1.7.3"
 kotlinx-serialization = "1.5.1"
 okHttp = "4.11.0"

samples/trivia/trivia-js/build.gradle.kts

@@ -1,4 +1,6 @@
 import app.cash.zipline.gradle.ZiplineCompileTask
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
 plugins {
   kotlin("multiplatform")
@@ -22,8 +24,10 @@ kotlin {
   }
 }
 
-
 zipline {
   mainFunction.set("app.cash.zipline.samples.trivia.launchZipline")
 }
 
+plugins.withType<YarnPlugin> {
+  the<YarnRootExtension>().yarnLockAutoReplace = true
+}

samples/trivia/trivia-shared/build.gradle.kts

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
+
 apply(plugin = "app.cash.zipline")
 
 plugins {
@@ -22,3 +25,7 @@ kotlin {
     }
   }
 }
+
+plugins.withType<YarnPlugin> {
+  the<YarnRootExtension>().yarnLockAutoReplace = true
+}

samples/world-clock/presenters/build.gradle.kts

@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
 plugins {
   kotlin("multiplatform")
@@ -12,7 +14,7 @@ kotlin {
   iosX64()
   iosSimulatorArm64()
 
-  android()
+  androidTarget()
 
   js {
     browser()
@@ -64,3 +66,7 @@ android {
 zipline {
   mainFunction.set("app.cash.zipline.samples.worldclock.main")
 }
+
+plugins.withType<YarnPlugin> {
+  the<YarnRootExtension>().yarnLockAutoReplace = true
+}

zipline-api-validator/src/main/kotlin/app/cash/zipline/api/validator/fir/FirZiplineApiReader.kt

@@ -62,7 +62,7 @@ private val ziplineServiceClassId =
 internal class FirZiplineApiReader(
   output: FirResult,
 ) {
-  private val platformOutput = output.platformOutput
+  private val platformOutput = output.outputs.first()
   private val session: FirSession = platformOutput.session
 
   private val ziplineServiceClass: FirClassLikeSymbol<*>? =

zipline-api-validator/src/main/kotlin/app/cash/zipline/api/validator/fir/KotlinFirLoader.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.VfsBasedProjectEnvironment
+import org.jetbrains.kotlin.cli.jvm.compiler.pipeline.GroupedKtSources
 import org.jetbrains.kotlin.cli.jvm.compiler.pipeline.ModuleCompilerEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.pipeline.ModuleCompilerInput
 import org.jetbrains.kotlin.cli.jvm.compiler.pipeline.compileModuleToAnalyzedFir
@@ -102,12 +103,16 @@ internal class KotlinFirLoader(
       }
     }
 
+    val sourceFiles = files.mapTo(mutableSetOf(), ::KtVirtualFileSourceFile)
     val input = ModuleCompilerInput(
       targetId = TargetId(JvmProtoBufUtil.DEFAULT_MODULE_NAME, targetName),
+      groupedSources = GroupedKtSources(
+        platformSources = sourceFiles,
+        commonSources = emptyList(),
+        sourcesByModuleName = mapOf(JvmProtoBufUtil.DEFAULT_MODULE_NAME to sourceFiles),
+      ),
       commonPlatform = CommonPlatforms.defaultCommonPlatform,
-      commonSources = emptyList(),
       platform = JvmPlatforms.unspecifiedJvmPlatform,
-      platformSources = files.map(::KtVirtualFileSourceFile),
       configuration = configuration,
     )
 

zipline-gradle-plugin/src/test/kotlin/app/cash/zipline/gradle/ZiplinePluginTest.kt

@@ -77,7 +77,7 @@ class ZiplinePluginTest {
       .contains(result.task(taskName)!!.outcome)
 
     val ziplineOut = projectDir.resolve(
-      "lib/build/distributionsZipline",
+      "lib/build/dist/js/productionExecutableZipline",
     )
     assertThat(ziplineOut.listFiles()?.size).isEqualTo(2)
     assertThat(ziplineOut.resolve(manifestFileName).exists()).isTrue()
@@ -130,7 +130,7 @@ class ZiplinePluginTest {
       .contains(result.task(taskName)!!.outcome)
 
     val ziplineOut = projectDir.resolve(
-      "lib/build/compileSync/js/main/developmentExecutable/kotlinZipline",
+      "lib/build/compileSync/blue/main/developmentExecutable/kotlinZipline",
     )
     val manifest = ziplineOut.resolve(manifestFileName)
     assertThat(manifest.exists()).isTrue()

zipline-gradle-plugin/src/test/projects/android/lib/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 kotlin {
-  android()
+  androidTarget()
   js {
     browser()
     binaries.executable()