Skip to content

Commit f4d36b2

Browse files
committed
Java 11
1 parent ba16ab0 commit f4d36b2

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
scala: [2.12, 2.13, 3]
32-
java: [corretto@8]
32+
java: [corretto@11]
3333
project: [rootJS, rootJVM, rootNative]
3434
include:
3535
- scala: 3
36-
java: corretto@8
36+
java: corretto@11
3737
project: rootNative
3838
os: macos-latest
3939
exclude:
@@ -50,17 +50,17 @@ jobs:
5050
with:
5151
fetch-depth: 0
5252

53-
- name: Setup Java (corretto@8)
54-
id: setup-java-corretto-8
55-
if: matrix.java == 'corretto@8'
53+
- name: Setup Java (corretto@11)
54+
id: setup-java-corretto-11
55+
if: matrix.java == 'corretto@11'
5656
uses: actions/setup-java@v4
5757
with:
5858
distribution: corretto
59-
java-version: 8
59+
java-version: 11
6060
cache: sbt
6161

6262
- name: sbt update
63-
if: matrix.java == 'corretto@8' && steps.setup-java-corretto-8.outputs.cache-hit == 'false'
63+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
6464
run: ./sbt +update
6565

6666
- name: Check that workflows are up to date
@@ -78,11 +78,11 @@ jobs:
7878
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7979

8080
- name: Check binary compatibility
81-
if: matrix.java == 'corretto@8' && matrix.os == 'ubuntu-latest'
81+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
8282
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
8383

8484
- name: Generate API documentation
85-
if: matrix.java == 'corretto@8' && matrix.os == 'ubuntu-latest'
85+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
8686
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8787

8888
- name: Make target directories
@@ -107,25 +107,25 @@ jobs:
107107
strategy:
108108
matrix:
109109
os: [ubuntu-latest]
110-
java: [corretto@8]
110+
java: [corretto@11]
111111
runs-on: ${{ matrix.os }}
112112
steps:
113113
- name: Checkout current branch (full)
114114
uses: actions/checkout@v4
115115
with:
116116
fetch-depth: 0
117117

118-
- name: Setup Java (corretto@8)
119-
id: setup-java-corretto-8
120-
if: matrix.java == 'corretto@8'
118+
- name: Setup Java (corretto@11)
119+
id: setup-java-corretto-11
120+
if: matrix.java == 'corretto@11'
121121
uses: actions/setup-java@v4
122122
with:
123123
distribution: corretto
124-
java-version: 8
124+
java-version: 11
125125
cache: sbt
126126

127127
- name: sbt update
128-
if: matrix.java == 'corretto@8' && steps.setup-java-corretto-8.outputs.cache-hit == 'false'
128+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
129129
run: ./sbt +update
130130

131131
- name: Download target directories (2.12, rootJS)
@@ -228,25 +228,25 @@ jobs:
228228
strategy:
229229
matrix:
230230
os: [ubuntu-latest]
231-
java: [corretto@8]
231+
java: [corretto@11]
232232
runs-on: ${{ matrix.os }}
233233
steps:
234234
- name: Checkout current branch (full)
235235
uses: actions/checkout@v4
236236
with:
237237
fetch-depth: 0
238238

239-
- name: Setup Java (corretto@8)
240-
id: setup-java-corretto-8
241-
if: matrix.java == 'corretto@8'
239+
- name: Setup Java (corretto@11)
240+
id: setup-java-corretto-11
241+
if: matrix.java == 'corretto@11'
242242
uses: actions/setup-java@v4
243243
with:
244244
distribution: corretto
245-
java-version: 8
245+
java-version: 11
246246
cache: sbt
247247

248248
- name: sbt update
249-
if: matrix.java == 'corretto@8' && steps.setup-java-corretto-8.outputs.cache-hit == 'false'
249+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
250250
run: ./sbt +update
251251

252252
- name: Submit Dependencies

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
55

66
ThisBuild / tlBaseVersion := "2.5"
77

8-
val javaDistro = JavaSpec.corretto("8")
8+
val javaDistro = JavaSpec.corretto("11")
99
ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1010

1111
ThisBuild / githubWorkflowSbtCommand := "./sbt"

0 commit comments

Comments
 (0)