Merge pull request #134 from SethTisue/sbt-1

upgrade to sbt 1

Author: SethTisue

admin/build.sh

@@ -29,7 +29,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
     currentJvmVer=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/^1\.//' | sed 's/[^0-9].*//')
     echo "Releasing $tagVer with Scala $TRAVIS_SCALA_VERSION on Java version $currentJvmVer."
 
-    publishTask="publish-signed"
+    publishTask="publishSigned"
 
     cat admin/gpg.sbt >> project/plugins.sbt
     cp admin/publish-settings.sbt .

admin/gpg.sbt

@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") // only added when publishing:
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing

build.sbt

@@ -25,9 +25,6 @@ lazy val commonSettings = Seq(
   organization := "org.scala-lang.modules",
   version := "0.9.1-SNAPSHOT",
 
-  // this line could be removed after https://github.com/scala/sbt-scala-module/issues/48 is fixed
-  licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
-
   scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
 )
 
@@ -70,7 +67,6 @@ lazy val root = (project in file(".")).
       val runTarget = (mainClass in Compile in fnGen).value getOrElse "No main class defined for function conversion generator"
       val classPath = (fullClasspath in Compile in fnGen).value
       runner.value.run(runTarget, classPath.files, args, streams.value.log)
-        .foreach(sys.error)
       (out ** "*.scala").get
     }.taskValue,
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.18
+sbt.version=1.2.8

project/plugins.sbt

@@ -5,4 +5,4 @@ scalacOptions ++= (sys.props("java.specification.version") match {
   case _ => Seq("-Xfatal-warnings")
 })
 
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")