Skip to content

Upgrade to Scala 2.11.11 #2293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2017
Merged

Upgrade to Scala 2.11.11 #2293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9f7f9
Upgrade to Scala 2.11.11
smarter Apr 23, 2017
97ed7ab
SymDenotations: do not use deprecated BitSet#toImmutable
smarter Apr 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/core/SymDenotations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Types._, Flags._, Decorators._, DenotTransformers._, StdNames._, Scopes._
import NameOps._, NameKinds._
import Scopes.Scope
import collection.mutable
import collection.immutable.BitSet
import collection.BitSet
import scala.reflect.io.AbstractFile
import Decorators.SymbolIteratorDecorator
import ast._
Expand Down Expand Up @@ -1412,7 +1412,7 @@ object SymDenotations {
to
}
val bcs = classSymbol :: addParentBaseClasses(classParents, Nil)
val scbits = seen.toImmutable
val scbits = seen
if (isFullyCompleted) {
myBaseClasses = bcs
mySuperClassBits = scbits
Expand Down
14 changes: 1 addition & 13 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object Build {

projectChecks()

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

val dottyOrganization = "ch.epfl.lamp"
val dottyVersion = {
Expand Down Expand Up @@ -82,10 +82,6 @@ object Build {
javacOptions in Global ++= Seq("-Xlint:unchecked", "-Xlint:deprecation")
)

/** Enforce 2.11.5. Do not let it be upgraded by dependencies. */
private val overrideScalaVersionSetting =
ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true))

// set sources to src/, tests to test/ and resources to resources/
lazy val sourceStructure = Seq(
scalaSource in Compile := baseDirectory.value / "src",
Expand Down Expand Up @@ -448,8 +444,6 @@ object Build {
settings(sourceStructure).
settings(dottyCompilerSettings).
settings(
overrideScalaVersionSetting,

// Disable scaladoc generation, it's way too slow and we'll replace it
// by dottydoc anyway. We still publish an empty -javadoc.jar to make
// sonatype happy.
Expand Down Expand Up @@ -520,8 +514,6 @@ object Build {
dependsOn(`dotty-compiler`).
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

cleanSbtBridge := {
val dottySbtBridgeVersion = version.value
val dottyVersion = (version in `dotty-compiler`).value
Expand Down Expand Up @@ -609,8 +601,6 @@ object DottyInjectedPlugin extends AutoPlugin {
enablePlugins(ScalaJSPlugin).
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

/* Remove the Scala.js compiler plugin for scalac, and enable the
* Scala.js back-end of dotty instead.
*/
Expand Down Expand Up @@ -644,8 +634,6 @@ object DottyInjectedPlugin extends AutoPlugin {
dependsOn(`dotty-compiler` % "compile->test").
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

baseDirectory in (Test,run) := (baseDirectory in `dotty-compiler`).value,

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