From 27615b8fa8772eefe65902e5315b2c000c5d8c77 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 27 Jun 2017 14:13:16 +0100
Subject: [PATCH] Use Scala 2.12 for all sbt 1.x, not just 1.0.x

---
 main/src/main/scala/sbt/Defaults.scala    | 4 +---
 main/src/main/scala/sbt/PluginCross.scala | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 668d59213..d523cb221 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -385,8 +385,6 @@ object Defaults extends BuildCommon {
       IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log)
     },
     scalaCompilerBridgeSource := {
-      // This is a workaround for sbtVersion getting set to another value.
-      val sv = appConfiguration.value.provider.id.version
       if (ScalaInstance.isDotty(scalaVersion.value))
         // Maintained at https://github.com/lampepfl/dotty/tree/master/sbt-bridge
         ModuleID(scalaOrganization.value, "dotty-sbt-bridge", scalaVersion.value)
@@ -414,7 +412,7 @@ object Defaults extends BuildCommon {
     VersionNumber(sv) match {
       case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
       case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.6"
-      case VersionNumber(Seq(1, 0, _*), _, _)  => "2.12.2"
+      case VersionNumber(Seq(1, _, _*), _, _)  => "2.12.2"
       case _                                   => sys.error(s"Unsupported sbt binary version: $sv")
     }
 
diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala
index b83e5294d..d39e1acac 100644
--- a/main/src/main/scala/sbt/PluginCross.scala
+++ b/main/src/main/scala/sbt/PluginCross.scala
@@ -10,7 +10,6 @@ package sbt
 import sbt.internal.util.complete.{ Parser, DefaultParsers }
 import DefaultParsers._
 import sbt.Keys._
-import Project._
 import Scope.GlobalScope
 import Def.ScopedKey
 import sbt.internal.Load
@@ -31,11 +30,13 @@ private[sbt] object PluginCross {
         switchArgs & nextSpaced
       }
     }
+
     def crossExclude(s: Def.Setting[_]): Boolean =
       s.key match {
         case ScopedKey(Scope(_, _, pluginCrossBuild.key, _), sbtVersion.key) => true
         case _                                                               => false
       }
+
     Command.arb(requireSession(switchParser), pluginSwitchHelp) {
       case (state, (version, command)) =>
         val x = Project.extract(state)