Enable Java 19 for Windows in CI

asciidoctor · Mar 22, 2023 · b7b307f · b7b307f
1 parent a988b81
commit b7b307f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -43,11 +43,12 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-      max-parallel: 2
+      max-parallel: 3
       matrix:
         java:
           - '11'
           - '17'
+          - '19'
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/asciidoctorj-springboot-integration-test/springboot-app/build.gradle b/asciidoctorj-springboot-integration-test/springboot-app/build.gradle
@@ -1,3 +1,4 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
@@ -22,6 +23,20 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
+java {
+	toolchain {
+		languageVersion.set(JavaLanguageVersion.of(getToolchainVersion()))
+	}
+}
+
+def getToolchainVersion() {
+	if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
+		if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
+			return 19
+	}
+	return 17
+}
+
 bootJar {
 	requiresUnpack '**/asciidoctorj-*.jar'
 }

diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 import java.time.Duration
 
 /*
@@ -199,8 +201,19 @@ configure(subprojects.findAll { !it.name.endsWith('-distribution') && ! it.name.
     withJavadocJar()
     withSourcesJar()
     toolchain {
-      languageVersion.set(JavaLanguageVersion.of(11))
+      languageVersion.set(JavaLanguageVersion.of(getToolchainVersion()))
     }
   }
 
 }
+
+// Windows workaround to fix invalid toolchain detection
+def getToolchainVersion() {
+  if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
+      return 19
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17))
+      return 17
+  }
+  return 11
+}