From c7db0f8fe64fe3bf12668e5f1474b716805797e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93lafur=20P=C3=A1ll=20Geirsson?= <olafurpg@gmail.com>
Date: Thu, 31 May 2018 23:33:08 +0200
Subject: [PATCH] Upgrade to 2.12.6

This required upgrading

- sbt-scalajs
- sbt-scalafix

Already discovered issues in latest scalafix milestone that needs
fixing.
---
 build.sbt                   | 13 ++++++++++++-
 project/Dependencies.scala  |  7 ++-----
 project/plugins.sbt         |  6 +++---
 project/project/plugins.sbt |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index c0134794f..c3981759e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,6 +8,11 @@ version.in(ThisBuild) ~= { old: String =>
   sys.props.getOrElse("scalafix.version", old.replace('+', '-') + suffix)
 }
 
+lazy val scalafixSettings = List(
+  addCompilerPlugin(scalafixSemanticdb),
+  scalacOptions += "-Yrangepos"
+)
+
 lazy val scalaFixedProjects: List[ProjectReference] =
   List(
     testsOutputDotty,
@@ -81,7 +86,8 @@ val diff = MultiScalaCrossProject(
   "diff",
   _.settings(
     moduleName := "scalafix-diff",
-    description := "JVM/JS library to build unified diffs."
+    description := "JVM/JS library to build unified diffs.",
+    scalafixSettings
   ).jvmSettings(
       libraryDependencies += googleDiff
     )
@@ -104,6 +110,7 @@ val core = MultiScalaCrossProject(
   "core",
   _.settings(
     buildInfoSettings,
+    scalafixSettings,
     libraryDependencies ++= List(
       scalameta.value,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
@@ -129,6 +136,7 @@ val reflect = MultiScalaProject(
   "reflect",
   _.settings(
     isFullCrossVersion,
+    scalafixSettings,
     libraryDependencies ++= Seq(
       metacp,
       "org.scala-lang" % "scala-compiler" % scalaVersion.value,
@@ -144,6 +152,7 @@ val cli = MultiScalaProject(
   "cli",
   _.settings(
     isFullCrossVersion,
+    scalafixSettings,
     mainClass in assembly := Some("scalafix.v1.Main"),
     assemblyJarName in assembly := "scalafix.jar",
     libraryDependencies ++= Seq(
@@ -240,6 +249,7 @@ val testkit = MultiScalaProject(
   "testkit",
   _.settings(
     isFullCrossVersion,
+    scalafixSettings,
     libraryDependencies ++= Seq(
       semanticdb,
       ammonite,
@@ -338,6 +348,7 @@ def unit(
       s"scalafix-tests/unit",
       _.settings(
         noPublish,
+        scalafixSettings,
         fork := false,
         javaOptions := Nil,
         buildInfoPackage := "scalafix.tests",
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 8681c89e8..d2ff4e5f0 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,5 +1,5 @@
 import sbt._
-import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 /* scalafmt: { maxColumn = 120 }*/
 
 object Dependencies {
@@ -7,11 +7,8 @@ object Dependencies {
   val metaconfigV = "0.8.3"
   def dotty = "0.1.1-bin-20170530-f8f52cc-NIGHTLY"
   def scala210 = "2.10.6"
-  // NOTE(olafur) downgraded from 2.11.12 and 2.12.4 because of non-reproducible error
-  // https://travis-ci.org/scalacenter/scalafix/jobs/303142842#L4658
-  // as well as https://github.com/scala/bug/issues/10609
   def scala211 = "2.11.12"
-  def scala212 = "2.12.4"
+  def scala212 = "2.12.6"
   val currentScalaVersion = scala212
 
   def sbt013 = "0.13.17"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 26828c694..a662cf774 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -10,9 +10,9 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.0")
 // exclude is a workaround for https://github.com/sbt/sbt-assembly/issues/236#issuecomment-294452474
 addSbtPlugin(
   "com.eed3si9n" % "sbt-assembly" % "0.14.5" exclude ("org.apache.maven", "maven-plugin-api"))
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.9.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.10")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.0-RC1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.6.0-M7")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.15")
 addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.15")
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt
index 3275d4a62..945ca45fe 100644
--- a/project/project/plugins.sbt
+++ b/project/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.23")
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.2")
 unmanagedSources.in(Compile) += baseDirectory.value / ".." / "Dependencies.scala"