Add support for sbt 1.0.0-RC3 (#49)

portable-scala · Aug 7, 2017 · 04cbbb4 · 04cbbb4
1 parent 447264d
commit 04cbbb4
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 7 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 "++ 2.12.3" "^^ 1.0.0-RC3" sbt-crossproject/publishLocal
 
 cache:
   directories:

diff --git a/project/Extra.scala b/project/Extra.scala
@@ -12,7 +12,6 @@ object Extra {
       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
diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/CrossGroupArtifactID.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/CrossGroupArtifactID.scala
@@ -1,7 +1,6 @@
 package sbtcrossproject
 
 import sbt._
-import StringUtilities.nonEmpty
 
 final class CrossGroupArtifactID(groupID: String,
                                  artifactID: String,

diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/CrossGroupID.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/CrossGroupID.scala
@@ -1,7 +1,6 @@
 package sbtcrossproject
 
 import sbt._
-import StringUtilities.nonEmpty
 
 import scala.language.experimental.macros
 import scala.reflect.macros.Context

diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/CrossPlugin.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/CrossPlugin.scala
@@ -2,7 +2,6 @@ package sbtcrossproject
 
 import sbt._
 import sbt.KeyRanks.BSetting
-import StringUtilities.nonEmpty
 
 import scala.language.implicitConversions
 

diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/CrossProjectExtra.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/CrossProjectExtra.scala
@@ -92,4 +92,7 @@ trait CrossProjectExtra {
 
   def crossProject(platforms: Platform*): CrossProject.Builder =
     macro CrossProjectExtra.vargCrossProject_impl
+
+  private[sbtcrossproject] def nonEmpty(s: String, label: String): Unit =
+    require(s.trim.length > 0, label + " cannot be empty.")
 }
diff --git a/sbt-crossproject/src/main/scala/sbtcrossproject/package.scala b/sbt-crossproject/src/main/scala/sbtcrossproject/package.scala
@@ -1,6 +1,4 @@
 import sbt._
 import scala.language.implicitConversions
 
-import StringUtilities.nonEmpty
-
 package object sbtcrossproject extends CrossProjectExtra