Skip to content

Commit 7d2291c

Browse files
committed
Scala Native 0.5.3
1 parent 2f9192f commit 7d2291c

File tree

4 files changed

+24
-29
lines changed

4 files changed

+24
-29
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
matrix:
3131
os: [ubuntu-latest]
3232
scala: [2.12, 2.13, 3]
33-
java: [temurin@11]
33+
java: [corretto@11]
3434
project: [rootJS, rootJVM, rootNative]
3535
include:
3636
- scala: 3
37-
java: temurin@11
37+
java: corretto@11
3838
project: rootNative
3939
os: macos-latest
4040
exclude:
@@ -51,17 +51,17 @@ jobs:
5151
with:
5252
fetch-depth: 0
5353

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

6363
- name: sbt update
64-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
64+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
6565
run: ./sbt +update
6666

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

8181
- name: Check binary compatibility
82-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
82+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
8383
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
8484

8585
- name: Generate API documentation
86-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
86+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
8787
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8888

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

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

128128
- name: sbt update
129-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
129+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
130130
run: ./sbt +update
131131

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

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

249249
- name: sbt update
250-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
250+
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
251251
run: ./sbt +update
252252

253253
- name: Submit Dependencies

.jvmopts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
-Xmx5g
1+
-Xmx4g
22
-Xss4m
3-
-XX:+UseShenandoahGC
43
-Dfile.encoding=UTF8
54
-XX:+PrintCommandLineFlags

build.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ThisBuild / tlBaseVersion := "2.5"
77

88
ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
99

10-
val javaDistro = JavaSpec.temurin("11")
10+
val javaDistro = JavaSpec.corretto("11")
1111
ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1212

1313
ThisBuild / githubWorkflowSbtCommand := "./sbt"
@@ -27,10 +27,6 @@ ThisBuild / githubWorkflowBuildMatrixInclusions +=
2727
val tzdbVersion = "2019c"
2828
val scalajavaLocalesVersion = "1.5.4"
2929
Global / onChangedBuildSource := ReloadOnSourceChanges
30-
Global / concurrentRestrictions ++= List(
31-
Tags.limit(NativeTags.Link, 1),
32-
Tags.limit(Tags.Test, 1)
33-
)
3430

3531
lazy val downloadFromZip: TaskKey[Unit] =
3632
taskKey[Unit]("Download the tzdb tarball and extract it")

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-ci-release" % "0.7.1")
88

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

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

0 commit comments

Comments
 (0)