Skip to content

Commit a791f33

Browse files
committed
upgrade to sbt 1
1 parent a78a862 commit a791f33

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
4747
currentJvmVer=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/^1\.//' | sed 's/[^0-9].*//')
4848
echo "Releasing $tagVer with Scala $TRAVIS_SCALA_VERSION on Java version $currentJvmVer."
4949

50-
publishTask="$projectPrefix/publish-signed"
50+
publishTask="$projectPrefix/publishSigned"
5151

5252
cat admin/gpg.sbt >> project/plugins.sbt
5353
cp admin/publish-settings.sbt .

admin/gpg.sbt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
2-
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") // only added when publishing, see build.sh
1+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing, see build.sh

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.18
1+
sbt.version=1.2.8

project/plugins.sbt

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
if (System.getProperty("java.version").startsWith("1."))
2-
Seq()
3-
else
4-
// override to version that works on Java 9,
5-
// see https://github.com/scala/sbt-scala-module/issues/35
6-
Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
7-
8-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
92

103
val scalaJSVersion =
114
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26")

0 commit comments

Comments
 (0)