From 9108be03edff2b8d1efc5536018d636473e9fbf9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 19 Feb 2019 20:28:03 -0800 Subject: [PATCH] upgrade to sbt 1 --- admin/build.sh | 2 +- admin/gpg.sbt | 3 +-- build.sbt | 3 --- project/build.properties | 2 +- project/plugins.sbt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/admin/build.sh b/admin/build.sh index 7cb5c34a..61edcdd3 100755 --- a/admin/build.sh +++ b/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 . diff --git a/admin/gpg.sbt b/admin/gpg.sbt index 68ae4641..3b55e214 100644 --- a/admin/gpg.sbt +++ b/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 diff --git a/build.sbt b/build.sbt index 4593c03b..21967fb8 100644 --- a/build.sbt +++ b/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" diff --git a/project/build.properties b/project/build.properties index 8e682c52..c0bab049 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.18 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 005d1e27..57a656c8 100644 --- a/project/plugins.sbt +++ b/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")