From 6ef36da245469b3996c5b0d2476516edd2a83b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zaj=C4=85czkowski?= <148013+szpak@users.noreply.github.com> Date: Tue, 16 Jan 2024 22:50:22 +0100 Subject: [PATCH] Restore JDK 19 testing on CI in "Java cross-version tests" --- .github/workflows/java-versions.yml | 3 +-- build.gradle.kts | 10 +++++++++- stutter.lockfile | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-versions.yml b/.github/workflows/java-versions.yml index 9b14e19c..d661cd0d 100644 --- a/.github/workflows/java-versions.yml +++ b/.github/workflows/java-versions.yml @@ -15,8 +15,7 @@ jobs: openjdk: strategy: matrix: - # TODO: Add 19+ - jdk: [11, 17] + jdk: [11, 17, 19] testJdk: [auto, 8] name: "OpenJDK ${{ matrix.jdk }} (with testJDK ${{ matrix.testJdk }})" runs-on: ubuntu-latest diff --git a/build.gradle.kts b/build.gradle.kts index 389b5e78..70a0b986 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -129,12 +129,20 @@ stutter { compatibleRange("7.3") } } + register("java19") { + javaToolchain { + languageVersion = JavaLanguageVersion.of(19) + } + gradleVersions { + compatibleRange("7.6") + } + } register("javaauto") { javaToolchain { languageVersion = JavaLanguageVersion.of(JavaVersion.current().majorVersion) } gradleVersions { - compatibleRange("7.3") + compatibleRange("7.6") } } } diff --git a/stutter.lockfile b/stutter.lockfile index e8cb8435..a01316f2 100644 --- a/stutter.lockfile +++ b/stutter.lockfile @@ -1,5 +1,6 @@ # DO NOT MODIFY: Generated by Stutter plugin. java11=6.2.2,6.9.4,7.0.2,7.6.2,8.0.2,8.2.1 java17=7.3.3,7.6.2,8.0.2,8.2.1 +java19=7.6.2,8.0.2,8.2.1 java8=6.2.2,6.9.4,7.0.2,7.6.2,8.0.2,8.2.1 javaauto=7.3.3,7.6.2,8.0.2,8.2.1