diff --git a/admin/build.sh b/admin/build.sh index c0585c46f..01548ad8d 100755 --- a/admin/build.sh +++ b/admin/build.sh @@ -39,7 +39,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="$projectPrefix/publish-signed" + publishTask="$projectPrefix/publishSigned" cat admin/gpg.sbt >> project/plugins.sbt cp admin/publish-settings.sbt . diff --git a/project/build.properties b/project/build.properties index 133a8f197..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 983887349..8920d978b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,13 +1,8 @@ -if (System.getProperty("java.version").startsWith("1.")) - Seq() -else - // override to version that works on Java 9, - // see https://github.com/scala/sbt-scala-module/issues/35 - Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")) +addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5") val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")