Merge pull request #441 from sjrd/support-sbt-1.8.0

Fix #440: Avoid using a '/' in the dummy version number for the linker.
scalacenter · Nov 14, 2022 · 923b452 · 923b452
2 parents 0d3c553 + c213ef6
commit 923b452
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 1 deletion.
diff --git a/sbt-scalajs-bundler/src/main/scala/scalajsbundler/sbtplugin/Settings.scala b/sbt-scalajs-bundler/src/main/scala/scalajsbundler/sbtplugin/Settings.scala
@@ -41,7 +41,7 @@ private[sbtplugin] object Settings {
         val retrieveDir = s.cacheDirectory / "scalajs-bundler-linker"
         val lm = (dependencyResolution in scalaJSLinkerImpl).value
         val dummyModuleID =
-          "ch.epfl.scala" % "scalajs-bundler-linker-and-scalajs-linker_2.12" % s"${BuildInfo.version}/$scalaJSVersion"
+          "ch.epfl.scala" % "scalajs-bundler-linker-and-scalajs-linker_2.12" % s"${BuildInfo.version}-$scalaJSVersion"
         val dependencies = Vector(
             // Load our linker back-end
             "ch.epfl.scala" % "scalajs-bundler-linker_2.12" % BuildInfo.version,

diff --git a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/build.sbt b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/build.sbt
@@ -0,0 +1,12 @@
+name := "newer-linker"
+
+enablePlugins(ScalaJSBundlerPlugin, ScalaJSJUnitPlugin)
+
+scalaVersion := "2.13.1"
+
+scalaJSUseMainModuleInitializer := true
+
+// Adds a dependency on the uuid npm package
+npmDependencies in Compile += "uuid" -> "3.1.0"
+
+ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet
diff --git a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/project/build.properties b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.8.0
diff --git a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/project/plugins.sbt b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/project/plugins.sbt
@@ -0,0 +1,8 @@
+val scalaJSVersion = sys.props.getOrElse("scalajs.version", sys.error("'scalajs.version' environment variable is not defined"))
+val scalaJSBundlerVersion = sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set"))
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % scalaJSBundlerVersion)
+
+ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet
diff --git a/...s-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/src/test/scala/example/BasicTest.scala b/...s-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/src/test/scala/example/BasicTest.scala
@@ -0,0 +1,12 @@
+package example
+
+import org.junit.Assert._
+import org.junit.Test
+
+class BasicTest {
+
+  @Test def newerLinker(): Unit = {
+    assertEquals("1", 1.0.toString())
+  }
+
+}
diff --git a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/test b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/test
@@ -0,0 +1 @@
+> test