From bcc74a962eb66d4c551a091b65e4f8db233addb0 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 13 Jun 2017 00:10:21 -0400
Subject: [PATCH] bump to using sbt 1.0.0-M6

We are missing the plugin for Scalafmt but I think we need to use beta2 ourselves.
---
 .travis.yml                  |  2 +-
 project/ScalafmtPlugin.scala |  4 ++++
 project/Sxr.scala            | 13 +++++++++----
 project/Util.scala           |  2 +-
 project/build.properties     |  2 +-
 project/plugins.sbt          |  5 +++--
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 project/ScalafmtPlugin.scala

diff --git a/.travis.yml b/.travis.yml
index feb7bebb2..a9bf28edc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
 
 env:
   matrix:
-    - SBT_CMD=";test:compile;scalafmt::test;test:scalafmt::test;mainSettingsProj/test;safeUnitTests;otherUnitTests"
+    - SBT_CMD=";test:compile;mainSettingsProj/test;safeUnitTests;otherUnitTests"
   # - SBT_CMD="mimaReportBinaryIssues"
     - SBT_CMD="scripted actions/*"
     - SBT_CMD="scripted apiinfo/* compiler-project/* ivy-deps-management/*"
diff --git a/project/ScalafmtPlugin.scala b/project/ScalafmtPlugin.scala
new file mode 100644
index 000000000..1ab0ae778
--- /dev/null
+++ b/project/ScalafmtPlugin.scala
@@ -0,0 +1,4 @@
+import sbt._
+
+// This is a placeholder so we don't have to change build.sbt.
+object ScalafmtPlugin extends AutoPlugin {}
diff --git a/project/Sxr.scala b/project/Sxr.scala
index 32ae16e0c..e96aaad21 100644
--- a/project/Sxr.scala
+++ b/project/Sxr.scala
@@ -26,17 +26,22 @@ object Sxr {
     target := target.in(taskGlobal).value / "browse",
     sxr in taskGlobal := sxrTask.value
   )
-  def taskGlobal = ThisScope.copy(task = Global)
+  def taskGlobal = ThisScope.copy(task = Zero)
   def sxrTask = Def task {
     val out = target.value
     val outputDir = out.getParentFile / (out.getName + ".sxr")
+    val log = streams.value.log
+    val si = scalaInstance.value
+    val cp = fullClasspath.value
+    val so = scalacOptions.value
+    val co = classpathOptions.value
     val f = FileFunction.cached(streams.value.cacheDirectory / "sxr", FilesInfo.hash) { in =>
-      streams.value.log.info("Generating sxr output in " + outputDir.getAbsolutePath + "...")
+      log.info("Generating sxr output in " + outputDir.getAbsolutePath + "...")
       IO.delete(out)
       IO.createDirectory(out)
       val comp =
-        new RawCompiler(scalaInstance.value, classpathOptions.value, streams.value.log)
-      comp(in.toSeq.sorted, fullClasspath.value.files, out, scalacOptions.value)
+        new RawCompiler(si, co, log)
+      comp(in.toSeq.sorted, cp.files, out, so)
       Set(outputDir)
     }
     f(sources.value.toSet)
diff --git a/project/Util.scala b/project/Util.scala
index 5f8d13bd1..bfb02bd2b 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -93,7 +93,7 @@ object Util {
   }
   def lastCompilationTime(analysis: Analysis): Long = {
     val lastCompilation = analysis.compilations.allCompilations.lastOption
-    lastCompilation.map(_.startTime) getOrElse 0L
+    lastCompilation.map(_.getStartTime) getOrElse 0L
   }
   def generateVersionFile(version: String,
                           dir: File,
diff --git a/project/build.properties b/project/build.properties
index 4a8f6a6c4..cd66fd542 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.0-M5
+sbt.version=1.0.0-M6
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b6eb790fe..d97012445 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,9 +5,10 @@ scalacOptions ++= Seq("-feature", "-language:postfixOps")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.0")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.2")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
-//addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.7.0-RC1")
-addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "0.3")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
+
+// hopefully this comes back soon.
+// addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "0.3")