Update Kotlin and KSP

eygraber · eygraber · commit 08076a463dd0 · 2025-04-27T04:08:17.000Z
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin-inject = "0.7.3-SNAPSHOT"
-kotlin = "2.1.10"
-ksp = "2.1.10-1.0.30"
+kotlin = "2.1.20"
+ksp = "2.1.20-2.0.0"
 kotlinpoet = "2.0.0"
 junit5 = "5.9.3"
 jvmTarget = "11"
diff --git a/integration-tests/ksp-companion/build.gradle.kts b/integration-tests/ksp-companion/build.gradle.kts
@@ -10,9 +10,7 @@ dependencies {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
     sourceSets {
         commonMain {
diff --git a/integration-tests/ksp/build.gradle.kts b/integration-tests/ksp/build.gradle.kts
@@ -11,9 +11,7 @@ dependencies {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
     sourceSets {
         commonMain {
@@ -67,7 +65,7 @@ kotlin {
 }
 
 java {
-    val test by sourceSets.existing {
+    sourceSets.named("jvmTest").configure {
         java.srcDir("../common-jvm/src/test/java")
     }
 }
diff --git a/integration-tests/ksp1-companion/build.gradle.kts b/integration-tests/ksp1-companion/build.gradle.kts
@@ -12,9 +12,7 @@ dependencies {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
     sourceSets {
         commonMain {
diff --git a/integration-tests/ksp1/build.gradle.kts b/integration-tests/ksp1/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
     sourceSets {
         commonMain {
@@ -69,7 +67,7 @@ kotlin {
 }
 
 java {
-    val test by sourceSets.existing {
+    sourceSets.named("jvmTest").configure {
         java.srcDir("../common-jvm/src/test/java")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ dependencies {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`kotlin {`
`13`		`- jvm {`
`14`		`- withJava()`
`15`		`- }`
	`13`	`+ jvm()`
`16`	`14`
`17`	`15`	`sourceSets {`
`18`	`16`	`commonMain {`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,7 @@ dependencies {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`kotlin {`
`14`		`- jvm {`
`15`		`- withJava()`
`16`		`- }`
	`14`	`+ jvm()`
`17`	`15`
`18`	`16`	`sourceSets {`
`19`	`17`	`commonMain {`
`@@ -67,7 +65,7 @@ kotlin {`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`java {`
`70`		`- val test by sourceSets.existing {`
	`68`	`+ sourceSets.named("jvmTest").configure {`
`71`	`69`	`java.srcDir("../common-jvm/src/test/java")`
`72`	`70`	`}`
`73`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ dependencies {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`kotlin {`
`15`		`- jvm {`
`16`		`- withJava()`
`17`		`- }`
	`15`	`+ jvm()`
`18`	`16`
`19`	`17`	`sourceSets {`
`20`	`18`	`commonMain {`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ dependencies {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`kotlin {`
`16`		`- jvm {`
`17`		`- withJava()`
`18`		`- }`
	`16`	`+ jvm()`
`19`	`17`
`20`	`18`	`sourceSets {`
`21`	`19`	`commonMain {`
`@@ -69,7 +67,7 @@ kotlin {`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`java {`
`72`		`- val test by sourceSets.existing {`
	`70`	`+ sourceSets.named("jvmTest").configure {`
`73`	`71`	`java.srcDir("../common-jvm/src/test/java")`
`74`	`72`	`}`
`75`	`73`	`}`