Skip to content

Commit

Permalink
Merge pull request #646 from ekrich/topic/native050
Browse files Browse the repository at this point in the history
Upgrade to 0.5.0 and drop Scala 2.11 for Scala Native
  • Loading branch information
SethTisue authored Apr 15, 2024
2 parents c8bf4a8 + a35a4ae commit 5265974
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
platform: JS
- java: 17
platform: Native
- scala: 2.11.x
platform: Native
include:
- java: 8
scala: 2.12.x
Expand Down
5 changes: 1 addition & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ lazy val root = project
.aggregate(
compat211JVM,
compat211JS,
compat211Native,
compat212JVM,
compat212JS,
compat212Native,
Expand Down Expand Up @@ -134,7 +133,6 @@ lazy val compat = new MultiScalaCrossProject(
Test / fork := false // Scala.js cannot run forked tests
).jsEnablePlugins(ScalaJSJUnitPlugin),
_.nativeSettings(
nativeLinkStubs := true,
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
case _ => mimaPreviousArtifacts.value
Expand All @@ -154,14 +152,13 @@ lazy val compat = new MultiScalaCrossProject(
).nativeEnablePlugins(ScalaNativeJUnitPlugin)
)

val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
val compat211 = compat(Seq(JSPlatform, JVMPlatform), scala211)
val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
val compat3 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)

lazy val compat211JVM = compat211.jvm
lazy val compat211JS = compat211.js
lazy val compat211Native = compat211.native
lazy val compat212JVM = compat212.jvm
lazy val compat212JS = compat212.js
lazy val compat212Native = compat212.native
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.12.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
Expand Down

0 comments on commit 5265974

Please sign in to comment.