luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3923 from dwijnand/PluginCross-scala-versions 

Upgrade Scala versions that ^^ uses
This commit is contained in:
eugene yokota 2018-02-07 22:02:10 -05:00 committed by GitHub
parent 54eb6c2d6b 2db5c77442
commit 4a8adbb8e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/PluginCross.scala
View File

@ -92,8 +92,8 @@ private[sbt] object PluginCross {
def scalaVersionFromSbtBinaryVersion(sv: String): String =
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.3"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.4"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}

6
project/Dependencies.scala
View File

@ -3,11 +3,7 @@ import Keys._
import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala282 = "2.8.2"
val scala292 = "2.9.2"
val scala293 = "2.9.3"
val scala210 = "2.10.7"
val scala211 = "2.11.12"
// WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.4"
val baseScalaVersion = scala212