From efb60c4e1f828d6dc0a4bf44814fe1b92fd54c65 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 19 Feb 2019 20:19:57 -0800
Subject: [PATCH] upgrade to sbt 1

---
 admin/build.sh           | 2 +-
 admin/gpg.sbt            | 3 +--
 build.sbt                | 4 ----
 project/build.properties | 2 +-
 project/plugins.sbt      | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/admin/build.sh b/admin/build.sh
index db8692b..929aa55 100755
--- a/admin/build.sh
+++ b/admin/build.sh
@@ -29,7 +29,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="publish-signed"
+    publishTask="publishSigned"
 
     cat admin/gpg.sbt >> project/plugins.sbt
     cp admin/publish-settings.sbt .
diff --git a/admin/gpg.sbt b/admin/gpg.sbt
index d60e366..e6f00f4 100644
--- a/admin/gpg.sbt
+++ b/admin/gpg.sbt
@@ -1,2 +1 @@
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") // only added when publishing:
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing
diff --git a/build.sbt b/build.sbt
index 10f155c..e853b87 100644
--- a/build.sbt
+++ b/build.sbt
@@ -25,9 +25,6 @@ lazy val commonSettings = Seq(
   organization := "org.scala-lang.modules",
   version := "0.9.1-SNAPSHOT",
 
-  // this line could be removed after https://github.com/scala/sbt-scala-module/issues/48 is fixed
-  licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
-
   scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked")
 )
 
@@ -70,7 +67,6 @@ lazy val root = (project in file(".")).
       val runTarget = (mainClass in Compile in fnGen).value getOrElse "No main class defined for function conversion generator"
       val classPath = (fullClasspath in Compile in fnGen).value
       runner.value.run(runTarget, classPath.files, args, streams.value.log)
-        .foreach(sys.error)
       (out ** "*.scala").get
     }.taskValue,
 
diff --git a/project/build.properties b/project/build.properties
index 8e682c5..c0bab04 100644
--- 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
index 1e7f7c0..2de9ecd 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,4 +5,4 @@ scalacOptions ++= (sys.props("java.specification.version") match {
   case _ => Seq("-Xfatal-warnings")
 })
 
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")