Skip to content

Commit 28baacc

Browse files
authored
Merge pull request #377 from sideeffffect/scala-3-native-java-17
Scala Native 0.4.5: enables Scala 3 Native on Java 17
2 parents 0370c09 + a1e5670 commit 28baacc

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ jobs:
2626
os: [ubuntu-latest]
2727
scala: [2.11.12, 2.12.15, 2.13.8, 3.1.2]
2828
java: [temurin@8, temurin@17]
29-
exclude:
30-
- scala: 3.1.2
31-
java: temurin@17
3229
runs-on: ${{ matrix.os }}
3330
steps:
3431
- name: Checkout current branch (full)

build.sbt

+1-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ThisBuild / githubWorkflowBuildPreamble +=
2323
List("sudo apt-get install libutf8proc-dev"),
2424
name = Some("Install libutf8proc")
2525
)
26-
ThisBuild / githubWorkflowPublish := Seq(
26+
ThisBuild / githubWorkflowPublish := Seq(
2727
WorkflowStep.Sbt(
2828
List("ci-release"),
2929
env = Map(
@@ -35,16 +35,6 @@ ThisBuild / githubWorkflowPublish := Seq(
3535
)
3636
)
3737

38-
// https://github.com/scala-native/scala-native/issues/2611
39-
ThisBuild / githubWorkflowBuildMatrixExclusions ++= List(
40-
MatrixExclude(
41-
Map(
42-
"scala" -> scalaVersion3,
43-
"java" -> java17.render
44-
)
45-
)
46-
)
47-
4838
ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
4939

5040
val commonSettings: Seq[Setting[_]] = Seq(

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
55
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
66
addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0")

0 commit comments

Comments
 (0)