Skip to content

Upgrade to 0.5.0 and drop Scala 2.11 for Scala Native #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2024
+4 −5
Merged

Upgrade to 0.5.0 and drop Scala 2.11 for Scala Native #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bab0f5f
Upgrade to 0.5.0 and drop Scala 2.11 for Scala Native
ekrich Mar 18, 2024
e7d4478
Exclude Scala 2.11 in CI for Scala Native
ekrich Mar 18, 2024
a35a4ae
Update to Scala Native 0.5.0
ekrich Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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