Skip to content

Commit 4af70bd

Browse files
committed
correto
1 parent 4a32a8d commit 4af70bd

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

.github/workflows/ci.yml

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

52-
- name: Download Java (temurin@8)
53-
id: download-java-temurin-8
54-
if: matrix.java == 'temurin@8'
52+
- name: Download Java (corretto@8)
53+
id: download-java-corretto-8
54+
if: matrix.java == 'corretto@8'
5555
uses: typelevel/download-java@v1
5656
with:
57-
distribution: temurin
57+
distribution: corretto
5858
java-version: 8
5959

60-
- name: Setup Java (temurin@8)
61-
if: matrix.java == 'temurin@8'
60+
- name: Setup Java (corretto@8)
61+
if: matrix.java == 'corretto@8'
6262
uses: actions/setup-java@v2
6363
with:
6464
distribution: jdkfile
6565
java-version: 8
66-
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
66+
jdkFile: ${{ steps.download-java-corretto-8.outputs.jdkFile }}
6767

6868
- name: Cache sbt
6969
uses: actions/cache@v2
@@ -81,7 +81,7 @@ jobs:
8181
run: ./sbt githubWorkflowCheck
8282

8383
- name: Check formatting
84-
if: matrix.java == 'temurin@8'
84+
if: matrix.java == 'corretto@8'
8585
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' scalafmtCheckAll 'project /' scalafmtSbtCheck
8686

8787
- name: scalaJSLink
@@ -96,11 +96,11 @@ jobs:
9696
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
9797

9898
- name: Check binary compatibility
99-
if: matrix.java == 'temurin@8'
99+
if: matrix.java == 'corretto@8'
100100
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
101101

102102
- name: Generate API documentation
103-
if: matrix.java == 'temurin@8'
103+
if: matrix.java == 'corretto@8'
104104
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
105105

106106
- name: Make target directories
@@ -126,29 +126,29 @@ jobs:
126126
matrix:
127127
os: [ubuntu-latest]
128128
scala: [2.13.10]
129-
java: [temurin@8]
129+
java: [corretto@8]
130130
runs-on: ${{ matrix.os }}
131131
steps:
132132
- name: Checkout current branch (full)
133133
uses: actions/checkout@v2
134134
with:
135135
fetch-depth: 0
136136

137-
- name: Download Java (temurin@8)
138-
id: download-java-temurin-8
139-
if: matrix.java == 'temurin@8'
137+
- name: Download Java (corretto@8)
138+
id: download-java-corretto-8
139+
if: matrix.java == 'corretto@8'
140140
uses: typelevel/download-java@v1
141141
with:
142-
distribution: temurin
142+
distribution: corretto
143143
java-version: 8
144144

145-
- name: Setup Java (temurin@8)
146-
if: matrix.java == 'temurin@8'
145+
- name: Setup Java (corretto@8)
146+
if: matrix.java == 'corretto@8'
147147
uses: actions/setup-java@v2
148148
with:
149149
distribution: jdkfile
150150
java-version: 8
151-
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
151+
jdkFile: ${{ steps.download-java-corretto-8.outputs.jdkFile }}
152152

153153
- name: Cache sbt
154154
uses: actions/cache@v2

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
55

66
ThisBuild / tlBaseVersion := "2.5"
77

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

1111
ThisBuild / githubWorkflowSbtCommand := "./sbt"
1212

@@ -18,7 +18,7 @@ ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
1818
)
1919

2020
ThisBuild / githubWorkflowBuildMatrixInclusions +=
21-
MatrixInclude(Map("scala" -> scala3, "java" -> temurin.render, "project" -> "rootNative"),
21+
MatrixInclude(Map("scala" -> scala3, "java" -> javaDistro.render, "project" -> "rootNative"),
2222
Map("os" -> "macos-latest")
2323
)
2424

0 commit comments

Comments
 (0)