Skip to content

Commit

Permalink
scala-native 0.5 (#1241)
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k authored Jun 2, 2024
1 parent d7194c7 commit c22a918
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ lazy val commonJsSettings = Seq(
) ++ depends.jsMacrotaskExecutor

lazy val commonNativeSettings = Seq(
nativeLinkStubs := true
)

lazy val specs2Version = settingKey[String]("defines the current specs2 version")
Expand Down
14 changes: 7 additions & 7 deletions project/depends.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ object depends {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) =>
Seq(
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").cross(CrossVersion.for3Use2_13),
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3").cross(CrossVersion.for3Use2_13),
"org.scala-sbt" % "test-interface" % "1.0")
case _ =>
Seq(("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").cross(CrossVersion.for3Use2_13),
Seq(("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3").cross(CrossVersion.for3Use2_13),
"org.scala-sbt" % "test-interface" % "1.0",
"org.scala-js" %% "scalajs-stubs" % "1.0.0" % "provided")
}
Expand All @@ -38,7 +38,7 @@ object depends {
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
libraryDependencies ++=
Seq(
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").cross(CrossVersion.for3Use2_13),
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3").cross(CrossVersion.for3Use2_13),
("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).cross(CrossVersion.for3Use2_13)
)
)
Expand All @@ -49,13 +49,13 @@ object depends {
def nativeTest =
Seq(libraryDependencies ++= Seq(
"org.scala-native" %%% "test-interface" % nativeVersion,
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.1").cross(CrossVersion.for3Use2_13)
("org.portable-scala" %%% "portable-scala-reflect" % "1.1.3").cross(CrossVersion.for3Use2_13)
))

// used in specs2-matcher-extra
def scalaParser = libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.1.1"
def scalaParser = libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.4.0"

def scalaXml = libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.1.0"
def scalaXml = libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.3.0"

lazy val mockito = "org.mockito" % "mockito-core" % "4.11.0"
lazy val junit = "junit" % "junit" % "4.13.2"
Expand All @@ -66,7 +66,7 @@ object depends {
lazy val tagsoup = "org.ccil.cowan.tagsoup" % "tagsoup" % "1.2.1"

lazy val scalacheck = Def.setting {
"org.scalacheck" %%% "scalacheck" % "1.16.0"
"org.scalacheck" %%% "scalacheck" % "1.18.0"
}

lazy val resolvers =
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.13.0")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
val scalaNativeVersion =
Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.16")
Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.5.1")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
Expand Down

0 comments on commit c22a918

Please sign in to comment.