Merge pull request #215 from SethTisue/sbt-1

upgrade to sbt 1

Author: SethTisue

admin/build.sh

@@ -39,7 +39,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
     echo "Releasing $tagVer on Java version $currentJvmVer according to 'scalaVersionsByJvm' in build.sbt."
   fi
 
-  extraTarget="+publish-signed"
+  extraTarget="+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, see build.sh
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing, see build.sh

build.sbt

@@ -19,9 +19,6 @@ repoName := "async"
 
 version := "0.10.0-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")))
-
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
 libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test" // for ToolBox
 libraryDependencies += "junit" % "junit" % "4.12" % "test"

project/build.properties

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

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")