Skip to content

Commit 546219a

Browse files
committed
Update Kotlin to 2.2.20
1 parent b3e83c8 commit 546219a

File tree

17 files changed

+517
-438
lines changed

17 files changed

+517
-438
lines changed

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ kotlin.mpp.stability.nowarn=true
33
kotlin.native.ignoreDisabledTargets=true
44
org.gradle.jvmargs=-Xmx4G
55
ksp.useKSP2=true
6+
7+
# This needs to be false so that the ksp1 tests don't fail
8+
kotlin.native.enableKlibsCrossCompilation=false

gradle/libs.versions.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin-inject = "0.8.1-SNAPSHOT"
3-
kotlin = "2.1.20"
4-
ksp = "2.1.20-2.0.0"
3+
kotlin = "2.2.20"
4+
ksp = "2.2.20-2.0.2"
55
kotlinpoet = "2.0.0"
66
junit5 = "5.9.3"
77
jvmTarget = "11"
@@ -13,9 +13,10 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
1313
ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
1414
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
1515
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
16-
kotlin-compile-testing = { module = "dev.zacsweers.kctfork:ksp", version = "0.7.0" }
16+
kotlin-compile-testing = { module = "dev.zacsweers.kctfork:ksp", version = "0.9.0" }
1717
kotlin-metadata-jvm = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
18-
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.0" }
18+
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.9.0" }
19+
kotlinx-coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.9.0" }
1920
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.23.2" }
2021
kotlinx-wasm-browser = "org.jetbrains.kotlinx:kotlinx-browser:0.3"
2122
jdk-compiler = { module = "io.earcam.wrapped:jdk.compiler", version = "1.8.132" }
@@ -38,4 +39,4 @@ kotlin-test-junit5 = ["junit5-api", "junit5-params", "kotlin-reflect"]
3839
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
3940
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
4041
jmh = { id = "me.champeau.jmh", version = "0.6.6" }
41-
changelog = { id = "org.jetbrains.changelog", version = "2.2.1" }
42+
changelog = { id = "org.jetbrains.changelog", version = "2.2.1" }

integration-tests/common-test/src/test/kotlin/me/tatarka/inject/test/ScopeTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import assertk.assertions.isEqualTo
55
import assertk.assertions.isNotNull
66
import assertk.assertions.isNotSameInstanceAs
77
import assertk.assertions.isSameInstanceAs
8+
import kotlinx.coroutines.test.runTest
89
import me.tatarka.inject.test.different.DifferentPackageScopedComponent
910
import me.tatarka.inject.test.different.create
1011
import me.tatarka.inject.test.module.ExternalChildComponent

integration-tests/common-test/src/test/kotlin/me/tatarka/inject/test/SuspendTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package me.tatarka.inject.test
22

33
import assertk.assertThat
44
import assertk.assertions.isInstanceOf
5+
import kotlinx.coroutines.test.runTest
56
import kotlin.test.Test
67

78
class SuspendTest {

integration-tests/ksp/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ kotlin {
2727
dependencies {
2828
implementation(kotlin("test"))
2929
implementation(libs.kotlinx.coroutines)
30+
implementation(libs.kotlinx.coroutinesTest)
3031
implementation(libs.assertk)
3132
}
3233
}

integration-tests/ksp/src/commonTest/kotlin/me/tatarka/inject/test/runTest.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

integration-tests/ksp/src/jsTest/kotlin/me/tatarka/inject/test/runTest.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

integration-tests/ksp/src/jvmTest/kotlin/me/tatarka/inject/test/runTest.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

integration-tests/ksp/src/nativeTest/kotlin/me/tatarka/inject/test/runTest.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.

integration-tests/ksp/src/wasmJsTest/kotlin/me/tatarka/inject/test/runTest.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)