From 4eef95ebbaf8fe7eb1477ae2e863e15d1e254254 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 23 Oct 2024 11:37:01 -0400 Subject: [PATCH 1/5] use liberica jdk --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/groovy-joint-workflow.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/retry-release.yml | 2 +- .github/workflows/sdkman.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ff1e3038c9a..28b41e8831b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,7 +23,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: ${{ matrix.java }} - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 @@ -47,7 +47,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index defb1fe1315..0fe1d42d3f6 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -18,7 +18,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🗄️ Cache local Maven repository" uses: actions/cache@v4 @@ -121,7 +121,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a57f2e132f..2f5923afc80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 @@ -97,7 +97,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/retry-release.yml b/.github/workflows/retry-release.yml index 5fb78991d9e..9988e1b4bdb 100644 --- a/.github/workflows/retry-release.yml +++ b/.github/workflows/retry-release.yml @@ -27,7 +27,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/sdkman.yml b/.github/workflows/sdkman.yml index 74688e1687a..013bd36160c 100644 --- a/.github/workflows/sdkman.yml +++ b/.github/workflows/sdkman.yml @@ -19,7 +19,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - distribution: temurin + distribution: liberica java-version: 17 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@v4 From c99c494f2389b8bf78b529f88ba99db23d90e712 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 23 Oct 2024 11:37:37 -0400 Subject: [PATCH 2/5] matrix the build on java 17, 21 and 23 and ubuntu-latest, windows-latest, macos-latest --- .github/workflows/gradle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 28b41e8831b..f188d2561a0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,10 +13,11 @@ jobs: build: permissions: contents: read # to fetch code (actions/checkout) - runs-on: ubuntu-latest strategy: matrix: - java: [17] + java: [17, 21, 23] + os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} steps: - name: "📥 Checkout repository" uses: actions/checkout@v4 From a0aaa23457a11765ebe976ed9f4f966a93eea3a3 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 23 Oct 2024 12:33:24 -0400 Subject: [PATCH 3/5] switch from toolchain to sourceCompatibility so the matrix.java version is used in github workflows --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e8cf0aa40d4..038bcc16f52 100644 --- a/build.gradle +++ b/build.gradle @@ -464,7 +464,7 @@ subprojects { subproject -> } } - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + java.sourceCompatibility = JavaVersion.VERSION_17 if (!isTestSuite) { tasks.register('installToHomeDist', Copy) { From 4e3dfd7ec01e044c64a486b5f10adb9c412543b3 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 23 Oct 2024 12:55:46 -0400 Subject: [PATCH 4/5] use gradle release flag instead --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 038bcc16f52..c824f2fc325 100644 --- a/build.gradle +++ b/build.gradle @@ -464,7 +464,9 @@ subprojects { subproject -> } } - java.sourceCompatibility = JavaVersion.VERSION_17 + compileJava { + options.release = 17 + } if (!isTestSuite) { tasks.register('installToHomeDist', Copy) { From 7471e9ce44a32de7adf8b7ec5b525ead1374d3ca Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 23 Oct 2024 13:11:43 -0400 Subject: [PATCH 5/5] set JDK version for codeql which does not look in Gradle Release Flags --- .github/workflows/codeql.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4a0e5b97281..db4c4598843 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,11 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: "☕️ Setup JDK" + uses: actions/setup-java@v4 + with: + distribution: liberica + java-version: 17 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3