Skip to content

Commit 27a1d56

Browse files
committed
upgrade to sbt 1
1 parent d418b84 commit 27a1d56

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
2929
currentJvmVer=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/^1\.//' | sed 's/[^0-9].*//')
3030
echo "Releasing $tagVer with Scala $TRAVIS_SCALA_VERSION on Java version $currentJvmVer."
3131
32-
publishTask="publish-signed"
32+
publishTask="publishSigned"
3333
3434
cat admin/gpg.sbt >> project/plugins.sbt
3535
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:
1+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing

build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ lazy val root = (project in file(".")).
7070
val runTarget = (mainClass in Compile in fnGen).value getOrElse "No main class defined for function conversion generator"
7171
val classPath = (fullClasspath in Compile in fnGen).value
7272
runner.value.run(runTarget, classPath.files, args, streams.value.log)
73-
.foreach(sys.error)
7473
(out ** "*.scala").get
7574
}.taskValue,
7675

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-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ scalacOptions ++= (sys.props("java.specification.version") match {
55
case _ => Seq("-Xfatal-warnings")
66
})
77

8-
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)