Merge pull request #168 from gradle/marc/jdk-19-support

Add support for Java 19

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.0-20221205131849+0000-bin.zip
+distributionSha256Sum=28ebe9afc20564bcdc39bfe36f6b60a373e40be2c3c307a0028b545b8ccf6ba0
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/build.gradle.kts

@@ -1,6 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.testretry.build.GradleVersionData
 import org.gradle.testretry.build.GradleVersionsCommandLineArgumentProvider
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     java
@@ -19,28 +20,45 @@ plugins {
 group = "org.gradle"
 description = "Mitigate flaky tests by retrying tests when they fail"
 
+val javaToolchainVersion: String? by project
+val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: JavaLanguageVersion.of(8)
+
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion.set(javaLanguageVersion)
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    if (javaLanguageVersion >= JavaLanguageVersion.of(9)) {
+        options.release.set(8)
+    } else {
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions.jvmTarget = "1.8"
 }
 
 val plugin: Configuration by configurations.creating
 
 configurations.getByName("compileOnly").extendsFrom(plugin)
 
 dependencies {
-    val asmVersion = "9.2"
+    val asmVersion = "9.4"
     plugin("org.ow2.asm:asm:${asmVersion}")
 
     testImplementation(gradleTestKit())
     testImplementation(localGroovy())
-    testImplementation("org.spockframework:spock-core:2.0-groovy-3.0")
-    testImplementation("org.spockframework:spock-junit4:2.0-groovy-3.0")
+    testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
+    testImplementation("org.spockframework:spock-junit4:2.3-groovy-3.0")
     testImplementation("net.sourceforge.nekohtml:nekohtml:1.9.22")
     testImplementation("org.ow2.asm:asm:${asmVersion}")
     testImplementation("org.jetbrains:annotations:23.0.0")
 
-    codenarc("org.codenarc:CodeNarc:2.1.0")
+    codenarc("org.codenarc:CodeNarc:3.2.0")
 }
 
 val shadowJar = tasks.named<ShadowJar>("shadowJar")