Skip to content

Commit 9b85bf7

Browse files
ashawleySethTisue
authored andcommitted
Update build to sbt 1.2.8
1 parent 7d1b5fc commit 9b85bf7

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

admin/build.sh

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

42-
publishTask="$projectPrefix/publish-signed"
42+
publishTask="$projectPrefix/publishSigned"
4343

4444
cat admin/gpg.sbt >> project/plugins.sbt
4545
cp admin/publish-settings.sbt .

project/build.properties

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

project/plugins.sbt

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
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"))
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
72

83
val scalaJSVersion =
94
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
105

116
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
127
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
13-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
8+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")

0 commit comments

Comments
 (0)