File tree 3 files changed +8
-18
lines changed
gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle
integration-tests/src/test/kotlin/com/google/devtools/ksp/test
3 files changed +8
-18
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ import org.gradle.work.NormalizeLineEndings
38
38
import org.gradle.workers.WorkAction
39
39
import org.gradle.workers.WorkParameters
40
40
import org.gradle.workers.WorkerExecutor
41
- import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
42
41
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
43
42
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
44
43
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
@@ -277,20 +276,11 @@ abstract class KspAATask @Inject constructor(
277
276
cfg.jdkVersion.value(it.toInt())
278
277
}
279
278
280
- val oldJvmDefaultMode = compilerOptions.freeCompilerArgs
279
+ val jvmDefaultMode = compilerOptions.freeCompilerArgs
281
280
.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)
294
284
295
285
cfg.jvmTarget.value(compilerOptions.jvmTarget.map { it.target })
296
286
Original file line number Diff line number Diff line change 1
1
# Copied from kotlinc
2
2
org.gradle.jvmargs =-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
3
3
4
- kotlinBaseVersion =2.2.0-dev-7255
4
+ kotlinBaseVersion =2.1.20
5
5
agpBaseVersion =8.10.0-alpha03
6
- intellijVersion =241.19416.19
6
+ intellijVersion =233.13135.128
7
7
junitVersion =4.13.1
8
8
junit5Version =5.8.2
9
9
junitPlatformVersion =1.8.2
@@ -25,4 +25,4 @@ kotlin.jvm.target.validation.mode=warning
25
25
26
26
# Build or runtime dependencies of this project
27
27
buildKotlinVersion =2.0.20
28
- buildKspVersion =2.0.20-1.0.25
28
+ buildKspVersion =2.0.20-1.0.25
Original file line number Diff line number Diff line change @@ -310,7 +310,7 @@ class PlaygroundIT(val useKSP2: Boolean) {
310
310
val gradleRunner = GradleRunner .create().withProjectDir(project.root)
311
311
gradleRunner.buildAndCheck(" clean" , " build" ) { result ->
312
312
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 " ))
314
314
}
315
315
project.restore(buildFile.path)
316
316
}
You can’t perform that action at this time.
0 commit comments