Fix scripted tests to run conditionally

Author: jonas

.travis.yml

@@ -7,8 +7,8 @@ env:
     - TRAVIS_NODE_VERSION="8"
 matrix:
   include:
-  - env: SBT_VERSION="0.13.16"
-  - env: SBT_VERSION="1.0.1"
+  - env: TRAVIS_SBT_VERSION="0.13.16"
+  - env: TRAVIS_SBT_VERSION="1.0.1"
 before_install:
   # Install Node.js and yarn.
   - nvm install 6
@@ -17,7 +17,7 @@ before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.24.6
   - export PATH=$HOME/.yarn/bin:$PATH
 script:
-  - sbt -no-colors ";^^$SBT_VERSION;test;scripted"
+  - sbt -no-colors ";^^$TRAVIS_SBT_VERSION;test;runScripted"
 cache:
   directories:
     - $HOME/.ivy2/cache

build.sbt

@@ -1,11 +1,17 @@
 import sbtunidoc.Plugin.ScalaUnidoc
 import sbtunidoc.Plugin.UnidocKeys.unidoc
 
+val runScripted = taskKey[Unit]("Run supported sbt scripted tests")
+
 val `sbt-scalajs-bundler` =
   project.in(file("sbt-scalajs-bundler"))
     .settings(commonSettings: _*)
     .settings(
       sbtPlugin := true,
+      runScripted := filterScripted {
+        case "0.13" => Nil
+        case "1.0"  => Nil
+      }.value,
       name := "sbt-scalajs-bundler",
       description := "Module bundler for Scala.js projects",
       addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
@@ -16,6 +22,10 @@ val `sbt-web-scalajs-bundler` =
     .settings(commonSettings: _*)
     .settings(
       sbtPlugin := true,
+      runScripted := filterScripted {
+        case "0.13" => Nil
+        case "1.0"  => Seq(_ / "sbt-web-scalajs-bundler" * "play")
+      }.value,
       scriptedDependencies := {
         val () = scriptedDependencies.value
         val () = publishLocal.value
@@ -141,3 +151,17 @@ lazy val noPublishSettings =
     publish := (),
     publishLocal := ()
   )
+
+def filterScripted(excludeF: PartialFunction[String, Seq[File => PathFinder]]) = Def.taskDyn {
+  val base = sbtTestDirectory.value
+  val allTests = base * AllPassFilter * AllPassFilter filter { _.isDirectory }
+  val exclude = excludeF((sbtBinaryVersion in pluginCrossBuild).value)
+  val tests = exclude.map(_.apply(base)).foldLeft(allTests)(
+    (remaining, excluded) => remaining --- excluded).get
+  def args = tests.map(Path.relativeTo(base)).flatten.mkString(" ")
+
+  if (tests.nonEmpty)
+    Def.task(scripted.toTask(" " + args).value)
+  else
+    Def.task(streams.value.log.warn("No tests can be run for this sbt version"))
+}

manual/src/ornate/getting-started.md

@@ -11,7 +11,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}")
 ~~~
 
 > {.note}
-> Note that the plugin requires Scala.js 0.6.18+.
+> Note that the plugin requires Scala.js 0.6.18+ for sbt 0.13 and
+> Scala.js 0.6.19 for sbt 1.0.
 
 Enable the `ScalaJSBundlerPlugin`, in your `build.sbt` file:
 

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/additonalNpmConfig/project/build.properties

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/additonalNpmConfig/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/browserless/project/build.properties

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/browserless/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/facade-examples/project/build.properties

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/facade-examples/project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/facade/project/build.properties

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/facade/project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/global-namespace-with-jsdom-unit-testing/project/build.properties

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/global-namespace-with-jsdom-unit-testing/project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/global-namespace/project/build.properties

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.23"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/global-namespace/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/js-resources/project/build.properties

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
 
-libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.27"
+libraryDependencies += "net.sourceforge.htmlunit" % "htmlunit" % "2.27"

sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/js-resources/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % sys.props.getOrElse("plugin.version", sys.error("'plugin.version' environment variable is not set")))