Skip to content

Commit edff35d

Browse files
committed
Downgrade to Kotlin 2.1.20
1 parent dc5ba2e commit edff35d

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt

+4-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.gradle.work.NormalizeLineEndings
3838
import org.gradle.workers.WorkAction
3939
import org.gradle.workers.WorkParameters
4040
import org.gradle.workers.WorkerExecutor
41-
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
4241
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
4342
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
4443
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
@@ -277,20 +276,11 @@ abstract class KspAATask @Inject constructor(
277276
cfg.jdkVersion.value(it.toInt())
278277
}
279278

280-
val oldJvmDefaultMode = compilerOptions.freeCompilerArgs
279+
val jvmDefaultMode = compilerOptions.freeCompilerArgs
281280
.map { args -> args.filter { it.startsWith("-Xjvm-default=") } }
282-
.map { it.lastOrNull()?.substringAfter("=") ?: "undefined" }
283-
284-
cfg.jvmDefaultMode.value(
285-
project.provider {
286-
when (oldJvmDefaultMode.get()) {
287-
"all" -> "no-compatibility"
288-
"all-compatibility" -> "enable"
289-
"disable" -> "disable"
290-
else -> compilerOptions.jvmDefault.getOrElse(JvmDefaultMode.ENABLE).compilerArgument
291-
}
292-
}
293-
)
281+
.map { it.lastOrNull()?.substringAfter("=") ?: "disable" }
282+
283+
cfg.jvmDefaultMode.value(jvmDefaultMode)
294284

295285
cfg.jvmTarget.value(compilerOptions.jvmTarget.map { it.target })
296286

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copied from kotlinc
22
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
33

4-
kotlinBaseVersion=2.2.0-dev-7255
4+
kotlinBaseVersion=2.1.20
55
agpBaseVersion=8.10.0-alpha03
6-
intellijVersion=241.19416.19
6+
intellijVersion=233.13135.128
77
junitVersion=4.13.1
88
junit5Version=5.8.2
99
junitPlatformVersion=1.8.2
@@ -25,4 +25,4 @@ kotlin.jvm.target.validation.mode=warning
2525

2626
# Build or runtime dependencies of this project
2727
buildKotlinVersion=2.0.20
28-
buildKspVersion=2.0.20-1.0.25
28+
buildKspVersion=2.0.20-1.0.25

integration-tests/src/test/kotlin/com/google/devtools/ksp/test/PlaygroundIT.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ class PlaygroundIT(val useKSP2: Boolean) {
310310
val gradleRunner = GradleRunner.create().withProjectDir(project.root)
311311
gradleRunner.buildAndCheck("clean", "build") { result ->
312312
Assert.assertTrue(result.output.contains("platform: JVM"))
313-
Assert.assertTrue(result.output.contains("jvm default mode: no-compatibility"))
313+
Assert.assertTrue(result.output.contains("jvm default mode: all"))
314314
}
315315
project.restore(buildFile.path)
316316
}

0 commit comments

Comments
 (0)