Skip to content

Commit 345c48a

Browse files
committed
Upgrade Kotlin to 2.0.0.
1 parent bfa2780 commit 345c48a

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ captures
66
.cxx
77
.externalNativeBuild
88
out
9+
.kotlin

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "1.9.20" apply false
2+
kotlin("jvm") version "2.0.0" apply false
33
id("org.jetbrains.dokka") version "1.9.0" apply false
44
id("com.vanniktech.maven.publish") version "0.22.0" apply false
55
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Android configuration
2121

2222
GROUP=com.bennyhuo.kotlin
23-
VERSION_NAME=1.9.20-1.3.0
23+
VERSION_NAME=2.0.0-1.3.0
2424
POM_ARTIFACT_ID=kotlin-compile-testing-extensions
2525

2626
POM_NAME=kotlin-compile-testing-extensions

kotlin-compile-testing-extensions/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ plugins {
44
}
55

66
dependencies {
7-
api("dev.zacsweers.kctfork:core:0.4.0")
8-
api("dev.zacsweers.kctfork:ksp:0.4.0")
7+
api("dev.zacsweers.kctfork:core:0.5.0")
8+
api("dev.zacsweers.kctfork:ksp:0.5.0")
99

10-
api("com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14")
10+
api("com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.22")
1111

1212
implementation(kotlin("test-common"))
1313
implementation(kotlin("test-annotations-common"))

kotlin-compile-testing-extensions/src/main/kotlin/com/bennyhuo/kotlin/compiletesting/extensions/module/KotlinModule.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.tschuchort.compiletesting.JvmCompilationResult
1212
import com.tschuchort.compiletesting.KotlinCompilation
1313
import com.tschuchort.compiletesting.SourceFile
1414
import com.tschuchort.compiletesting.kspArgs
15+
import com.tschuchort.compiletesting.kspProcessorOptions
1516
import com.tschuchort.compiletesting.kspSourcesDir
1617
import com.tschuchort.compiletesting.symbolProcessorProviders
1718
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
@@ -64,8 +65,8 @@ class KotlinModule(
6465

6566
private val kspCompilation = if (symbolProcessorProviders.isNotEmpty()) {
6667
newCompilation {
67-
this.symbolProcessorProviders = symbolProcessorProviders.distinctBy { it.javaClass }.toList()
68-
this.kspArgs.putAll(kspArgs)
68+
this.symbolProcessorProviders = symbolProcessorProviders.distinctBy { it.javaClass }.toMutableList()
69+
this.kspProcessorOptions.putAll(kspArgs)
6970
}
7071
} else {
7172
null

0 commit comments

Comments
 (0)