diff options
127 files changed, 820 insertions, 259 deletions
diff --git a/bench/test/dotty/tools/benchmarks/Benchmarks.scala b/bench/test/dotty/tools/benchmarks/Benchmarks.scala index 242d60788..04e7e25d7 100644 --- a/bench/test/dotty/tools/benchmarks/Benchmarks.scala +++ b/bench/test/dotty/tools/benchmarks/Benchmarks.scala @@ -9,6 +9,7 @@ import org.scalameter.reporting.RegressionReporter.Tester import dotty.tools.dotc.CompilerTest import scala.io.Source +import scala.reflect.io.Directory // decorator of persitor to expose info for debugging class DecoratorPersistor(p: Persistor) extends SerializationPersistor { @@ -37,7 +38,7 @@ class DecoratorPersistor(p: Persistor) extends SerializationPersistor { } object BenchTests extends OnlineRegressionReport { - val outputDir = "./out/" + val outputDir = "../out/" val compiler = new CompilerTest { override val defaultOutputDir: String = outputDir @@ -46,7 +47,8 @@ object BenchTests extends OnlineRegressionReport { implicit val defaultOptions = List("-d", outputDir) val scala2mode = List("-language:Scala2") - val dottyDir = "../compiler/src/dotty/" + val dottyDir = "../compiler/src/dotty/" + val testDir = "../bench/tests/" val stdlibFiles = StdLibSources.whitelisted @@ -75,6 +77,17 @@ object BenchTests extends OnlineRegressionReport { measure.method("dotty-src") in { using(Gen.unit("test")) curve "dotty-src" in { r => dotty } } + + val dir = Directory(testDir) + val fileNames = dir.files.toArray.map(_.jfile.getName).filter(name => (name endsWith ".scala")) + + for (name <- fileNames) { + measure.method(name) in { + using(Gen.unit("test")) curve "dotty" in { r => + compiler.compileFile(testDir, name, extension = "") + } + } + } } /** workaround to fix problem in ScalaMeter diff --git a/bench/tests/exhaustivity-I.scala b/bench/tests/exhaustivity-I.scala new file mode 100644 index 000000000..cb13893c8 --- /dev/null +++ b/bench/tests/exhaustivity-I.scala @@ -0,0 +1,68 @@ +abstract sealed trait C +case object C1 extends C +case object C2 extends C +case object C3 extends C +case object C4 extends C +case object C5 extends C +case object C6 extends C +case object C7 extends C +case object C8 extends C +case object C9 extends C +case object C10 extends C +case object C11 extends C +case object C12 extends C +case object C13 extends C +case object C14 extends C +case object C15 extends C +case object C16 extends C +case object C17 extends C +case object C18 extends C +case object C19 extends C +case object C20 extends C +case object C21 extends C +case object C22 extends C +case object C23 extends C +case object C24 extends C +case object C25 extends C +case object C26 extends C +case object C27 extends C +case object C28 extends C +case object C29 extends C +case object C30 extends C + +object Test { + + def test(c: C): Int = c match { + case C1 => 1 + case C2 => 2 + case C3 => 3 + case C4 => 4 + case C5 => 5 + case C6 => 6 + case C7 => 7 + case C8 => 8 + case C9 => 9 + case C10 => 10 + case C11 => 11 + case C12 => 12 + case C13 => 13 + case C14 => 14 + case C15 => 15 + case C16 => 16 + case C17 => 17 + case C18 => 18 + case C19 => 19 + case C20 => 20 + case C21 => 21 + case C22 => 22 + case C23 => 23 + case C24 => 24 + case C25 => 25 + case C26 => 26 + case C27 => 27 + case C28 => 28 + case C29 => 29 + case C30 => 30 + + } +} diff --git a/bench/tests/exhaustivity-S.scala b/bench/tests/exhaustivity-S.scala new file mode 100644 index 000000000..ba4fef3fd --- /dev/null +++ b/bench/tests/exhaustivity-S.scala @@ -0,0 +1,20 @@ + +sealed trait O +object A extends O +object B extends O + +object Test { + + def test(x: O) = + (x, x, x, x, x, x, x, x, x, x, x, x, x, x) match { + case (A, A, _, _, _, _, _, _, _, _, _, _, _, _) => 1 + case (_, _, A, A, _, _, _, _, _, _, _, _, _, _) => 2 + case (_, _, _, _, A, A, _, _, _, _, _, _, _, _) => 3 + case (_, _, _, _, _, _, A, A, _, _, _, _, _, _) => 4 + case (_, _, _, _, _, _, _, _, A, A, _, _, _, _) => 5 + case (_, _, _, _, _, _, _, _, _, _, A, A, _, _) => 6 + case (_, _, _, _, _, _, _, _, _, _, _, _, A, A) => 7 + case (B, A, B, A, B, A, B, A, B, A, B, A, B, A) => 8 + + } +} diff --git a/bench/tests/exhaustivity-T.scala b/bench/tests/exhaustivity-T.scala new file mode 100644 index 000000000..4d094758a --- /dev/null +++ b/bench/tests/exhaustivity-T.scala @@ -0,0 +1,28 @@ + +sealed trait O +object A extends O +object B extends O + +object Test { + + def test(x: O) = + (x, x, x, x, x, x, x, x) match { + case (A, A, A, A, A, A, A, A) => 1 + case (B, B, B, B, B, B, B, B) => 2 + case (_, A, A, A, A, A, A, A) => 3 + case (_, B, B, B, B, B, B, B) => 4 + case (_, _, A, A, A, A, A, A) => 5 + case (_, _, B, B, B, B, B, B) => 6 + case (_, _, _, A, A, A, A, A) => 7 + case (_, _, _, B, B, B, B, B) => 8 + case (_, _, _, _, A, A, A, A) => 9 + case (_, _, _, _, B, B, B, B) => 10 + case (_, _, _, _, _, A, A, A) => 11 + case (_, _, _, _, _, B, B, B) => 12 + case (_, _, _, _, _, _, A, A) => 13 + case (_, _, _, _, _, _, B, B) => 14 + case (_, _, _, _, _, _, _, A) => 15 + case (_, _, _, _, _, _, _, B) => 16 + + } +} diff --git a/bench/tests/exhaustivity-V.scala b/bench/tests/exhaustivity-V.scala new file mode 100644 index 000000000..be84934d3 --- /dev/null +++ b/bench/tests/exhaustivity-V.scala @@ -0,0 +1,18 @@ + +sealed trait O +object A extends O +object B extends O + +object Test { + + def test(x: O) = + (x, x, x, x, x, x, x, x, x, x, x, x, x, x, x) match { + case (A, A, A, A, A, _, _, _, _, _, _, _, _, _, _) => 1 + case (B, _, _, _, _, A, A, A, A, _, _, _, _, _, _) => 2 + case (_, B, _, _, _, B, _, _, _, A, A, A, _, _, _) => 3 + case (_, _, B, _, _, _, B, _, _, B, _, _, A, A, _) => 4 + case (_, _, _, B, _, _, _, B, _, _, B, _, B, _, A) => 5 + case (_, _, _, _, B, _, _, _, B, _, _, B, _, B, B) => 6 + + } +} diff --git a/bench/tests/i1535.scala b/bench/tests/i1535.scala new file mode 100644 index 000000000..0433e3ab2 --- /dev/null +++ b/bench/tests/i1535.scala @@ -0,0 +1,9 @@ +object Example { + case class C[H, T](h: H, t: T) + + type I = Int + + val p + : C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,C[I,I]]]]]]]]]]]]]]]]]]]]]]] + = C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,C(1,1))))))))))))))))))))))) +}
\ No newline at end of file diff --git a/bench/tests/i1687.scala b/bench/tests/i1687.scala new file mode 100644 index 000000000..7da9d2824 --- /dev/null +++ b/bench/tests/i1687.scala @@ -0,0 +1,10 @@ +object O { + def f: String = { + "1" + 1 + "1" + 1 + + "1" + 1 + "1" + 1 + + "1" + 1 + "1" + 1 + + "1" + 1 + "1" + 1 + + "1" + 1 + "1" + 1 + + "1" + 1 + "1" + 1 + } +}
\ No newline at end of file diff --git a/bench/tests/i490.scala.ignore b/bench/tests/i490.scala.ignore new file mode 100644 index 000000000..3758d2917 --- /dev/null +++ b/bench/tests/i490.scala.ignore @@ -0,0 +1,9 @@ +trait Foo { + def app(x: Object)(y: Object): Object +} + +object O { + def main(args: Array[String]): Unit = { + val z: Foo = x => ??? + } +} diff --git a/bench/tests/implicit-scope-loop.scala b/bench/tests/implicit-scope-loop.scala new file mode 100644 index 000000000..162f1a52c --- /dev/null +++ b/bench/tests/implicit-scope-loop.scala @@ -0,0 +1,17 @@ +trait Dummy[T] + + +trait A[T] extends B +trait B extends Dummy[A[Int]] +object B { + implicit def theB: B = new B {} + implicit def theA: A[Int] = new A[Int] {} +} + +object Test { + def getB(implicit b: B) = b + def getA[T](implicit a: A[T]) = a + + getB + getA +}
\ No newline at end of file diff --git a/bench/tests/implicit_cache.scala b/bench/tests/implicit_cache.scala new file mode 100644 index 000000000..d124876e0 --- /dev/null +++ b/bench/tests/implicit_cache.scala @@ -0,0 +1,16 @@ +class A +object A { + implicit def theA: A = new A +} +class Foo[T] +object Foo { + implicit def theFoo: Foo[A] = new Foo[A] +} + +object Test { + def getFooA(implicit foo: Foo[A]) = foo + def getA(implicit a: A) = a + + getFooA + getA +} diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index c17a32744..51fa15706 100644 --- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -560,7 +560,10 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma def javaBinaryName: Name = toDenot(sym).fullNameSeparated("/") // addModuleSuffix(fullNameInternal('/')) def javaClassName: String = toDenot(sym).fullName.toString// addModuleSuffix(fullNameInternal('.')).toString def name: Name = sym.name - def rawname: Name = sym.name // todo ???? + def rawname: Name = { + val original = toDenot(sym).initial + sym.name(ctx.withPhase(original.validFor.phaseId)) + } // types def info: Type = toDenot(sym).info diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index 900d2b0e3..1d319242b 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -72,6 +72,7 @@ class Compiler { new ElimByName, // Expand by-name parameters and arguments new AugmentScala2Traits, // Expand traits defined in Scala 2.11 to simulate old-style rewritings new ResolveSuper, // Implement super accessors and add forwarders to trait methods + new PrimitiveForwarders, // Add forwarders to trait methods that have a mismatch between generic and primitives new ArrayConstructors), // Intercept creation of (non-generic) arrays and intrinsify. List(new Erasure), // Rewrite types to JVM model, erasing all type parameters, abstract types and refinements. List(new ElimErasedValueType, // Expand erased value types to their underlying implmementation types diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 0e155b9e1..42df53fed 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -57,6 +57,7 @@ trait ConstraintHandling { b match { case b: AndOrType => occursIn(b.tp1) || occursIn(b.tp2) case b: TypeVar => occursIn(b.origin) + case b: TermRef => occursIn(b.underlying) case _ => false } } diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 8930983f3..6063cbf38 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -375,11 +375,22 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { thirdTryNamed(tp1, tp2) case tp2: PolyParam => def comparePolyParam = - (ctx.mode is Mode.TypevarsMissContext) || - isSubTypeWhenFrozen(tp1, bounds(tp2).lo) || { + (ctx.mode is Mode.TypevarsMissContext) || { + val alwaysTrue = + // The following condition is carefully formulated to catch all cases + // where the subtype relation is true without needing to add a constraint + // It's tricky because we might need to either appriximate tp2 by its + // lower bound or else widen tp1 and check that the result is a subtype of tp2. + // So if the constraint is not yet frozen, we do the same comparison again + // with a frozen constraint, which means that we get a chance to do the + // widening in `fourthTry` before adding to the constraint. + if (frozenConstraint || alwaysFluid) isSubType(tp1, bounds(tp2).lo) + else isSubTypeWhenFrozen(tp1, tp2) + alwaysTrue || { if (canConstrain(tp2)) addConstraint(tp2, tp1.widenExpr, fromBelow = true) else fourthTry(tp1, tp2) } + } comparePolyParam case tp2: RefinedType => def compareRefinedSlow: Boolean = { diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 18f0b42f5..f62093db0 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -504,7 +504,7 @@ object Parsers { def selector(t: Tree): Tree = atPos(startOffset(t), in.offset) { Select(t, ident()) } - /** Selectors ::= ident { `.' ident() + /** Selectors ::= id { `.' id } * * Accept `.' separated identifiers acting as a selectors on given tree `t`. * @param finish An alternative parse in case the next token is not an identifier. @@ -515,7 +515,7 @@ object Parsers { if (t1 ne t) t1 else dotSelectors(selector(t), finish) } - /** DotSelectors ::= { `.' ident() + /** DotSelectors ::= { `.' id } * * Accept `.' separated identifiers acting as a selectors on given tree `t`. * @param finish An alternative parse in case the token following a `.' is not an identifier. @@ -528,9 +528,9 @@ object Parsers { private val id: Tree => Tree = x => x /** Path ::= StableId - * | [Ident `.'] this + * | [id `.'] this * - * @param thisOK If true, [Ident `.'] this is acceptable as the path. + * @param thisOK If true, the path can end with the keyword `this`. * If false, another selection is required after the `this`. * @param finish An alternative parse in case the token following a `.' is not an identifier. * If the alternative does not apply, its tree argument is returned unchanged. @@ -540,7 +540,7 @@ object Parsers { def handleThis(qual: Ident) = { in.nextToken() val t = atPos(start) { This(qual) } - if (!thisOK && in.token != DOT) syntaxError("`.' expected") + if (!thisOK && in.token != DOT) syntaxError(DanglingThisInPath(), t.pos) dotSelectors(t, finish) } def handleSuper(qual: Ident) = { @@ -565,20 +565,20 @@ object Parsers { } } - /** MixinQualifier ::= `[' Id `]' + /** MixinQualifier ::= `[' id `]' */ def mixinQualifierOpt(): Ident = if (in.token == LBRACKET) inBrackets(atPos(in.offset) { typeIdent() }) else EmptyTypeIdent - /** StableId ::= Id - * | Path `.' Id + /** StableId ::= id + * | Path `.' id * | [id '.'] super [`[' id `]']`.' id */ def stableId(): Tree = path(thisOK = false) - /** QualId ::= Id {`.' Id} + /** QualId ::= id {`.' id} */ def qualId(): Tree = dotSelectors(termIdent()) @@ -773,7 +773,7 @@ object Parsers { else t /** SimpleType ::= SimpleType TypeArgs - * | SimpleType `#' Id + * | SimpleType `#' id * | StableId * | Path `.' type * | `(' ArgTypes `)' @@ -959,7 +959,7 @@ object Parsers { /** Expr ::= [`implicit'] FunParams `=>' Expr * | Expr1 * FunParams ::= Bindings - * | Id + * | id * | `_' * ExprInParens ::= PostfixExpr `:' Type * | Expr @@ -975,12 +975,12 @@ object Parsers { * | `throw' Expr * | `return' [Expr] * | ForExpr - * | [SimpleExpr `.'] Id `=' Expr + * | [SimpleExpr `.'] id `=' Expr * | SimpleExpr1 ArgumentExprs `=' Expr * | PostfixExpr [Ascription] * | PostfixExpr `match' `{' CaseClauses `}' * Bindings ::= `(' [Binding {`,' Binding}] `)' - * Binding ::= (Id | `_') [`:' Type] + * Binding ::= (id | `_') [`:' Type] * Ascription ::= `:' CompoundType * | `:' Annotation {Annotation} * | `:' `_' `*' @@ -1124,7 +1124,7 @@ object Parsers { } /** FunParams ::= Bindings - * | Id + * | id * | `_' * Bindings ::= `(' [Binding {`,' Binding}] `)' */ @@ -1153,7 +1153,7 @@ object Parsers { (atPos(start) { makeParameter(name, t, mods) }) :: Nil } - /** Binding ::= (Id | `_') [`:' Type] + /** Binding ::= (id | `_') [`:' Type] */ def binding(mods: Modifiers): Tree = atPos(in.offset) { makeParameter(bindingName(), typedOpt(), mods) } @@ -1165,8 +1165,8 @@ object Parsers { } else ident() - /** Expr ::= implicit Id `=>' Expr - * BlockResult ::= implicit Id [`:' InfixType] `=>' Block // Scala2 only + /** Expr ::= implicit id `=>' Expr + * BlockResult ::= implicit id [`:' InfixType] `=>' Block // Scala2 only */ def implicitClosure(start: Int, location: Location.Value, implicitMods: Modifiers): Tree = closureRest(start, location, funParams(implicitMods, location)) @@ -1177,9 +1177,9 @@ object Parsers { Function(params, if (location == Location.InBlock) block() else expr()) } - /** PostfixExpr ::= InfixExpr [Id [nl]] + /** PostfixExpr ::= InfixExpr [id [nl]] * InfixExpr ::= PrefixExpr - * | InfixExpr Id [nl] InfixExpr + * | InfixExpr id [nl] InfixExpr */ def postfixExpr(): Tree = infixOps(prefixExpr(), canStartExpressionTokens, prefixExpr, maybePostfix = true) @@ -1204,7 +1204,7 @@ object Parsers { * | xmlLiteral * | Path * | `(' [ExprsInParens] `)' - * | SimpleExpr `.' Id + * | SimpleExpr `.' id * | SimpleExpr (TypeArgs | NamedTypeArgs) * | SimpleExpr1 ArgumentExprs */ @@ -1456,7 +1456,7 @@ object Parsers { p } - /** InfixPattern ::= SimplePattern {Id [nl] SimplePattern} + /** InfixPattern ::= SimplePattern {id [nl] SimplePattern} */ def infixPattern(): Tree = infixOps(simplePattern(), canStartExpressionTokens, simplePattern, notAnOperator = nme.raw.BAR) @@ -1468,8 +1468,8 @@ object Parsers { * | SimplePattern1 [TypeArgs] [ArgumentPatterns] * SimplePattern1 ::= Path * | `{' Block `}' - * | SimplePattern1 `.' Id - * PatVar ::= Id + * | SimplePattern1 `.' id + * PatVar ::= id * | `_' */ val simplePattern = () => in.token match { @@ -1586,7 +1586,7 @@ object Parsers { def addMod(mods: Modifiers, mod: Mod): Modifiers = addFlag(mods, mod.flags).withAddedMod(mod) - /** AccessQualifier ::= "[" (Id | this) "]" + /** AccessQualifier ::= "[" (id | this) "]" */ def accessQualifierOpt(mods: Modifiers): Modifiers = if (in.token == LBRACKET) { @@ -1665,16 +1665,16 @@ object Parsers { /** ClsTypeParamClause::= `[' ClsTypeParam {`,' ClsTypeParam} `]' * ClsTypeParam ::= {Annotation} [{Modifier} type] [`+' | `-'] - * Id [HkTypeParamClause] TypeParamBounds + * id [HkTypeParamClause] TypeParamBounds * * DefTypeParamClause::= `[' DefTypeParam {`,' DefTypeParam} `]' - * DefTypeParam ::= {Annotation} Id [HkTypeParamClause] TypeParamBounds + * DefTypeParam ::= {Annotation} id [HkTypeParamClause] TypeParamBounds * * TypTypeParamCaluse::= `[' TypTypeParam {`,' TypTypeParam} `]' - * TypTypeParam ::= {Annotation} Id [HkTypePamClause] TypeBounds + * TypTypeParam ::= {Annotation} id [HkTypePamClause] TypeBounds * * HkTypeParamClause ::= `[' HkTypeParam {`,' HkTypeParam} `]' - * HkTypeParam ::= {Annotation} ['+' | `-'] (Id[HkTypePamClause] | _') TypeBounds + * HkTypeParam ::= {Annotation} ['+' | `-'] (id [HkTypePamClause] | _') TypeBounds */ def typeParamClause(ownerKind: ParamOwner.Value): List[TypeDef] = inBrackets { def typeParam(): TypeDef = { @@ -1829,7 +1829,7 @@ object Parsers { } } - /** ImportExpr ::= StableId `.' (Id | `_' | ImportSelectors) + /** ImportExpr ::= StableId `.' (id | `_' | ImportSelectors) */ val importExpr = () => path(thisOK = false, handleImport) match { case imp: Import => @@ -1863,7 +1863,7 @@ object Parsers { } } - /** ImportSelector ::= Id [`=>' Id | `=>' `_'] + /** ImportSelector ::= id [`=>' id | `=>' `_'] */ def importSelector(): Tree = { val from = termIdentOrWildcard() @@ -1908,9 +1908,9 @@ object Parsers { } /** PatDef ::= Pattern2 {`,' Pattern2} [`:' Type] `=' Expr - * VarDef ::= PatDef | Id {`,' Id} `:' Type `=' `_' - * ValDcl ::= Id {`,' Id} `:' Type - * VarDcl ::= Id {`,' Id} `:' Type + * VarDef ::= PatDef | id {`,' id} `:' Type `=' `_' + * ValDcl ::= id {`,' id} `:' Type + * VarDcl ::= id {`,' id} `:' Type */ def patDefOrDcl(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): Tree = atPos(start, nameStart) { val lhs = commaSeparated(pattern2) @@ -2012,8 +2012,8 @@ object Parsers { Block(stats, Literal(Constant(()))) } - /** TypeDef ::= type Id [TypeParamClause] `=' Type - * TypeDcl ::= type Id [TypeParamClause] TypeBounds + /** TypeDef ::= type id [TypeParamClause] `=' Type + * TypeDcl ::= type id [TypeParamClause] TypeBounds */ def typeDefOrDcl(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): Tree = { newLinesOpt() @@ -2055,7 +2055,7 @@ object Parsers { } } - /** ClassDef ::= Id [ClsTypeParamClause] + /** ClassDef ::= id [ClsTypeParamClause] * [ConstrMods] ClsParamClauses TemplateOpt */ def classDef(start: Offset, mods: Modifiers, docstring: Option[Comment]): TypeDef = atPos(start, nameStart) { @@ -2083,7 +2083,7 @@ object Parsers { mods } - /** ObjectDef ::= Id TemplateOpt + /** ObjectDef ::= id TemplateOpt */ def objectDef(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): ModuleDef = atPos(start, nameStart) { val name = ident() diff --git a/compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala b/compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala index 25db28e4a..89cd2cd8f 100644 --- a/compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala @@ -966,4 +966,40 @@ object messages { | ${"val foo: Int = 3"} |""" } + + case class DanglingThisInPath()(implicit ctx: Context) extends Message(36) { + val kind = "Syntax" + val msg = hl"""Expected an additional member selection after the keyword ${"this"}""" + + val contextCode = + """ trait Outer { + | val member: Int + | type Member + | trait Inner { + | ... + | } + | }""" + + val importCode = + """ import Outer.this.member + | // ^^^^^^^""" + + val typeCode = + """ type T = Outer.this.Member + | // ^^^^^^^""" + + val explanation = + hl"""|Paths of imports and type selections must not end with the keyword ${"this"}. + | + |Maybe you forgot to select a member of ${"this"}? As an example, in the + |following context: + |${contextCode} + | + |- this is a valid import expression using a path + |${importCode} + | + |- this is a valid type using a path + |${typeCode} + |""" + } } diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala index 1eb12e9de..c2aacf826 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -276,7 +276,8 @@ object ExplicitOuter { if (tpe.prefix eq NoPrefix) cls.owner.enclosingClass.thisType else tpe.prefix case _ => - outerPrefix(tpe.underlying) + // Need to be careful to dealias before erasure, otherwise we lose prefixes. + outerPrefix(tpe.underlying(ctx.withPhaseNoLater(ctx.erasurePhase))) } case tpe: TypeProxy => outerPrefix(tpe.underlying) diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala index 0314d4ec4..8b5ceb0aa 100644 --- a/compiler/src/dotty/tools/dotc/transform/Memoize.scala +++ b/compiler/src/dotty/tools/dotc/transform/Memoize.scala @@ -95,28 +95,15 @@ import Decorators._ def adaptToField(tree: Tree) = if (tree.isEmpty) tree else tree.ensureConforms(field.info.widen) + val NoFieldNeeded = Lazy | Deferred | JavaDefined | (if (ctx.settings.YnoInline.value) EmptyFlags else Inline) + if (sym.is(Accessor, butNot = NoFieldNeeded)) if (sym.isGetter) { - def skipBlocks(t: Tree): Tree = t match { - case Block(_, t1) => skipBlocks(t1) - case _ => t - } - skipBlocks(tree.rhs) match { - case lit: Literal if sym.is(Final) && isIdempotentExpr(tree.rhs) => - // duplicating scalac behavior: for final vals that have rhs as constant, we do not create a field - // and instead return the value. This seemingly minor optimization has huge effect on initialization - // order and the values that can be observed during superconstructor call - - // see remark about idempotency in PostTyper#normalizeTree - cpy.DefDef(tree)(rhs = lit) - case _ => - var rhs = tree.rhs.changeOwnerAfter(sym, field, thisTransform) - if (isWildcardArg(rhs)) rhs = EmptyTree - - val fieldDef = transformFollowing(ValDef(field, adaptToField(rhs))) - val getterDef = cpy.DefDef(tree)(rhs = transformFollowingDeep(ref(field))(ctx.withOwner(sym), info)) - Thicket(fieldDef, getterDef) - } + var rhs = tree.rhs.changeOwnerAfter(sym, field, thisTransform) + if (isWildcardArg(rhs)) rhs = EmptyTree + val fieldDef = transformFollowing(ValDef(field, adaptToField(rhs))) + val getterDef = cpy.DefDef(tree)(rhs = transformFollowingDeep(ref(field))(ctx.withOwner(sym), info)) + Thicket(fieldDef, getterDef) } else if (sym.isSetter) { if (!sym.is(ParamAccessor)) { val Literal(Constant(())) = tree.rhs } // this is intended as an assertion field.setFlag(Mutable) // necessary for vals mixed in from Scala2 traits @@ -127,5 +114,4 @@ import Decorators._ // neither getters nor setters else tree } - private val NoFieldNeeded = Lazy | Deferred | JavaDefined } diff --git a/compiler/src/dotty/tools/dotc/transform/MixinOps.scala b/compiler/src/dotty/tools/dotc/transform/MixinOps.scala index 6cebf7197..25aa9ffaf 100644 --- a/compiler/src/dotty/tools/dotc/transform/MixinOps.scala +++ b/compiler/src/dotty/tools/dotc/transform/MixinOps.scala @@ -48,11 +48,7 @@ class MixinOps(cls: ClassSymbol, thisTransform: DenotTransformer)(implicit ctx: * - there are multiple traits defining method with same signature */ def needsForwarder(meth: Symbol): Boolean = { - lazy val competingMethods = cls.baseClasses.iterator - .filter(_ ne meth.owner) - .map(meth.overriddenSymbol) - .filter(_.exists) - .toList + lazy val competingMethods = competingMethodsIterator(meth).toList def needsDisambiguation = competingMethods.exists(x=> !(x is Deferred)) // multiple implementations are available def hasNonInterfaceDefinition = competingMethods.exists(!_.owner.is(Trait)) // there is a definition originating from class @@ -61,8 +57,38 @@ class MixinOps(cls: ClassSymbol, thisTransform: DenotTransformer)(implicit ctx: (needsDisambiguation || hasNonInterfaceDefinition || meth.owner.is(Scala2x)) } + /** Get `sym` of the method that needs a forwarder + * Method needs a forwarder in those cases: + * - there is a trait that defines a primitive version of implemented polymorphic method. + * - there is a trait that defines a polymorphic version of implemented primitive method. + */ + def needsPrimitiveForwarderTo(meth: Symbol): Option[Symbol] = { + def hasPrimitiveMissMatch(tp1: Type, tp2: Type): Boolean = (tp1, tp2) match { + case (tp1: MethodicType, tp2: MethodicType) => + hasPrimitiveMissMatch(tp1.resultType, tp2.resultType) || + tp1.paramTypess.flatten.zip(tp1.paramTypess.flatten).exists(args => hasPrimitiveMissMatch(args._1, args._2)) + case _ => + def isPrimitiveOrValueClass(sym: Symbol): Boolean = sym.isPrimitiveValueClass || sym.isValueClass + isPrimitiveOrValueClass(tp1.typeSymbol) ^ isPrimitiveOrValueClass(tp2.typeSymbol) + } + + def needsPrimitiveForwarder(m: Symbol): Boolean = + m.owner != cls && !m.is(Deferred) && hasPrimitiveMissMatch(meth.info, m.info) + + if (!meth.is(Method | Deferred, butNot = PrivateOrAccessor) || meth.overriddenSymbol(cls).exists || needsForwarder(meth)) None + else competingMethodsIterator(meth).find(needsPrimitiveForwarder) + } + + final val PrivateOrAccessor = Private | Accessor final val PrivateOrAccessorOrDeferred = Private | Accessor | Deferred def forwarder(target: Symbol) = (targs: List[Type]) => (vrefss: List[List[Tree]]) => superRef(target).appliedToTypes(targs).appliedToArgss(vrefss) + + private def competingMethodsIterator(meth: Symbol): Iterator[Symbol] = { + cls.baseClasses.iterator + .filter(_ ne meth.owner) + .map(meth.overriddenSymbol) + .filter(_.exists) + } } diff --git a/compiler/src/dotty/tools/dotc/transform/PrimitiveForwarders.scala b/compiler/src/dotty/tools/dotc/transform/PrimitiveForwarders.scala new file mode 100644 index 000000000..d752ce8e7 --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/PrimitiveForwarders.scala @@ -0,0 +1,51 @@ +package dotty.tools.dotc +package transform + +import core._ +import TreeTransforms._ +import Contexts.Context +import Flags._ +import SymUtils._ +import Symbols._ +import SymDenotations._ +import Types._ +import Decorators._ +import DenotTransformers._ +import StdNames._ +import NameOps._ +import ast.Trees._ +import util.Positions._ +import Names._ +import collection.mutable +import ResolveSuper._ + +/** This phase adds forwarder where mixedin generic and primitive typed methods have a missmatch. + * In particular for every method that is declared both as generic with a primitive type and with a primitive type + * `<mods> def f[Ts](ps1)...(psN): U` in trait M` and + * `<mods> def f[Ts](ps1)...(psN): V = ...` in implemented in N` + * where U is a primitive and V a polymorphic type (or vice versa) needs: + * + * <mods> def f[Ts](ps1)...(psN): U = super[N].f[Ts](ps1)...(psN) + * + * IMPORTANT: When\If Valhalla happens, we'll need to move mixin before erasure and than this code will need to be rewritten + * as it will instead change super-class. + */ +class PrimitiveForwarders extends MiniPhaseTransform with IdentityDenotTransformer { thisTransform => + import ast.tpd._ + + override def phaseName: String = "primitiveForwarders" + + override def runsAfter = Set(classOf[ResolveSuper]) + + override def transformTemplate(impl: Template)(implicit ctx: Context, info: TransformerInfo) = { + val cls = impl.symbol.owner.asClass + val ops = new MixinOps(cls, thisTransform) + import ops._ + + def methodPrimitiveForwarders: List[Tree] = + for (meth <- mixins.flatMap(_.info.decls.flatMap(needsPrimitiveForwarderTo)).distinct) + yield polyDefDef(implementation(meth.asTerm), forwarder(meth)) + + cpy.Template(impl)(body = methodPrimitiveForwarders ::: impl.body) + } +} diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index e718a7e60..3a301167d 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -85,7 +85,7 @@ class ResolveSuper extends MiniPhaseTransform with IdentityDenotTransformer { th private val PrivateOrAccessorOrDeferred = Private | Accessor | Deferred } -object ResolveSuper{ +object ResolveSuper { /** Returns the symbol that is accessed by a super-accessor in a mixin composition. * * @param base The class in which everything is mixed together diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 6dd3f45fc..a053a0b0d 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1030,7 +1030,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit def typedRefinedTypeTree(tree: untpd.RefinedTypeTree)(implicit ctx: Context): RefinedTypeTree = track("typedRefinedTypeTree") { val tpt1 = if (tree.tpt.isEmpty) TypeTree(defn.ObjectType) else typedAheadType(tree.tpt) - val refineClsDef = desugar.refinedTypeToClass(tpt1, tree.refinements) + val refineClsDef = desugar.refinedTypeToClass(tpt1, tree.refinements).withPos(tree.pos) val refineCls = createSymbol(refineClsDef).asClass val TypeDef(_, impl: Template) = typed(refineClsDef) val refinements1 = impl.body @@ -1173,6 +1173,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit if (sym.is(Inline, butNot = DeferredOrParamAccessor)) checkInlineConformant(rhs1, em"right-hand side of inline $sym") patchIfLazy(vdef1) + patchFinalVals(vdef1) vdef1 } @@ -1185,6 +1186,27 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit patch(Position(toUntyped(vdef).pos.start), "@volatile ") } + /** Adds inline to final vals with idempotent rhs + * + * duplicating scalac behavior: for final vals that have rhs as constant, we do not create a field + * and instead return the value. This seemingly minor optimization has huge effect on initialization + * order and the values that can be observed during superconstructor call + * + * see remark about idempotency in PostTyper#normalizeTree + */ + private def patchFinalVals(vdef: ValDef)(implicit ctx: Context): Unit = { + def isFinalInlinableVal(sym: Symbol): Boolean = { + sym.is(Final, butNot = Mutable) && + isIdempotentExpr(vdef.rhs) /* && + ctx.scala2Mode (stay compatible with Scala2 for now) */ + } + val sym = vdef.symbol + sym.info match { + case info: ConstantType if isFinalInlinableVal(sym) && !ctx.settings.YnoInline.value => sym.setFlag(Inline) + case _ => + } + } + def typedDefDef(ddef: untpd.DefDef, sym: Symbol)(implicit ctx: Context) = track("typedDefDef") { val DefDef(name, tparams, vparamss, tpt, _) = ddef completeAnnotations(ddef, sym) diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala index 786bac483..608132bca 100644 --- a/compiler/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -108,7 +108,7 @@ class tests extends CompilerTest { Directory(defaultOutputDir + "java").deleteRecursively() } - @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) + @Test def pickle_pickleOK = compileFiles(testsDir + "pickling/", testPickling) // This directory doesn't exist anymore // @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @Test def pickle_ast = compileDir(dotcDir, "ast", testPickling) @@ -250,7 +250,7 @@ class tests extends CompilerTest { @Test def dotc_typer = compileDir(dotcDir, "typer")// twice omitted to make tests run faster // error: error while loading Checking$$anon$2$, - // class file 'target/scala-2.11/dotty_2.11-0.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)' + // class file 'target/scala-2.11/dotty_2.11-0.1.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)' // has location not matching its contents: contains class $anon @Test def dotc_util = compileDir(dotcDir, "util") // twice omitted to make tests run faster diff --git a/compiler/test/dotty/Jars.scala b/compiler/test/dotty/Jars.scala index 42c707069..6fc9b0fde 100644 --- a/compiler/test/dotty/Jars.scala +++ b/compiler/test/dotty/Jars.scala @@ -3,15 +3,15 @@ package dotty /** Jars used when compiling test, defaults to sbt locations */ object Jars { val dottyLib: String = sys.env.get("DOTTY_LIB") getOrElse { - "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar" } val dottyCompiler: String = sys.env.get("DOTTY_COMPILER") getOrElse { - "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" + "./target/scala-2.11/dotty-compiler_2.11-0.1.1-SNAPSHOT.jar" } val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE") getOrElse { - "../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" + "../interfaces/target/dotty-interfaces-0.1.1-SNAPSHOT.jar" } val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS") diff --git a/doc-tool/test/BaseTest.scala b/doc-tool/test/BaseTest.scala index 7f3d62277..835911ca5 100644 --- a/doc-tool/test/BaseTest.scala +++ b/doc-tool/test/BaseTest.scala @@ -23,7 +23,7 @@ trait DottyTest { ctx.setProperty(ContextDoc, new ContextDottydoc) ctx.setSetting( ctx.settings.classpath, - "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" + "../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar" ) base.initialize()(ctx) ctx diff --git a/project/Build.scala b/project/Build.scala index ea7ce31af..99a6c5077 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -11,7 +11,7 @@ import sbt.Package.ManifestAttributes object DottyBuild extends Build { - val baseVersion = "0.1" + val baseVersion = "0.1.1" val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes") val jenkinsMemLimit = List("-Xmx1500m") @@ -96,7 +96,8 @@ object DottyBuild extends Build { // this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name lazy val dotty = project.in(file(".")). // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests - aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, dottySbtBridgeRef, `scala-library`). + aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, dottySbtBridgeRef, + `scala-library`, `scala-compiler`, `scala-reflect`, `scalap`). dependsOn(`dotty-compiler`). dependsOn(`dotty-library`). settings( @@ -414,12 +415,6 @@ object DottyBuild extends Build { "org.scala-sbt" % "api" % sbtVersion.value % "test", "org.specs2" %% "specs2" % "2.3.11" % "test" ), - version := { - if (isNightly) - "0.1.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" - else - "0.1.1-SNAPSHOT" - }, // The sources should be published with crossPaths := false since they // need to be compiled by the project using the bridge. crossPaths := false, @@ -455,13 +450,13 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } """) @@ -555,11 +550,41 @@ object DottyInjectedPlugin extends AutoPlugin { } ) - lazy val `scala-library` = project - .settings( - libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value - ) - .settings(publishing) + + // Dummy scala-library artefact. This is useful because sbt projects + // automatically depend on scalaOrganization.value % "scala-library" % scalaVersion.value + lazy val `scala-library` = project. + dependsOn(`dotty-library`). + settings( + crossPaths := false + ). + settings(publishing) + + // sbt >= 0.13.12 will automatically rewrite transitive dependencies on + // any version in any organization of scala{-library,-compiler,-reflect,p} + // to have organization `scalaOrganization` and version `scalaVersion` + // (see https://github.com/sbt/sbt/pull/2634). + // This means that we need to provide dummy artefacts for these projects, + // otherwise users will get compilation errors if they happen to transitively + // depend on one of these projects. + lazy val `scala-compiler` = project. + settings( + crossPaths := false, + libraryDependencies := Seq(scalaCompiler) + ). + settings(publishing) + lazy val `scala-reflect` = project. + settings( + crossPaths := false, + libraryDependencies := Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value) + ). + settings(publishing) + lazy val `scalap` = project. + settings( + crossPaths := false, + libraryDependencies := Seq("org.scala-lang" % "scalap" % scalaVersion.value) + ). + settings(publishing) lazy val publishing = Seq( publishMavenStyle := true, diff --git a/sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/discovery/test-discovery/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/abstract-override/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/abstract-type-override/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/abstract-type/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/as-seen-from-b/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/backtick-quoted-names/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/binary/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/by-name/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/compactify/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/constants/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/default-params/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/dup-class/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/empty-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/empty-package/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/erasure/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/export-jars/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/ext/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/false-error/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/fbounded-existentials/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/implicit-params/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/implicit-search-companion-scope/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/implicit-search/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/implicit/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/import-class/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/import-package/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/inherited-deps-java/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/inherited_type_params/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/intermediate-error/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/java-analysis-serialization-error/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/java-basic/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/java-mixed/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/java-static/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/lazy-val/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv-java/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/less-inter-inv/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/named/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/nested-case-class/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/new-cyclic/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/new-pkg-dep/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/override/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/parent-change/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/parent-member-change/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/pkg-self/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/qualified-access/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/relative-source-error/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/remove-test-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/remove-test-b/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/repeated-parameters/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/replace-test-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/resident-java/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/resident-package-object/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/restore-classes/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/same-file-used-names/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/sealed/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/signature-change/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/specialized/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/stability-change/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/synthetic-companion/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/trait-member-modified/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/trait-private-object/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/trait-private-var/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/trait-super/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/transitive-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/transitive-b/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit-java/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/transitive-inherit/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/transitive-memberRef/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/type-alias/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/type-parameter/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-only/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/typeref-return/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-a/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/types-in-used-names-b/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/value-class/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/var/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala b/sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala index ec22870f4..ecfbd69b3 100644 --- a/sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala +++ b/sbt-bridge/sbt-test/source-dependencies/variance/project/DottyInjectedPlugin.scala @@ -6,12 +6,12 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } diff --git a/tests/neg/i1845.scala b/tests/neg/i1845.scala index e3e5787e6..1ecffdc7d 100644 --- a/tests/neg/i1845.scala +++ b/tests/neg/i1845.scala @@ -1,3 +1,3 @@ object Test { type X = FooBar22.this // error -} // error +} diff --git a/tests/pos-java-interop/innerClass/Outer.scala b/tests/pos-java-interop/innerClass/Outer.scala new file mode 100644 index 000000000..b47d91cc1 --- /dev/null +++ b/tests/pos-java-interop/innerClass/Outer.scala @@ -0,0 +1,8 @@ +class Outer { + class InnerInClass + + def inner() = new InnerInClass +} +object Outer { + class InnerInObject +} diff --git a/tests/pos-java-interop/innerClass/Test.java b/tests/pos-java-interop/innerClass/Test.java new file mode 100644 index 000000000..53bb826d7 --- /dev/null +++ b/tests/pos-java-interop/innerClass/Test.java @@ -0,0 +1,9 @@ +public class Test { + public static void test() { + Outer outer = new Outer(); + Outer.InnerInClass innerInClass = outer.inner(); + + // Does not work yet, requires https://github.com/DarkDimius/scala/pull/4 + // Outer.InnerInObject innerInObject = new Outer.InnerInObject(); + } +} diff --git a/tests/pos/i1865.scala b/tests/pos/i1865.scala new file mode 100644 index 000000000..1b77558ff --- /dev/null +++ b/tests/pos/i1865.scala @@ -0,0 +1,24 @@ +class AbsCell { + type T = Node + class Node +} + +object Test { + def test: Unit = { + val cell = new AbsCell + new cell.T + } +} + +class AbsCell2 { + type T = Node + val value: T = value + def set(x: T): Unit = {} + class Node +} +object init { + def main = { + val cell = new AbsCell2 { val init = new Node } + cell set (new cell.T) + } +} diff --git a/tests/pos/i1867.scala b/tests/pos/i1867.scala new file mode 100644 index 000000000..b6377c4f0 --- /dev/null +++ b/tests/pos/i1867.scala @@ -0,0 +1,3 @@ +trait B { + def f1: {} +} diff --git a/tests/pos/i1891.scala b/tests/pos/i1891.scala new file mode 100644 index 000000000..b178c256b --- /dev/null +++ b/tests/pos/i1891.scala @@ -0,0 +1,11 @@ +object Test { + class CC2[A, B](a: A, b: B) + + type T2[A, B] = CC2[A, B] + + class ArrowAssoc[A](val self: A) { + @inline def f[B](y: B): CC2[A, B] = new CC2(self, y) + } + + def foo = (new ArrowAssoc(1)).f(2) +} diff --git a/tests/run/final-var.check b/tests/run/final-var.check new file mode 100644 index 000000000..7565230c0 --- /dev/null +++ b/tests/run/final-var.check @@ -0,0 +1,4 @@ +false +true +false +true diff --git a/tests/run/final-var.scala b/tests/run/final-var.scala new file mode 100644 index 000000000..94a6c453c --- /dev/null +++ b/tests/run/final-var.scala @@ -0,0 +1,20 @@ +object Test { + def main(args: Array[String]): Unit = { + println(Obj.myFinalVar) + Obj.myFinalVar = true + println(Obj.myFinalVar) + + val o = new Cls + println(o.myFinalVar) + o.myFinalVar = true + println(o.myFinalVar) + } +} + +object Obj { + final var myFinalVar: Boolean = false +} + +class Cls { + final var myFinalVar: Boolean = false +} diff --git a/tests/run/mixin-primitive-on-generic-1.check b/tests/run/mixin-primitive-on-generic-1.check new file mode 100644 index 000000000..bb101b641 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-1.check @@ -0,0 +1,2 @@ +true +true diff --git a/tests/run/mixin-primitive-on-generic-1.scala b/tests/run/mixin-primitive-on-generic-1.scala new file mode 100644 index 000000000..470f543ce --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-1.scala @@ -0,0 +1,19 @@ + +object Test { + def main(args: Array[String]): Unit = { + println((new Foo: Baz).value1) + println((new Foo: Baz).value2) + } +} + +class Foo extends Bar[Boolean](true) with Baz + +class Bar[T](x: T) { + def value1: T = x + def value2(): T = x +} + +trait Baz { + def value1: Boolean + def value2(): Boolean +} diff --git a/tests/run/mixin-primitive-on-generic-2.check b/tests/run/mixin-primitive-on-generic-2.check new file mode 100644 index 000000000..bb101b641 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-2.check @@ -0,0 +1,2 @@ +true +true diff --git a/tests/run/mixin-primitive-on-generic-2.scala b/tests/run/mixin-primitive-on-generic-2.scala new file mode 100644 index 000000000..37e3f6035 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-2.scala @@ -0,0 +1,19 @@ + +object Test { + def main(args: Array[String]): Unit = { + println((new Foo: Bar[Boolean]).value1) + println((new Foo: Bar[Boolean]).value2) + } +} + +class Foo extends Baz with Bar[Boolean] + +trait Bar[T] { + def value1: T + def value2(): T +} + +class Baz { + def value1: Boolean = true + def value2(): Boolean = true +} diff --git a/tests/run/mixin-primitive-on-generic-3.check b/tests/run/mixin-primitive-on-generic-3.check new file mode 100644 index 000000000..bb101b641 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-3.check @@ -0,0 +1,2 @@ +true +true diff --git a/tests/run/mixin-primitive-on-generic-3.scala b/tests/run/mixin-primitive-on-generic-3.scala new file mode 100644 index 000000000..f6ff0b63e --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-3.scala @@ -0,0 +1,21 @@ + +object Test { + def main(args: Array[String]): Unit = { + println((new Foo: Baz).value) + println((new Foo: Qux).value) + } +} + +class Foo extends Bar[Boolean](true) with Baz with Qux + +class Bar[T](x: T) { + def value: T = x +} + +trait Baz { + def value: Boolean +} + +trait Qux { + def value: Boolean +} diff --git a/tests/run/mixin-primitive-on-generic-4.check b/tests/run/mixin-primitive-on-generic-4.check new file mode 100644 index 000000000..bb101b641 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-4.check @@ -0,0 +1,2 @@ +true +true diff --git a/tests/run/mixin-primitive-on-generic-4.scala b/tests/run/mixin-primitive-on-generic-4.scala new file mode 100644 index 000000000..ddf62b92f --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-4.scala @@ -0,0 +1,21 @@ + +object Test { + def main(args: Array[String]): Unit = { + println((new Foo: Baz).value1.v) + println((new Foo: Baz).value2.v) + } +} + +class Foo extends Bar[VBoolean](new VBoolean(true)) with Baz + +class Bar[T](x: T) { + def value1: T = x + def value2(): T = x +} + +trait Baz { + def value1: VBoolean + def value2(): VBoolean +} + +class VBoolean(val v: Boolean) extends AnyVal diff --git a/tests/run/mixin-primitive-on-generic-5.check b/tests/run/mixin-primitive-on-generic-5.check new file mode 100644 index 000000000..bb101b641 --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-5.check @@ -0,0 +1,2 @@ +true +true diff --git a/tests/run/mixin-primitive-on-generic-5.scala b/tests/run/mixin-primitive-on-generic-5.scala new file mode 100644 index 000000000..438c130de --- /dev/null +++ b/tests/run/mixin-primitive-on-generic-5.scala @@ -0,0 +1,21 @@ + +object Test { + def main(args: Array[String]): Unit = { + println((new Foo: Bar[VBoolean]).value1.v) + println((new Foo: Bar[VBoolean]).value2.v) + } +} + +class Foo extends Baz with Bar[VBoolean] + +trait Bar[T] { + def value1: T + def value2(): T +} + +class Baz { + def value1: VBoolean = new VBoolean(true) + def value2(): VBoolean = new VBoolean(true) +} + +class VBoolean(val v: Boolean) extends AnyVal |