Skip to content

Commit 681b2e1

Browse files
authored
internal: Support JDK21 (#510)
* Test with JDK21 * Use setup-java * fix test
1 parent 9f8c3cf commit 681b2e1

File tree

3 files changed

+217
-194
lines changed

3 files changed

+217
-194
lines changed

.github/workflows/test.yml

+25-6
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- uses: actions/checkout@v4
39-
- uses: olafurpg/setup-scala@v14
39+
- uses: actions/setup-java@v3
4040
with:
41-
java-version: [email protected]
41+
distribution: 'zulu'
42+
java-version: '11'
4243
- uses: actions/cache@v3
4344
with:
4445
path: ~/.cache
@@ -51,9 +52,10 @@ jobs:
5152
runs-on: ubuntu-latest
5253
steps:
5354
- uses: actions/checkout@v4
54-
- uses: olafurpg/setup-scala@v14
55+
- uses: actions/setup-java@v3
5556
with:
56-
java-version: [email protected]
57+
distribution: 'zulu'
58+
java-version: '8'
5759
- uses: actions/cache@v3
5860
with:
5961
path: ~/.cache
@@ -66,13 +68,30 @@ jobs:
6668
runs-on: ubuntu-latest
6769
steps:
6870
- uses: actions/checkout@v4
69-
- uses: olafurpg/setup-scala@v14
71+
- uses: actions/setup-java@v3
7072
with:
71-
java-version: 17
73+
distribution: 'zulu'
74+
java-version: '17'
7275
- uses: actions/cache@v3
7376
with:
7477
path: ~/.cache
7578
key: ${{ runner.os }}-jdk17-${{ hashFiles('**/*.sbt') }}
7679
restore-keys: ${{ runner.os }}-jdk17-
7780
- name: Test
7881
run: ./sbt test
82+
test_jdk21:
83+
name: test jdk21
84+
runs-on: ubuntu-latest
85+
steps:
86+
- uses: actions/checkout@v4
87+
- uses: actions/setup-java@v3
88+
with:
89+
distribution: 'zulu'
90+
java-version: '21'
91+
- uses: actions/cache@v3
92+
with:
93+
path: ~/.cache
94+
key: ${{ runner.os }}-jdk21-${{ hashFiles('**/*.sbt') }}
95+
restore-keys: ${{ runner.os }}-jdk21-
96+
- name: Test
97+
run: ./sbt test

sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
set -o pipefail
3636

37-
declare -r sbt_release_version="1.8.2"
38-
declare -r sbt_unreleased_version="1.8.2"
37+
declare -r sbt_release_version="1.9.6"
38+
declare -r sbt_unreleased_version="1.9.6"
3939

40-
declare -r latest_213="2.13.10"
41-
declare -r latest_212="2.12.17"
40+
declare -r latest_213="2.13.12"
41+
declare -r latest_212="2.12.18"
4242
declare -r latest_211="2.11.12"
4343
declare -r latest_210="2.10.7"
4444
declare -r latest_29="2.9.3"

0 commit comments

Comments
 (0)