mirror of https://github.com/sbt/sbt.git
[2.x] test: Enable scala-js tests (#9387)
This commit is contained in:
parent
4ed16c96ce
commit
22df8d9d49
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
ThisBuild / scalaVersion := "2.13.15"
|
||||
ThisBuild / scalaVersion := "2.13.18"
|
||||
ThisBuild / scalacOptions += "-Ytasty-reader"
|
||||
|
||||
lazy val scala3code = project
|
||||
.enablePlugins(ScalaJSPlugin)
|
||||
.settings(scalaVersion := "3.3.4")
|
||||
.settings(scalaVersion := "3.3.8")
|
||||
|
||||
lazy val app = project
|
||||
.enablePlugins(ScalaJSPlugin)
|
||||
.dependsOn(scala3code)
|
||||
.settings(
|
||||
libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))),
|
||||
addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.15" % scalaJSVersion),
|
||||
addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.18" % scalaJSVersion),
|
||||
scalaJSUseMainModuleInitializer := true,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ThisBuild / scalaVersion := "3.3.4"
|
||||
ThisBuild / scalaVersion := "3.3.8"
|
||||
ThisBuild / scalacOptions += "-Ytasty-reader"
|
||||
|
||||
lazy val scala213 = "2.13.15"
|
||||
lazy val scala213 = "2.13.18"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.aggregate(fooApp, fooCore, barApp, barCore)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "2.13.15"
|
||||
ThisBuild / scalaVersion := "2.13.18"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.aggregate(macroProvider, macroClient)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
# Marked as pending due to StackOverflow error, see
|
||||
# https://github.com/sbt/sbt/issues/1544 for details
|
||||
|
||||
> compile
|
||||
|
||||
# replace macro with one that throws an error
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
ThisBuild / scalaVersion := "2.13.15"
|
||||
ThisBuild / scalaVersion := "2.13.18"
|
||||
ThisBuild / scalacOptions += "-Ytasty-reader"
|
||||
|
||||
lazy val scala3code = project
|
||||
.enablePlugins(ScalaJSPlugin)
|
||||
.settings(scalaVersion := "3.3.4")
|
||||
.settings(scalaVersion := "3.3.8")
|
||||
|
||||
lazy val app = project
|
||||
.enablePlugins(ScalaJSPlugin)
|
||||
.dependsOn(scala3code)
|
||||
.settings(
|
||||
scalaVersion := "2.13.15",
|
||||
scalaVersion := "2.13.18",
|
||||
scalacOptions += "-Ytasty-reader",
|
||||
scalaJSUseMainModuleInitializer := true
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ThisBuild / scalaVersion := "2.13.1"
|
||||
ThisBuild / scalaVersion := "2.13.18"
|
||||
|
||||
lazy val root = (project in file("."))
|
||||
.enablePlugins(ScalaJSPlugin)
|
||||
.settings(
|
||||
libraryDependencies += "org.scala-js" %%% "scalajs-java-time" % "1.0.0"
|
||||
libraryDependencies += "org.scala-js" %% "scalajs-java-time" % "1.0.0"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ lazy val custom =
|
|||
)
|
||||
|
||||
check := {
|
||||
val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.mapValues(_.toSet)
|
||||
val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.mapValues(_.toSet)
|
||||
val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.view.mapValues(_.toSet).toMap
|
||||
val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.view.mapValues(_.toSet).toMap
|
||||
|
||||
val isJvm = VirtualAxis.jvm
|
||||
val isJs = VirtualAxis.js
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -1,17 +1,12 @@
|
|||
// lazy val root = (project in file("."))
|
||||
// .aggregate(core.projectRefs ++ app.projectRefs: _*)
|
||||
// .settings(
|
||||
// )
|
||||
|
||||
lazy val core = (projectMatrix in file("core"))
|
||||
.settings(
|
||||
name := "core"
|
||||
)
|
||||
.jsPlatform(scalaVersions = Seq("2.12.8", "2.11.12"))
|
||||
.jsPlatform(scalaVersions = Seq("2.12.21", "2.13.18"))
|
||||
|
||||
lazy val app = (projectMatrix in file("app"))
|
||||
.dependsOn(core)
|
||||
.settings(
|
||||
name := "app"
|
||||
)
|
||||
.jsPlatform(scalaVersions = Seq("2.12.8"))
|
||||
.jsPlatform(scalaVersions = Seq("2.12.21"))
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
> fastOptJS
|
||||
|
||||
$ exists app/target/js-2.12/app-fastopt.js
|
||||
$ exists core/target/js-2.12/core-fastopt.js
|
||||
$ exists core/target/js-2.11/core-fastopt.js
|
||||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
> fastOptJS
|
||||
|
||||
$ exists target/out/sjs1/scala-2.12.21/core/core-fastopt.js
|
||||
$ exists target/out/sjs1/scala-2.12.21/app/app-fastopt.js
|
||||
$ exists target/out/sjs1/scala-2.13.18/core/core-fastopt.js
|
||||
|
|
@ -1 +1 @@
|
|||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
|
||||
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
|
||||
|
|
|
|||
Loading…
Reference in New Issue