Skip to content

Commit f400d6e

Browse files
authored
Merge pull request #58 from cb372/java-21
Use more recent versions of Java in CI
2 parents d6409cb + 44b2610 commit f400d6e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/ci.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- 3.3.3
2121
- 3.4.2
2222
java:
23-
- 1.8
24-
- 1.11
23+
- 11
24+
- 17
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
@@ -30,12 +30,11 @@ jobs:
3030
fetch-depth: 0
3131

3232
- name: Setup Java and Scala
33-
uses: olafurpg/setup-scala@v13
33+
uses: actions/setup-java@v4
3434
with:
35-
java-version: adopt@${{ matrix.java }}
36-
37-
- name: Cache sbt
38-
uses: coursier/cache-action@v6
35+
distribution: 'adopt'
36+
java-version: ${{ matrix.java }}
37+
cache: 'sbt'
3938

4039
- name: Test
4140
run: |

.github/workflows/release.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ jobs:
1515
fetch-depth: 0 # fetch all tags to make sbt-dynver work properly
1616

1717
- name: Setup Java and Scala
18-
uses: olafurpg/setup-scala@v13
19-
20-
- name: Cache sbt
21-
uses: coursier/cache-action@v6
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: 'adopt'
21+
java-version: 17
22+
cache: 'sbt'
2223

2324
- name: Publish
2425
run: sbt ci-release

0 commit comments

Comments
 (0)