From a680dc2336d1ff278d7ead748eadc5e47b2e19e4 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 6 Mar 2011 09:23:36 -0500 Subject: [PATCH] fix tests --- compile/src/test/scala/BasicAPI.scala | 2 +- main/Aggregation.scala | 2 +- sbt/package.scala | 3 ++- sbt/src/sbt-test/actions/aggregate/project/Marker.scala | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compile/src/test/scala/BasicAPI.scala b/compile/src/test/scala/BasicAPI.scala index e2d710d5d..0c191d09d 100644 --- a/compile/src/test/scala/BasicAPI.scala +++ b/compile/src/test/scala/BasicAPI.scala @@ -16,7 +16,7 @@ package org.example { def x = new { def y = new S { def z = new Child { def x = "asdf" } } } final val xconst = 3 private[this] def zz: Seq[_] = Nil - type L[M[_], P <: Int >: Int] = M[P] + type L[M[_], P >: Int <: Int] = M[P] type Q = L[Option, Int] } object Basic diff --git a/main/Aggregation.scala b/main/Aggregation.scala index 5b504e533..8ad690a40 100644 --- a/main/Aggregation.scala +++ b/main/Aggregation.scala @@ -15,7 +15,7 @@ package sbt sealed trait Aggregation final object Aggregation { - def apply(dependencies: Seq[ProjectRef], transitive: Boolean = true): Aggregation = new Explicit(dependencies, transitive) + def apply(dependencies: Seq[ProjectReference], transitive: Boolean = true): Aggregation = new Explicit(dependencies, transitive) implicit def fromBoolean(b: Boolean): Aggregation = if(b) Enabled else Disabled val Enabled = new Implicit(true) val Disabled = new Implicit(false) diff --git a/sbt/package.scala b/sbt/package.scala index 57dc4cd08..d5cdbc1c3 100644 --- a/sbt/package.scala +++ b/sbt/package.scala @@ -21,7 +21,8 @@ package object sbt extends sbt.std.TaskExtra with sbt.Types with sbt.ProcessExtr def Javadoc = C.Javadoc def Sources = C.Sources def Provided = C.Provided - def System = C.System +// java.lang.System is more important, so don't alias this one +// def System = C.System def Optional = C.Optional implicit def globFilter(expression: String): NameFilter = GlobFilter(expression) diff --git a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala b/sbt/src/sbt-test/actions/aggregate/project/Marker.scala index b58d7f3f3..78aec27d9 100644 --- a/sbt/src/sbt-test/actions/aggregate/project/Marker.scala +++ b/sbt/src/sbt-test/actions/aggregate/project/Marker.scala @@ -6,7 +6,7 @@ trait Marker { final lazy val Mark = TaskKey[Unit]("mark") final def mark: Initialize[Task[Unit]] = mark(baseDirectory) - final def mark(project: ProjectRef): Initialize[Task[Unit]] = mark(baseDirectory in project) + final def mark(project: Reference): Initialize[Task[Unit]] = mark(baseDirectory in project) final def mark(baseKey: ScopedSetting[File]): Initialize[Task[Unit]] = baseKey map { base => val toMark = base / "ran" if(toMark.exists)