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

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

diff --git a/admin/build.sh b/admin/build.sh
index 092ff05d..76f6ceba 100755
--- a/admin/build.sh
+++ b/admin/build.sh
@@ -47,7 +47,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="$projectPrefix/publish-signed"
+    publishTask="$projectPrefix/publishSigned"
 
     cat admin/gpg.sbt >> project/plugins.sbt
     cp admin/publish-settings.sbt .
diff --git a/admin/gpg.sbt b/admin/gpg.sbt
index 68ae4641..3b55e214 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, see build.sh
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1") // only added when publishing, see build.sh
diff --git a/build.sbt b/build.sbt
index e33f8c49..21fb89ec 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,8 +14,6 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
   settings(
     name := "scala-parser-combinators",
     version := "1.1.2-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"))),
     mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M6"),
 
     apiMappings += (scalaInstance.value.libraryJar ->
diff --git a/project/build.properties b/project/build.properties
index 8e682c52..c0bab049 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 08b141cc..aed096d9 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,11 +1,4 @@
-if (System.getProperty("java.version").startsWith("1."))
-  Seq()
-else
-  // override to version that works on Java 9,
-  // see https://github.com/scala/sbt-scala-module/issues/35
-  Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
-
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
 
 val scalaJSVersion =
   Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26")