Skip to content
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.

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

Scala 2.11 compatibility #1113

Merged
merged 2 commits into from Feb 12, 2014
Merged

Scala 2.11 compatibility #1113

merged 2 commits into from Feb 12, 2014

Commits on Feb 12, 2014

  1. SI-8262 Fix compilation with 2.11 due to shadowing of Range

    We now have `global.Range`, so our wildcard import of `global._`
    shadows `scala.Range`.
    
    This commit fully qualifies that type so as to be compatible with
    Scala 2.10 and 2.11.
    retronym committed Feb 12, 2014
    Copy the full SHA
    9b4564f View commit details
    Browse the repository at this point in the history
  2. SI-8263 Avoid SOE in Symbol#logicallyEnclosingMember under Scala 2.11

    Since the fix for SI-2066, Scala 2.11 calls logicallyEnclosingMember on the
    `x` in the expansion of the task macro:
    
        InitializeInstance.app[[T0[x]](T0[java.io.File], T0[java.io.File]), Seq[java.io.File]]
    
    This exposed the fact that SBT has created `T0` with `NoSymbol` as
    the owner. This led to the a SOE.
    
    I will also change the compiler to be more tolerant of this, but we
    can observe good discipline in the macro and pick a sensible owner.
    retronym committed Feb 12, 2014
    Copy the full SHA
    4e07337 View commit details
    Browse the repository at this point in the history