Skip to content

Commit

Permalink
Merge pull request #377 from sideeffffect/scala-3-native-java-17
Browse files Browse the repository at this point in the history
Scala Native 0.4.5: enables Scala 3 Native on Java 17
  • Loading branch information
cquiroz authored Jun 28, 2022
2 parents 0370c09 + a1e5670 commit 28baacc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
os: [ubuntu-latest]
scala: [2.11.12, 2.12.15, 2.13.8, 3.1.2]
java: [temurin@8, temurin@17]
exclude:
- scala: 3.1.2
java: temurin@17
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down
12 changes: 1 addition & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ThisBuild / githubWorkflowBuildPreamble +=
List("sudo apt-get install libutf8proc-dev"),
name = Some("Install libutf8proc")
)
ThisBuild / githubWorkflowPublish := Seq(
ThisBuild / githubWorkflowPublish := Seq(
WorkflowStep.Sbt(
List("ci-release"),
env = Map(
Expand All @@ -35,16 +35,6 @@ ThisBuild / githubWorkflowPublish := Seq(
)
)

// https://github.com/scala-native/scala-native/issues/2611
ThisBuild / githubWorkflowBuildMatrixExclusions ++= List(
MatrixExclude(
Map(
"scala" -> scalaVersion3,
"java" -> java17.render
)
)
)

ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)

val commonSettings: Seq[Setting[_]] = Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("io.github.cquiroz" % "sbt-locales" % "3.2.0")
Expand Down

0 comments on commit 28baacc

Please sign in to comment.