Update project JDK to JDK17.

* updated metalava version to 1.0.0-alpha08. * removed stdlib from api subproject dependency. * added a flag for integration test to use K2.
google · Aug 28, 2023 · b841b59 · b841b59
1 parent 86c4d08
commit b841b59
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 66 deletions.
diff --git a/api/api.base b/api/api.base
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -18,9 +18,6 @@ plugins {
     id("org.jetbrains.dokka")
 }
 
-dependencies {
-    api(kotlin("stdlib", kotlinBaseVersion))
-}
 tasks {
     val sourcesJar by creating(Jar::class) {
         archiveClassifier.set("sources")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -99,7 +99,7 @@ subprojects {
         targetCompatibility = JavaVersion.VERSION_1_8.toString()
         javaCompiler.set(
             javaToolchains.compilerFor {
-                languageVersion.set(JavaLanguageVersion.of(11))
+                languageVersion.set(JavaLanguageVersion.of(17))
             }
         )
     }
@@ -117,7 +117,7 @@ subprojects {
         // Java 11 is required to run
         javaLauncher.set(
             javaToolchains.launcherFor {
-                languageVersion.set(JavaLanguageVersion.of(11))
+                languageVersion.set(JavaLanguageVersion.of(17))
             }
         )
     }

diff --git a/buildSrc/src/main/kotlin/com/google/devtools/ksp/ApiCheck.kt b/buildSrc/src/main/kotlin/com/google/devtools/ksp/ApiCheck.kt
@@ -92,7 +92,7 @@ private fun Project.getCompileClasspath(): String =
 
 private fun Project.getMetalavaConfiguration(): Configuration {
     return configurations.findByName("metalava") ?: configurations.create("metalava") {
-        val dependency = dependencies.create("com.android.tools.metalava:metalava:1.0.0-alpha04")
+        val dependency = dependencies.create("com.android.tools.metalava:metalava:1.0.0-alpha08")
         it.dependencies.add(dependency)
     }
 }
diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/PlaygroundIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/PlaygroundIT.kt
@@ -49,6 +49,33 @@ class PlaygroundIT {
         gradleRunner.buildAndCheck("clean", "build")
     }
 
+    @Test
+    fun testPlaygroundJDK8() {
+        // FIXME: `clean` fails to delete files on windows.
+        File(project.root, "test-processor/build.gradle.kts").appendText(
+            """
+            kotlin {
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+               }
+            }
+            """.trimIndent()
+        )
+        File(project.root, "workload/build.gradle.kts").appendText(
+            """
+            kotlin {
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+               }
+            }
+            """.trimIndent()
+        )
+        Assume.assumeFalse(System.getProperty("os.name").startsWith("Windows", ignoreCase = true))
+        val gradleRunner = GradleRunner.create().withProjectDir(project.root)
+        gradleRunner.buildAndCheck("clean", "build")
+        gradleRunner.buildAndCheck("clean", "build")
+    }
+
     @Test
     fun testConfigurationOfConfiguration() {
         // FIXME: `clean` fails to delete files on windows.
@@ -314,7 +341,7 @@ class PlaygroundIT {
             """
             kotlin {
                 compilerOptions {
-                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_20)
                }
             }
             """.trimIndent()

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
@@ -24,6 +24,8 @@ class TemporaryTestProject(projectName: String, baseProject: String? = null) : T
         gradleProperties.appendText("\ntestRepo=$testRepo")
         gradleProperties.appendText("\norg.gradle.unsafe.configuration-cache=true")
         gradleProperties.appendText("\nkotlin.jvm.target.validation.mode=warning")
+        // Uncomment this to run tests in K2.
+        // gradleProperties.appendText("\nksp.useK2=true")
         // Uncomment this to debug compiler and compiler plugin.
         // gradleProperties.appendText("\nsystemProp.kotlin.compiler.execution.strategy=in-process")
     }