support sbt 1.0.0-RC2

portable-scala · Jul 17, 2017 · aa03002 · aa03002
1 parent 447264d
commit aa03002
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,6 +69,7 @@ before_script:
 script:
   - java -version
   - bin/scalafmt --test && sbt sbt-crossproject-test/scripted
+  - sbt "^^ 1.0.0-RC2" sbt-crossproject/compile
 
 cache:
   directories:

diff --git a/project/Extra.scala b/project/Extra.scala
@@ -8,11 +8,25 @@ import bintray.BintrayKeys.{bintrayRepository, bintrayOrganization}
 
 object Extra {
 
-  val sbtPluginSettings = ScriptedPlugin.scriptedSettings ++ Seq(
+  val sbtPluginSettings = ScriptedPlugin.scriptedSettings.filterNot(_.key.key.label == libraryDependencies.key.label) ++ Seq(
+      // https://github.com/sbt/sbt/issues/3325
+      libraryDependencies ++= {
+        CrossVersion.binarySbtVersion(scriptedSbt.value) match {
+          case "0.13" =>
+            Seq(
+              "org.scala-sbt" % "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
+              "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
+            )
+          case _ =>
+            Seq(
+              "org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % scriptedConf.toString,
+              "org.scala-sbt" % "sbt-launch" % scriptedSbt.value % scriptedLaunchConf.toString
+            )
+        }
+      },
       organization := "org.scala-native",
       version := "0.2.0",
       sbtPlugin := true,
-      scalaVersion := "2.10.6",
       scriptedLaunchOpts += "-Dplugin.version=" + version.value,
       scalacOptions ++= Seq(
         "-deprecation",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16-M1
diff --git a/sbt-crossproject/src/main/scala-sbt-1.0/sbt/StringUtilities.scala b/sbt-crossproject/src/main/scala-sbt-1.0/sbt/StringUtilities.scala
@@ -0,0 +1,6 @@
+package sbt
+
+object StringUtilities {
+  def nonEmpty(s: String, label: String): Unit =
+    sbt.internal.librarymanagement.StringUtilities.nonEmpty(s, label)
+}