Skip to content

Commit b7f1f45

Browse files
committed
Scala Native 0.5.x
1 parent ab68276 commit b7f1f45

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
31-
scala: [2.12.17, 2.13.10, 3.2.1]
32-
java: [temurin@11]
31+
scala: [2.12.17, 2.13.10, 3.3.3]
32+
java: [temurin@8]
3333
project: [rootJS, rootJVM, rootNative]
3434
include:
35-
- scala: 3.2.1
36-
java: temurin@11
35+
- scala: 3.3.3
36+
java: temurin@8
3737
project: rootNative
3838
os: macos-latest
3939
exclude:
40-
- scala: 3.2.1
40+
- scala: 3.3.3
4141
project: rootJVM
42-
- scala: 3.2.1
42+
- scala: 3.3.3
4343
project: rootNative
4444
os: ubuntu-latest
4545
runs-on: ${{ matrix.os }}
@@ -49,21 +49,21 @@ jobs:
4949
with:
5050
fetch-depth: 0
5151

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

60-
- name: Setup Java (temurin@11)
61-
if: matrix.java == 'temurin@11'
60+
- name: Setup Java (temurin@8)
61+
if: matrix.java == 'temurin@8'
6262
uses: actions/setup-java@v2
6363
with:
6464
distribution: jdkfile
65-
java-version: 11
66-
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
65+
java-version: 8
66+
jdkFile: ${{ steps.download-java-temurin-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@11'
84+
if: matrix.java == 'temurin@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@11'
99+
if: matrix.java == 'temurin@8'
100100
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
101101

102102
- name: Generate API documentation
103-
if: matrix.java == 'temurin@11'
103+
if: matrix.java == 'temurin@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@11]
129+
java: [temurin@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@11)
138-
id: download-java-temurin-11
139-
if: matrix.java == 'temurin@11'
137+
- name: Download Java (temurin@8)
138+
id: download-java-temurin-8
139+
if: matrix.java == 'temurin@8'
140140
uses: typelevel/download-java@v1
141141
with:
142142
distribution: temurin
143-
java-version: 11
143+
java-version: 8
144144

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

153153
- name: Cache sbt
154154
uses: actions/cache@v2
@@ -222,12 +222,12 @@ jobs:
222222
tar xf targets.tar
223223
rm targets.tar
224224
225-
- name: Download target directories (3.2.1, rootJS)
225+
- name: Download target directories (3.3.3, rootJS)
226226
uses: actions/download-artifact@v2
227227
with:
228-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJS
228+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-rootJS
229229

230-
- name: Inflate target directories (3.2.1, rootJS)
230+
- name: Inflate target directories (3.3.3, rootJS)
231231
run: |
232232
tar xf targets.tar
233233
rm targets.tar

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
val scala213 = "2.13.10"
2-
val scala3 = "3.2.1"
2+
val scala3 = "3.3.3"
33
ThisBuild / scalaVersion := scala213
44
ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
55

66
ThisBuild / tlBaseVersion := "2.5"
77

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

1111
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
1212
MatrixExclude(Map("scala" -> scala3, "project" -> "rootJVM")), // TODO
@@ -16,12 +16,12 @@ ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
1616
)
1717

1818
ThisBuild / githubWorkflowBuildMatrixInclusions +=
19-
MatrixInclude(Map("scala" -> scala3, "java" -> temurin11.render, "project" -> "rootNative"),
19+
MatrixInclude(Map("scala" -> scala3, "java" -> temurin.render, "project" -> "rootNative"),
2020
Map("os" -> "macos-latest")
2121
)
2222

2323
val tzdbVersion = "2019c"
24-
val scalajavaLocalesVersion = "1.5.1"
24+
val scalajavaLocalesVersion = "1.6.0"
2525
Global / onChangedBuildSource := ReloadOnSourceChanges
2626

2727
lazy val downloadFromZip: TaskKey[Unit] =

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.0
1+
sbt.version=1.10.0

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.17")
88

99
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
1010

11-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.11")
11+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")

0 commit comments

Comments
 (0)