Skip to content

Commit cf398c8

Browse files
committed
Add slim version of OptionConverters to native
1 parent a8f0e76 commit cf398c8

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

build.sbt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ lazy val compat = new MultiScalaCrossProject(
122122
},
123123
Test / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / "compat/src/test/scala-js",
124124
Compile / unmanagedSourceDirectories += {
125-
val jsParent = (ThisBuild / baseDirectory).value / "compat/js/src/main"
125+
val jsAndNativeSourcesParent = (ThisBuild / baseDirectory).value / "compat/jsNative/src/main"
126126
CrossVersion.partialVersion(scalaVersion.value) match {
127127
case Some((3, _) | (2, 13)) =>
128-
jsParent / "scala-2.13"
128+
jsAndNativeSourcesParent / "scala-2.13"
129129
case _ =>
130-
jsParent / "scala-2.11_2.12"
130+
jsAndNativeSourcesParent / "scala-2.11_2.12"
131131
}
132132
},
133133
Test / fork := false // Scala.js cannot run forked tests
@@ -141,6 +141,15 @@ lazy val compat = new MultiScalaCrossProject(
141141
case Some((3, 1)) => mimaPreviousArtifacts.value.filter(_.revision != "2.6.0")
142142
case _ => mimaPreviousArtifacts.value
143143
}),
144+
Compile / unmanagedSourceDirectories += {
145+
val jsAndNativeSourcesParent = (ThisBuild / baseDirectory).value / "compat/jsNative/src/main"
146+
CrossVersion.partialVersion(scalaVersion.value) match {
147+
case Some((3, _) | (2, 13)) =>
148+
jsAndNativeSourcesParent / "scala-2.13"
149+
case _ =>
150+
jsAndNativeSourcesParent / "scala-2.11_2.12"
151+
}
152+
},
144153
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion,
145154
Test / fork := false // Scala Native cannot run forked tests
146155
)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
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.scala-lang.modules" % "sbt-scala-module" % "3.0.1")
66
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")

0 commit comments

Comments
 (0)