From aa030022566b416d8ad6441cc5c697d2c1201385 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Tue, 18 Jul 2017 01:24:44 +0900
Subject: [PATCH] support sbt 1.0.0-RC2

---
 .travis.yml                                    |  1 +
 project/Extra.scala                            | 18 ++++++++++++++++--
 project/build.properties                       |  2 +-
 .../scala-sbt-1.0/sbt/StringUtilities.scala    |  6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 sbt-crossproject/src/main/scala-sbt-1.0/sbt/StringUtilities.scala

diff --git a/.travis.yml b/.travis.yml
index c57fed1..0475ab3 100644
--- 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
index ed8ac21..a89cea1 100644
--- 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
index 64317fd..d9654cd 100644
--- 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
new file mode 100644
index 0000000..1d41715
--- /dev/null
+++ 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)
+}