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

Merge pull request #3383 from dwijnand/2123 

Upgrade to Scala 2.12.3
This commit is contained in:
Dale Wijnand 2017-07-28 16:53:37 +01:00 committed by GitHub
parent 518a905d35 56d7d400b0
commit 716203fefa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ private[sbt] object PluginCross {
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, 0, _*), _, _) => "2.12.3"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}

2
project/Dependencies.scala
View File

@ -8,7 +8,7 @@ object Dependencies {
val scala293 = "2.9.3"
val scala210 = "2.10.6"
val scala211 = "2.11.8"
val scala212 = "2.12.2"
val scala212 = "2.12.3"
val baseScalaVersion = scala212
// sbt modules

2
project/plugins.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.2"
scalaVersion := "2.12.3"
scalacOptions ++= Seq("-feature", "-language:postfixOps")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.15")