Skip to content

Commit 1a9f7f9

Browse files
committed
Upgrade to Scala 2.11.11
Now that scala#2260 has been merged, nothing is holding us back from upgrading.
1 parent a0bdac2 commit 1a9f7f9

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

project/Build.scala

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Build {
1414

1515
projectChecks()
1616

17-
val scalacVersion = "2.11.5" // Do not rename, this is grepped in bin/common.
17+
val scalacVersion = "2.11.11" // Do not rename, this is grepped in bin/common.
1818

1919
val dottyOrganization = "ch.epfl.lamp"
2020
val dottyVersion = {
@@ -82,10 +82,6 @@ object Build {
8282
javacOptions in Global ++= Seq("-Xlint:unchecked", "-Xlint:deprecation")
8383
)
8484

85-
/** Enforce 2.11.5. Do not let it be upgraded by dependencies. */
86-
private val overrideScalaVersionSetting =
87-
ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true))
88-
8985
// set sources to src/, tests to test/ and resources to resources/
9086
lazy val sourceStructure = Seq(
9187
scalaSource in Compile := baseDirectory.value / "src",
@@ -448,8 +444,6 @@ object Build {
448444
settings(sourceStructure).
449445
settings(dottyCompilerSettings).
450446
settings(
451-
overrideScalaVersionSetting,
452-
453447
// Disable scaladoc generation, it's way too slow and we'll replace it
454448
// by dottydoc anyway. We still publish an empty -javadoc.jar to make
455449
// sonatype happy.
@@ -520,8 +514,6 @@ object Build {
520514
dependsOn(`dotty-compiler`).
521515
settings(sourceStructure).
522516
settings(
523-
overrideScalaVersionSetting,
524-
525517
cleanSbtBridge := {
526518
val dottySbtBridgeVersion = version.value
527519
val dottyVersion = (version in `dotty-compiler`).value
@@ -609,8 +601,6 @@ object DottyInjectedPlugin extends AutoPlugin {
609601
enablePlugins(ScalaJSPlugin).
610602
settings(sourceStructure).
611603
settings(
612-
overrideScalaVersionSetting,
613-
614604
/* Remove the Scala.js compiler plugin for scalac, and enable the
615605
* Scala.js back-end of dotty instead.
616606
*/
@@ -644,8 +634,6 @@ object DottyInjectedPlugin extends AutoPlugin {
644634
dependsOn(`dotty-compiler` % "compile->test").
645635
settings(sourceStructure).
646636
settings(
647-
overrideScalaVersionSetting,
648-
649637
baseDirectory in (Test,run) := (baseDirectory in `dotty-compiler`).value,
650638

651639
libraryDependencies += "com.storm-enroute" %% "scalameter" % "0.6" % Test,

0 commit comments

Comments
 (0)