Compile with Java 21 (#547)

usefulness · Nov 3, 2023 · fc166f1 · fc166f1
1 parent 09718c4
commit fc166f1
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 25 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: gradle/wrapper-validation-action@v1
 
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Run ${{ matrix.task }}
         uses: gradle/gradle-build-action@v2
@@ -120,7 +120,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Run ${{ matrix.task }}
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Cache
         uses: gradle/gradle-build-action@v2
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Cache
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Build app with Gradle
         uses: gradle/gradle-build-action@v2
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/run_diffuse.yml b/.github/workflows/run_diffuse.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: actions/cache@v3
         name: Download base

diff --git a/android/src/main/kotlin/com/project/starter/modules/plugins/AndroidLibraryPlugin.kt b/android/src/main/kotlin/com/project/starter/modules/plugins/AndroidLibraryPlugin.kt
@@ -24,7 +24,6 @@ class AndroidLibraryPlugin : Plugin<Project> {
 
         extensions.getByType<LibraryExtension>().apply {
             configureAndroidPlugin(rootConfig)
-            defaultConfig.targetSdk = rootConfig.android.targetSdkVersion ?: rootConfig.android.compileSdkVersion
 
             buildFeatures.buildConfig = false
 

diff --git a/android/src/test/kotlin/com/project/starter/modules/AndroidApplicationPluginTest.kt b/android/src/test/kotlin/com/project/starter/modules/AndroidApplicationPluginTest.kt
@@ -21,7 +21,19 @@ internal class AndroidApplicationPluginTest : WithGradleProjectTest() {
         rootDirectory.apply {
             resolve("settings.gradle").writeText("""include ":module1", ":module2" """)
 
-            rootBuildScript = resolve("build.gradle")
+            rootBuildScript = resolve("build.gradle") {
+                writeText(
+                    """
+                    plugins {
+                        id('com.starter.config')
+                    }
+                    
+                    commonConfig {
+                        javaVersion = JavaVersion.VERSION_1_8 // workaround for http://issuetracker.google.com/issues/294137077
+                    }
+                    """.trimIndent(),
+                )
+            }
             module1Root = resolve("module1") {
                 val buildScript =
                     // language=groovy
@@ -45,7 +57,7 @@ internal class AndroidApplicationPluginTest : WithGradleProjectTest() {
                     }
                     
                     dependencies {
-                        testImplementation 'junit:junit:4.13'
+                        testImplementation 'junit:junit:4.13.2'
                     }
                     
                     """.trimIndent()
@@ -83,7 +95,7 @@ internal class AndroidApplicationPluginTest : WithGradleProjectTest() {
                         }
 
                         dependencies {
-                            testImplementation 'junit:junit:4.13'
+                            testImplementation 'junit:junit:4.13.2'
                         }
 
                         """.trimIndent(),

diff --git a/android/src/test/kotlin/com/project/starter/modules/AndroidLibraryPluginTest.kt b/android/src/test/kotlin/com/project/starter/modules/AndroidLibraryPluginTest.kt
@@ -22,7 +22,19 @@ internal class AndroidLibraryPluginTest : WithGradleProjectTest() {
             mkdirs()
             resolve("settings.gradle").writeText("""include ":module1", ":module2" """)
 
-            rootBuildScript = resolve("build.gradle")
+            rootBuildScript = resolve("build.gradle") {
+                writeText(
+                    """
+                    plugins {
+                        id('com.starter.config')
+                    }
+                    
+                    commonConfig {
+                        javaVersion = JavaVersion.VERSION_1_8 // workaround for http://issuetracker.google.com/issues/294137077
+                    }
+                    """.trimIndent(),
+                )
+            }
             module1Root = resolve("module1") {
                 val buildScript =
                     // language=groovy
@@ -46,7 +58,7 @@ internal class AndroidLibraryPluginTest : WithGradleProjectTest() {
                     }
                     
                     dependencies {
-                        testImplementation 'junit:junit:4.13'
+                        testImplementation 'junit:junit:4.13.2'
                     }
                     
                     """.trimIndent()
@@ -88,7 +100,7 @@ internal class AndroidLibraryPluginTest : WithGradleProjectTest() {
                         }
                         
                         dependencies {
-                            testImplementation 'junit:junit:4.13'
+                            testImplementation 'junit:junit:4.13.2'
                         }
                         
                         """.trimIndent(),

diff --git a/android/src/test/kotlin/com/project/starter/modules/tasks/ConfigurationCacheTest.kt b/android/src/test/kotlin/com/project/starter/modules/tasks/ConfigurationCacheTest.kt
@@ -16,7 +16,19 @@ internal class ConfigurationCacheTest : WithGradleProjectTest() {
         rootDirectory.apply {
             resolve("settings.gradle").writeText("""include ':module1', ':module2' """)
 
-            resolve("build.gradle").writeText("")
+            resolve("build.gradle") {
+                writeText(
+                    """
+                    plugins {
+                        id('com.starter.config')
+                    }
+                    
+                    commonConfig {
+                        javaVersion = JavaVersion.VERSION_1_8 // workaround for http://issuetracker.google.com/issues/294137077
+                    }
+                    """.trimIndent(),
+                )
+            }
             androidModuleRoot = resolve("module1") {
                 // language=groovy
                 val script =

diff --git a/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt b/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt
@@ -103,7 +103,7 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() {
                     }
                         
                     kotlin {
-                        jvmToolchain(20)
+                        jvmToolchain(21)
                     }
                     
                     tasks.withType(JavaCompile).configureEach {

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
             }
         }
         kotlin {
-            jvmToolchain(20)
+            jvmToolchain(21)
         }
     }
     tasks.withType(Test).configureEach {
@@ -35,8 +35,9 @@ allprojects {
 
     pluginManager.withPlugin("java") {
         if (project.hasProperty("skipJarVersion")) {
+            def projectName = project.name
             tasks.named("jar") {
-                archiveFile.set(new File(project.buildDir, "libs/${project.name}.jar"))
+                archiveFile.set(layout.buildDirectory.map {it.file("libs/${projectName}.jar")})
             }
         }
     }

diff --git a/gradle/plugins/build.gradle b/gradle/plugins/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(20)
+    jvmToolchain(21)
 }
 
 def targetJavaVersion = JavaVersion.VERSION_11

diff --git a/jvm/src/test/kotlin/com/project/starter/modules/KotlinLibraryPluginTest.kt b/jvm/src/test/kotlin/com/project/starter/modules/KotlinLibraryPluginTest.kt
@@ -35,7 +35,7 @@ internal class KotlinLibraryPluginTest : WithGradleProjectTest() {
                         }
                         
                         dependencies {
-                            testImplementation 'junit:junit:4.13'
+                            testImplementation 'junit:junit:4.13.2'
                         }
                         
                         """.trimIndent(),
@@ -57,7 +57,7 @@ internal class KotlinLibraryPluginTest : WithGradleProjectTest() {
                         }
                         
                         dependencies {
-                            testImplementation 'junit:junit:4.13'
+                            testImplementation 'junit:junit:4.13.2'
                         }
                         
                         """.trimIndent(),

diff --git a/quality/src/main/kotlin/com/project/starter/quality/plugins/QualityPlugin.kt b/quality/src/main/kotlin/com/project/starter/quality/plugins/QualityPlugin.kt
@@ -35,7 +35,7 @@ class QualityPlugin : Plugin<Project> {
                     source += sourceSet.allSource
                 }
             }
-            report.set(buildDir.resolve("reports/issue_comments.txt"))
+            report.set(layout.buildDirectory.map { it.file("reports/issue_comments.txt") })
             githubToken.set(provider<String?> { properties["GITHUB_TOKEN"]?.toString() })
         }
         onAndroid {

diff --git a/quality/src/test/kotlin/com/project/starter/quality/QualityPluginTest.kt b/quality/src/test/kotlin/com/project/starter/quality/QualityPluginTest.kt
@@ -91,7 +91,7 @@ internal class QualityPluginTest : WithGradleProjectTest() {
                 }
                         
                 kotlin {
-                    jvmToolchain(20)
+                    jvmToolchain(21)
                 }
                 
                 def targetJavaVersion = JavaVersion.VERSION_11