fix tests

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

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)

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)

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)