UPDATE_KOTLIN_VERSION: 1.8.20-dev-2904

10 files changed, 25 insertions, 7 deletions

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 00dd6ef3..b3a2f6c6 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -8,7 +8,7 @@ val signingPassword: String? by project
 val kotlinBaseVersion: String by project
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=all-compatibility"
+    compilerOptions.freeCompilerArgs.add("-Xjvm-default=all-compatibility")
 }
 
 plugins {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index cdc1c82f..bb373be5 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -3,6 +3,12 @@ plugins {
     kotlin("jvm")
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
 repositories {
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/")
diff --git a/common-util/build.gradle.kts b/common-util/build.gradle.kts
index d9cab31e..cf991902 100644
--- a/common-util/build.gradle.kts
+++ b/common-util/build.gradle.kts
@@ -8,7 +8,7 @@ val kotlinBaseVersion: String by project
 val intellijVersion: String by project
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+    compilerOptions.freeCompilerArgs.add("-Xjvm-default=all-compatibility")
 }
 
 plugins {
diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
index b39f9008..293769c7 100644
--- a/compiler-plugin/build.gradle.kts
+++ b/compiler-plugin/build.gradle.kts
@@ -11,7 +11,7 @@ val kotlinBaseVersion: String by project
 val libsForTesting by configurations.creating
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+    compilerOptions.freeCompilerArgs.add("-Xjvm-default=all-compatibility")
 }
 
 plugins {
diff --git a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
index dbdf6c37..4d43162d 100644
--- a/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
+++ b/compiler-plugin/src/main/kotlin/com/google/devtools/ksp/KotlinSymbolProcessingExtension.kt
@@ -52,7 +52,7 @@ import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.load.java.components.FilesByFacadeFqNameIndexer
-import org.jetbrains.kotlin.platform.js.JsPlatform
+import org.jetbrains.kotlin.platform.JsPlatform
 import org.jetbrains.kotlin.platform.jvm.JdkPlatform
 import org.jetbrains.kotlin.platform.konan.NativePlatform
 import org.jetbrains.kotlin.psi.KtFile
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
index 2dc4d044..81132dbc 100644
--- a/gradle-plugin/build.gradle.kts
+++ b/gradle-plugin/build.gradle.kts
@@ -10,7 +10,7 @@ val signingKey: String? by project
 val signingPassword: String? by project
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+    compilerOptions.freeCompilerArgs.add("-Xjvm-default=all-compatibility")
 }
 
 plugins {
diff --git a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
index 95bd8f72..7d21ad18 100644
--- a/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
+++ b/gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/testing/TestProject.kt
@@ -50,10 +50,19 @@ class TestProject(
     fun writeFiles() {
         writeBuildFile()
         writeSettingsFile()
+        writeRootProperties()
         appModule.writeBuildFile()
         processorModule.writeBuildFile()
     }
 
+    private fun writeRootProperties() {
+        val contents = """
+            
+            kotlin.jvm.target.validation.mode=warning
+        """.trimIndent()
+        rootDir.resolve("gradle.properties").appendText(contents)
+    }
+
     private fun writeSettingsFile() {
         val contents = """
                 include("processor")
diff --git a/gradle.properties b/gradle.properties
index 0034b30b..2cec9f79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,11 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=1.8.20-dev-2036
+kotlinBaseVersion=1.8.20-dev-2904
 agpBaseVersion=7.0.0
 intellijVersion=203.8084.24
 junitVersion=4.12
 googleTruthVersion=1.1
 compilerTestEnabled=false
+
+kotlin.jvm.target.validation.mode=warning
\ No newline at end of file
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt
index df9cc5b5..fea748f0 100644
--- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt
+++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/TemporaryTestProject.kt
@@ -23,6 +23,7 @@ class TemporaryTestProject(projectName: String, baseProject: String? = null) : T
         gradleProperties.appendText("\nagpVersion=$agpVersion")
         gradleProperties.appendText("\ntestRepo=$testRepo")
         gradleProperties.appendText("\norg.gradle.unsafe.configuration-cache=true")
+        gradleProperties.appendText("\nkotlin.jvm.target.validation.mode=warning")
         // Uncomment this to debug compiler and compiler plugin.
         // gradleProperties.appendText("\nsystemProp.kotlin.compiler.execution.strategy=in-process")
     }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index ef6cc43c..ddad28a7 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -4,7 +4,7 @@ val kotlinBaseVersion: String by project
 val intellijVersion: String by project
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+    compilerOptions.freeCompilerArgs.add("-Xjvm-default=all-compatibility")
 }
 plugins {
     kotlin("jvm")