@@ -14,7 +14,7 @@ object Build {
14
14
15
15
projectChecks()
16
16
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.
18
18
19
19
val dottyOrganization = " ch.epfl.lamp"
20
20
val dottyVersion = {
@@ -82,10 +82,6 @@ object Build {
82
82
javacOptions in Global ++= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
83
83
)
84
84
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
-
89
85
// set sources to src/, tests to test/ and resources to resources/
90
86
lazy val sourceStructure = Seq (
91
87
scalaSource in Compile := baseDirectory.value / " src" ,
@@ -448,8 +444,6 @@ object Build {
448
444
settings(sourceStructure).
449
445
settings(dottyCompilerSettings).
450
446
settings(
451
- overrideScalaVersionSetting,
452
-
453
447
// Disable scaladoc generation, it's way too slow and we'll replace it
454
448
// by dottydoc anyway. We still publish an empty -javadoc.jar to make
455
449
// sonatype happy.
@@ -520,8 +514,6 @@ object Build {
520
514
dependsOn(`dotty-compiler`).
521
515
settings(sourceStructure).
522
516
settings(
523
- overrideScalaVersionSetting,
524
-
525
517
cleanSbtBridge := {
526
518
val dottySbtBridgeVersion = version.value
527
519
val dottyVersion = (version in `dotty-compiler`).value
@@ -609,8 +601,6 @@ object DottyInjectedPlugin extends AutoPlugin {
609
601
enablePlugins(ScalaJSPlugin ).
610
602
settings(sourceStructure).
611
603
settings(
612
- overrideScalaVersionSetting,
613
-
614
604
/* Remove the Scala.js compiler plugin for scalac, and enable the
615
605
* Scala.js back-end of dotty instead.
616
606
*/
@@ -644,8 +634,6 @@ object DottyInjectedPlugin extends AutoPlugin {
644
634
dependsOn(`dotty-compiler` % " compile->test" ).
645
635
settings(sourceStructure).
646
636
settings(
647
- overrideScalaVersionSetting,
648
-
649
637
baseDirectory in (Test ,run) := (baseDirectory in `dotty-compiler`).value,
650
638
651
639
libraryDependencies += " com.storm-enroute" %% " scalameter" % " 0.6" % Test ,
0 commit comments