Merge pull request #57 from SethTisue/sbt-1

SethTisue · web-flow · commit 5e661bea2551 · 2019-02-19T20:06:54.000-08:00
sbt 1 upgrade
diff --git 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
@@ -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/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
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")

Original file line number	Diff line number	Diff 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`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")`
	`1`	`+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")`
`2`	`2`	`addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")`