Pre-register all testOnJdk test tasks for all LTS java versions

pinterest · Jul 15, 2023 · 171790c · 171790c
1 parent 0820c1e
commit 171790c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/pull-request-with-code.yml b/.github/workflows/pull-request-with-code.yml
@@ -75,4 +75,4 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
 
-      - run: ./gradlew testOnJdk -PtestJdkVersion=${{ matrix.jdk }}
+      - run: ./gradlew testOnJdk${{ matrix.jdk }} -PtestJdkVersion=${{ matrix.jdk }}
diff --git a/build-logic/src/main/kotlin/ktlint-kotlin-common.gradle.kts b/build-logic/src/main/kotlin/ktlint-kotlin-common.gradle.kts
@@ -24,9 +24,13 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 val requestedJdkVersion = project.findProperty("testJdkVersion")?.toString()?.toInt()
-if (requestedJdkVersion != null) {
-    tasks.register<Test>("testOnJdk") {
-        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(requestedJdkVersion) }
+// List all non-current Java versions the developers may want to run via IDE click
+setOf(8, 11, 17, requestedJdkVersion).filterNotNull().forEach { version ->
+    tasks.register<Test>("testOnJdk$version") {
+        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(version) }
+
+        description = "Runs the test suite on JDK $version"
+        group = LifecycleBasePlugin.VERIFICATION_GROUP
 
         // Copy inputs from normal Test task.
         val testTask = tasks.test.get()