Update dependencies for k2

Author: eygraber

build-logic/src/main/kotlin/kotlin-inject.multiplatform.gradle.kts

@@ -70,8 +70,8 @@ tasks.withType<KotlinNpmInstallTask> {
 }
 
 rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "22.0.0-v8-canary20231127cbafc81f11"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+    version = "22.0.0-v8-canary20231127cbafc81f11"
+    downloadBaseUrl = "https://nodejs.org/download/v8-canary"
 }
 
 rootProject.tasks.withType<KotlinNpmInstallTask>().configureEach {

gradle.properties

@@ -1,4 +1,5 @@
 org.gradle.parallel=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G
+ksp.useKSP2=false

gradle/libs.versions.toml

@@ -1,21 +1,21 @@
 [versions]
 kotlin-inject = "0.7.0-SNAPSHOT"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
+kotlin = "2.0.0-Beta4"
+ksp = "2.0.0-Beta4-1.0.19"
 kotlinpoet = "1.16.0"
 junit5 = "5.9.3"
-detekt = "1.23.4"
+detekt = "1.23.5"
 [libraries]
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-kotlin-compile-testing = { module = "dev.zacsweers.kctfork:ksp", version = "0.3.2" }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.0-RC" }
-kotlinx-metadata-jvm = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version = "0.7.0" }
-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.23.1" }
+kotlin-compile-testing = { module = "dev.zacsweers.kctfork:ksp", version = "0.4.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.0" }
+kotlinx-metadata-jvm = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version = "0.9.0" }
+kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.23.2" }
 jdk-compiler = { module = "io.earcam.wrapped:jdk.compiler", version = "1.8.132" }
 assertk = { module = "com.willowtreeapps.assertk:assertk", version = "0.28.0" }
 burst-junit4 = { module = "com.squareup.burst:burst-junit4", version = "1.2.0" }

kotlin-inject-compiler/test/src/main/kotlin/me/tatarka/inject/ProjectCompiler.kt

@@ -43,6 +43,7 @@ class ProjectCompiler(
     fun compile(): TestCompilationResult {
         val result = TestCompilationResult(
             KotlinCompilation().apply {
+                kotlincArguments = kotlincArguments + "-Xskip-prerelease-check"
                 workingDir = this@ProjectCompiler.workingDir
                 sources = sourceFiles
                 when (target) {
@@ -108,4 +109,4 @@ class TestCompilationResult(private val result: CompilationResult) {
         get() = result.exitCode == KotlinCompilation.ExitCode.OK
 
     fun output(kind: Diagnostic.Kind): String = result.messages.filterByKind(kind)
-}
+}

kotlin-inject-runtime/build.gradle.kts

@@ -9,9 +9,11 @@ plugins {
 kotlin {
     @OptIn(ExperimentalKotlinGradlePluginApi ::class)
     applyDefaultHierarchyTemplate {
-        group("commonJs") {
-            withJs()
-            withWasm()
+        common {
+            group("commonJs") {
+                withJs()
+                withWasmJs()
+            }
         }
     }
 

kotlin-inject-runtime/src/nativeMain/kotlin/me/tatarka/inject/internal/LazyMap.kt

@@ -1,13 +1,15 @@
 package me.tatarka.inject.internal
 
-import kotlinx.atomicfu.locks.ReentrantLock
+import kotlinx.atomicfu.locks.SynchronizedObject
 import kotlinx.atomicfu.locks.withLock
 
 private val NULL = Any()
 
 actual class LazyMap {
     private val map = mutableMapOf<String, Any>()
-    private val lock = ReentrantLock()
+
+    // using SynchronizedObject instead of ReentrantLock because of https://github.com/Kotlin/kotlinx-atomicfu/issues/401
+    private val lock = SynchronizedObject()
 
     actual fun <T> get(key: String, init: () -> T): T {
         return lock.withLock {