Skip to content

Commit 5265974

Browse files
authored
Merge pull request #646 from ekrich/topic/native050
Upgrade to 0.5.0 and drop Scala 2.11 for Scala Native
2 parents c8bf4a8 + a35a4ae commit 5265974

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
platform: JS
2424
- java: 17
2525
platform: Native
26+
- scala: 2.11.x
27+
platform: Native
2628
include:
2729
- java: 8
2830
scala: 2.12.x

build.sbt

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ lazy val root = project
2323
.aggregate(
2424
compat211JVM,
2525
compat211JS,
26-
compat211Native,
2726
compat212JVM,
2827
compat212JS,
2928
compat212Native,
@@ -134,7 +133,6 @@ lazy val compat = new MultiScalaCrossProject(
134133
Test / fork := false // Scala.js cannot run forked tests
135134
).jsEnablePlugins(ScalaJSJUnitPlugin),
136135
_.nativeSettings(
137-
nativeLinkStubs := true,
138136
mimaPreviousArtifacts := (CrossVersion.partialVersion(scalaVersion.value) match {
139137
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
140138
case _ => mimaPreviousArtifacts.value
@@ -154,14 +152,13 @@ lazy val compat = new MultiScalaCrossProject(
154152
).nativeEnablePlugins(ScalaNativeJUnitPlugin)
155153
)
156154

157-
val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
155+
val compat211 = compat(Seq(JSPlatform, JVMPlatform), scala211)
158156
val compat212 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala212)
159157
val compat213 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala213)
160158
val compat3 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala3)
161159

162160
lazy val compat211JVM = compat211.jvm
163161
lazy val compat211JS = compat211.js
164-
lazy val compat211Native = compat211.native
165162
lazy val compat212JVM = compat212.jvm
166163
lazy val compat212JS = compat212.js
167164
lazy val compat212Native = compat212.native

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.12.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
55
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0")
66
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")

0 commit comments

Comments
 (0)