Make cli and tooling-core compatible with Java 17

marcphilipp · marcphilipp · commit 27d5537dbe97 · 2025-04-04T13:11:01.000+02:00
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
@@ -12,7 +12,7 @@ runs:
       id: setup-gradle-jdk
       with:
         distribution: temurin
-        java-version: 21
+        java-version: 17
     - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
       with:
         node-version-file: html-report/.tool-versions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
 
 plugins {
     `kotlin-dsl`
@@ -16,10 +16,10 @@ dependencies {
 
 tasks {
     compileKotlin {
-        compilerOptions.jvmTarget = JVM_21
+        compilerOptions.jvmTarget = JVM_17
     }
     compileJava {
-        options.release.convention(21)
+        options.release.convention(17)
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-conventions.gradle.kts
@@ -13,7 +13,7 @@ base {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
     withSourcesJar()
     withJavadocJar()
 }
@@ -82,7 +82,7 @@ tasks {
         options.javaModuleVersion.convention(provider { project.version.toString() })
     }
     compileTestJava {
-        options.release.convention(21)
+        options.release.convention(17)
     }
     val moduleName = "org.opentest4j.reporting.${project.name.replace('-', '.')}"
     val compileModule by registering(JavaCompile::class) {
diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
@@ -15,7 +15,7 @@ val mainClass = "org.opentest4j.reporting.cli.ReportingCli"
 
 tasks {
     compileJava {
-        options.release = 21
+        options.release = 17
     }
     jar {
         doLast(objects.newInstance(UpdateJarAction::class).apply {
diff --git a/documentation/component-diagram.puml b/documentation/component-diagram.puml
@@ -5,7 +5,7 @@ skinparam {
 }
 
 package org.opentest4j.reporting {
-    frame "Java 21+" {
+    frame "Java 17+" {
         [open-test-reporting-cli] as cli
         [open-test-reporting-tooling-core] as tooling_core
     }
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -1,2 +1,2 @@
 #This file is generated by updateDaemonJvm
-toolchainVersion=21
+toolchainVersion=17
diff --git a/sample-project/build.gradle.kts b/sample-project/build.gradle.kts
@@ -33,7 +33,7 @@ val htmlReportFile = tasks.test.flatMap { it.reports.junitXml.outputLocation.fil
 
 tasks {
     compileTestJava {
-        options.release = 21
+        options.release = 17
         modularity.inferModulePath = true
     }
 
diff --git a/tooling-core/build.gradle.kts b/tooling-core/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 }
 
 tasks.compileJava {
-    options.release = 21
+    options.release = 17
 }
 
 val playwrightInstallationAction = objects.newInstance(InstallPlaywrightDeps::class).apply {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`kotlin-dsl`
`@@ -16,10 +16,10 @@ dependencies {`
`16`	`16`
`17`	`17`	`tasks {`
`18`	`18`	`compileKotlin {`
`19`		`- compilerOptions.jvmTarget = JVM_21`
	`19`	`+ compilerOptions.jvmTarget = JVM_17`
`20`	`20`	`}`
`21`	`21`	`compileJava {`
`22`		`- options.release.convention(21)`
	`22`	`+ options.release.convention(17)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ base {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`java {`
`16`		`- toolchain.languageVersion.set(JavaLanguageVersion.of(21))`
	`16`	`+ toolchain.languageVersion.set(JavaLanguageVersion.of(17))`
`17`	`17`	`withSourcesJar()`
`18`	`18`	`withJavadocJar()`
`19`	`19`	`}`
`@@ -82,7 +82,7 @@ tasks {`
`82`	`82`	`options.javaModuleVersion.convention(provider { project.version.toString() })`
`83`	`83`	`}`
`84`	`84`	`compileTestJava {`
`85`		`- options.release.convention(21)`
	`85`	`+ options.release.convention(17)`
`86`	`86`	`}`
`87`	`87`	`val moduleName = "org.opentest4j.reporting.${project.name.replace('-', '.')}"`
`88`	`88`	`val compileModule by registering(JavaCompile::class) {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ val mainClass = "org.opentest4j.reporting.cli.ReportingCli"`
`15`	`15`
`16`	`16`	`tasks {`
`17`	`17`	`compileJava {`
`18`		`- options.release = 21`
	`18`	`+ options.release = 17`
`19`	`19`	`}`
`20`	`20`	`jar {`
`21`	`21`	`doLast(objects.newInstance(UpdateJarAction::class).apply {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ skinparam {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`package org.opentest4j.reporting {`
`8`		`- frame "Java 21+" {`
	`8`	`+ frame "Java 17+" {`
`9`	`9`	`[open-test-reporting-cli] as cli`
`10`	`10`	`[open-test-reporting-tooling-core] as tooling_core`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#This file is generated by updateDaemonJvm`
`2`		`-toolchainVersion=21`
	`2`	`+toolchainVersion=17`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ val htmlReportFile = tasks.test.flatMap { it.reports.junitXml.outputLocation.fil`
`33`	`33`
`34`	`34`	`tasks {`
`35`	`35`	`compileTestJava {`
`36`		`- options.release = 21`
	`36`	`+ options.release = 17`
`37`	`37`	`modularity.inferModulePath = true`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ dependencies {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`tasks.compileJava {`
`26`		`- options.release = 21`
	`26`	`+ options.release = 17`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`val playwrightInstallationAction = objects.newInstance(InstallPlaywrightDeps::class).apply {`