From 7742e991213afc82cc242462d4eab9c840b7bfe9 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:00:40 +0100 Subject: [PATCH 1/2] Test on Java 21 --- .github/workflows/ci.yml | 11 ++++++++--- .github/workflows/javadocs.yml | 6 +++--- pom.xml | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6046714..dfde08f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,19 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '16', '17', '19' ] + java: [ '8', '11', '16', '17', '19', '21' ] runs-on: [ubuntu-latest, macos-latest, windows-latest] + exclude: + - runs-on: macos-latest + java: "8" + - runs-on: macos-latest + java: "16" name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.Java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.Java }} distribution: 'temurin' diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index d9962c3..06a67aa 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -9,16 +9,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 11 java-package: jdk - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/pom.xml b/pom.xml index 3642ae6..aee8da6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,8 +70,8 @@ maven-compiler-plugin 3.0 - 1.7 - 1.7 + 1.8 + 1.8 From ac51159ad930e1068a5bbbcd308339b961755799 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:10:49 +0100 Subject: [PATCH 2/2] Add distribution --- .github/workflows/javadocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index 06a67aa..730daab 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -16,6 +16,7 @@ jobs: with: java-version: 11 java-package: jdk + distribution: 'temurin' - name: Set up Python 3.9 uses: actions/setup-python@v4