From acb45a1dea61dd844fba839cc31c79a7aca4bbe4 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Fri, 4 Nov 2022 16:53:22 +0100
Subject: build: Increase minimum Java version to Java 17

This change updates the Gradle configuration to target Java 17 (instead
of Java 11) as the lowest denominator when running/building OpenDC. This
version of Java has been available for more than a year and is the
latest LTS release.
---
 .github/workflows/build.yml          | 4 ++--
 .github/workflows/release.yml        | 1 -
 .github/workflows/test-gradle-rc.yml | 3 ++-
 .github/workflows/test-java-ea.yml   | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0747ad33..79bbe4d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 11, 17, 18 ]
+        java: [ 17, 19 ]
         include:
           - os: windows-latest
-            java: 18
+            java: 19
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2d893edf..73ec0a4d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,6 @@ jobs:
         with:
           arguments: publish
         env:
-          ORG_GRADLE_PROJECT_signingKeyId: F8134F9C
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
diff --git a/.github/workflows/test-gradle-rc.yml b/.github/workflows/test-gradle-rc.yml
index a39d36d7..b58bbcb1 100644
--- a/.github/workflows/test-gradle-rc.yml
+++ b/.github/workflows/test-gradle-rc.yml
@@ -11,8 +11,9 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 18
+          java-version: 19
       - uses: gradle/gradle-build-action@v2
         with:
+          cache-disabled: true
           gradle-version: release-candidate
           arguments: build --dry-run # just test build configuration
diff --git a/.github/workflows/test-java-ea.yml b/.github/workflows/test-java-ea.yml
index f3c31928..d0324b1b 100644
--- a/.github/workflows/test-java-ea.yml
+++ b/.github/workflows/test-java-ea.yml
@@ -11,8 +11,9 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 19-ea
+          java-version: 20-ea
       - uses: gradle/gradle-build-action@v2
         with:
+          cache-disabled: true
           gradle-version: release-candidate
           arguments: build
-- 
cgit v1.2.3


From 83ad9c927952474f1adeb03bd67331288ed6d6d9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sun, 13 Nov 2022 12:28:04 +0000
Subject: build: Make use of Gradle's Java Toolchains feature

This change updates the build configuration for Gradle to make use of
its Java Toolchains feature which enables running/testing multiple Java
versions at the same time. This feature can also provision a Java
installation if it is not available on the user's system.
---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/release.yml | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79bbe4d9..96b86233 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         java: [ 17, 19 ]
         include:
           - os: windows-latest
-            java: 19
+            java: 17
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -36,7 +36,7 @@ jobs:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
       - name: Publish report
         if: always()
-        uses: mikepenz/action-junit-report@v3.5.2
+        uses: mikepenz/action-junit-report@v3
         with:
           check_name: test (Java ${{ matrix.java }})
           report_paths: '**/build/test-results/test/TEST-*.xml'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 73ec0a4d..4f62843c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,9 +8,6 @@ jobs:
   build:
     name: Build OpenDC
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 17 ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -20,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: ${{ matrix.java }}
+          java-version: 17
       - name: Publish with Gradle
         uses: gradle/gradle-build-action@v2
         with:
-- 
cgit v1.2.3