diff --git a/sbt-scalajs-bundler/src/main/scala/scalajsbundler/sbtplugin/Settings.scala b/sbt-scalajs-bundler/src/main/scala/scalajsbundler/sbtplugin/Settings.scala index 1a92bdf5..f4c82140 100644 --- 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 new file mode 100644 index 00000000..47abaeae --- /dev/null +++ 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 new file mode 100644 index 00000000..8b9a0b0a --- /dev/null +++ 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 new file mode 100644 index 00000000..77ac06f1 --- /dev/null +++ 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/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/src/test/scala/example/BasicTest.scala b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/src/test/scala/example/BasicTest.scala new file mode 100644 index 00000000..87458ba2 --- /dev/null +++ b/sbt-scalajs-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 new file mode 100644 index 00000000..dfffb838 --- /dev/null +++ b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/sbt-1.8/test @@ -0,0 +1 @@ +> test