From b1be0ffdb30ae46e6db3e429299283dfb354d2b6 Mon Sep 17 00:00:00 2001
From: pschord <pschord@users.noreply.github.com>
Date: Mon, 13 Jan 2020 17:59:24 -0500
Subject: [PATCH] Upgrade SBT to 1.3.6 (#322)

---
 build.sbt                | 22 ++++++++++------------
 project/build.properties |  2 +-
 project/plugins.sbt      |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index 431ff8cee..4274e03bb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,5 @@
+import xerial.sbt.pack.PackPlugin._
+
 lazy val commonSettings = Seq(
   organization := "net.psforever",
   version := "1.0.2-SNAPSHOT",
@@ -10,16 +12,9 @@ lazy val commonSettings = Seq(
   testOptions in QuietTest += Tests.Argument(TestFrameworks.Specs2, "showOnly", "x!"),
   // http://www.scalatest.org/user_guide/using_the_runner
   testOptions in QuietTest += Tests.Argument(TestFrameworks.ScalaTest, "-oCEHILMNOPQRX"),
-  // TODO: remove when upgraded to SBT 1.0+ https://github.com/sbt/sbt/pull/2747/files
-  ivyLoggingLevel := {
-    // This will suppress "Resolving..." logs on Jenkins and Travis.
-    if (sys.env.get("BUILD_NUMBER").isDefined || sys.env.get("CI").isDefined) UpdateLogging.Quiet
-    else UpdateLogging.Default
-  },
   // Trick taken from https://groups.google.com/d/msg/scala-user/mxV9ok7J_Eg/kt-LnsrD0bkJ
   // scaladoc flags: https://github.com/scala/scala/blob/2.11.x/src/scaladoc/scala/tools/nsc/doc/Settings.scala
-  scalacOptions in (Compile,doc) <<= baseDirectory map {
-    bd => Seq(
+  scalacOptions in (Compile,doc) := { Seq(
     "-groups",
     "-implicits",
     "-doc-title", "PSF-LoginServer - ",
@@ -27,7 +22,7 @@ lazy val commonSettings = Seq(
     "-doc-footer", "Copyright PSForever",
     // For non unidoc builds, you may need bd.getName before the template parameter
     "-doc-source-url", "https://github.com/psforever/PSF-LoginServer/blob/master/€{FILE_PATH}.scala",
-    "-sourcepath", bd.getAbsolutePath // needed for scaladoc relative source paths
+    "-sourcepath", baseDirectory.value.getAbsolutePath // needed for scaladoc relative source paths
     )
   },
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
@@ -59,7 +54,8 @@ lazy val pscryptoSettings = Seq(
   unmanagedClasspath in Compile += (baseDirectory in ThisBuild).value / "pscrypto-lib"
 )
 
-lazy val psloginPackSettings = packAutoSettings ++ Seq(
+lazy val psloginPackSettings = Seq(
+  packMain := Map("ps-login" -> "PsLogin"),
   packArchivePrefix := "pslogin",
   packExtraClasspath := Map("ps-login" -> Seq("${PROG_HOME}/pscrypto-lib",
     "${PROG_HOME}/config")),
@@ -69,10 +65,12 @@ lazy val psloginPackSettings = packAutoSettings ++ Seq(
 
 lazy val root = (project in file(".")).
   configs(QuietTest).
+  enablePlugins(PackPlugin).
   settings(commonSettings: _*).
-  //enablePlugins(ScalaUnidocPlugin).
   settings(psloginPackSettings: _*).
-  aggregate(pslogin, common)
+  //enablePlugins(ScalaUnidocPlugin).
+  aggregate(pslogin, common).
+  dependsOn(pslogin, common)
 
 lazy val pslogin = (project in file("pslogin")).
   configs(QuietTest).
diff --git a/project/build.properties b/project/build.properties
index d638b4f34..616536b2b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 0.13.8
\ No newline at end of file
+sbt.version = 1.3.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4e23b078b..6a1b134b5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
+addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.12")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 // https://github.com/sbt/sbt-unidoc
 //addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")