Change binarySbtVersion for maven resolver plugin, fix some builds

build.sbt

@@ -202,6 +202,7 @@ lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
   dependsOn(sbtProj).
   settings(
     baseSettings,
+    sbtBinaryVersion := "1.0.0-SNAPSHOT",
     name := "sbt-maven-resolver",
     libraryDependencies ++= aetherLibs ++ Seq(utilTesting % Test, (libraryManagement % Test).classifier("tests"), libraryManagement % Test),
     sbtPlugin := true

sbt/src/sbt-test/actions/compile-time-only/changes/A1.scala

@@ -1,4 +1,5 @@
 import sbt._
+import Import._
 import Def.Initialize
 import complete.{DefaultParsers, Parser}
 
@@ -11,4 +12,4 @@ object A {
 	
 	val x3: Initialize[Int] = Def.setting { 3 }
 	val y3 = Def.setting { x3.value }
-}
+}

sbt/src/sbt-test/actions/compile-time-only/changes/A3.scala

@@ -1,8 +1,9 @@
 import sbt._
+import Import._
 import Def.Initialize
 import complete.{DefaultParsers, Parser}
 
 object A {
 	val x1: Initialize[Parser[Int]] = Def.setting { DefaultParsers.success(3) }
 	val y1 = Def.task { x1.parsed }
-}
+}

sbt/src/sbt-test/actions/state/project/Build.scala

@@ -1,5 +1,6 @@
 import sbt._
 import Keys._
+import Import._
 import complete.Parser
 import complete.DefaultParsers._
 import sbinary.DefaultProtocol._
@@ -47,4 +48,4 @@ object MyBuild extends Build
 
 	def dummyTask = (key: Any) => maxErrors map { _ => () }
 	def str(o: Option[Int]) = o match { case None => "blue"; case Some(i) => i.toString }
-}
+}

sbt/src/sbt-test/api/extracted/build.sbt

@@ -28,7 +28,7 @@ myTask in (sub, Compile) := "sub compile"
 testTask("testRunTaskSubCompile", "sub compile", myTask in (sub, Compile))
 
 def argFunction(f: String => String) = Def.inputTask {
-  import sbt.complete.Parsers._
+  import complete.Parsers._
   f((OptSpace ~> StringBasic).parsed)
 }
 

sbt/src/sbt-test/dependency-management/cache-update/build.sbt

@@ -13,7 +13,7 @@ lazy val root = (project in file(".")).
     dependencyOverrides in ThisBuild += "com.github.nscala-time" %% "nscala-time" % "1.0.0",
     libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "1.0.0",
     check := {
-      import sbt.Cache._, sbt.CacheIvy.updateIC
+      import Cache._, CacheIvy.updateIC
       implicit val updateCache = updateIC
       type In = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
       val s = (streams in update).value

sbt/src/sbt-test/dependency-management/ivy-settings-c/project/P.scala

@@ -25,7 +25,7 @@ object B extends Build
 	lazy val baseSettings = Seq(
 		autoScalaLibrary := false,
 		ivyScala := None,
-		unmanagedJars in Compile <++= scalaInstance map (_.jars),
+		unmanagedJars in Compile <++= scalaInstance map (_.allJars.toSeq),
 		publishArtifact in packageSrc := false,
 		publishArtifact in packageDoc := false,
 		publishMavenStyle := false

sbt/src/sbt-test/dependency-management/scala-home/build.sbt

@@ -2,6 +2,6 @@ val makeHome = taskKey[Unit]("Populates the 'home/lib' directory with Scala jars
 
 makeHome := {
 	val lib = baseDirectory.value / "home" / "lib"
-	for(jar <- scalaInstance.value.jars)
+	for(jar <- scalaInstance.value.allJars)
 		IO.copyFile(jar, lib / jar.getName)
 }

sbt/src/sbt-test/java/track-anonymous/build.sbt

@@ -1,5 +1,5 @@
 {
-		import sbt.complete.DefaultParsers._
+		import complete.DefaultParsers._
 	val parser = token(Space ~> ( ("exists" ^^^ true) | ("absent" ^^^ false) ) )
 	InputKey[Unit]("check-output") := {
 		val shouldExist = parser.parsed
@@ -11,4 +11,4 @@
 		else
 			()
 	}
-}
+}

sbt/src/sbt-test/source-dependencies/binary/project/P.scala

@@ -1,4 +1,5 @@
 import sbt._
+import Import._
 import Keys._
 
 object B extends Build
@@ -7,4 +8,4 @@ object B extends Build
 	lazy val use = Project("use", file("use")) settings(
 		unmanagedJars in Compile <+= packageBin in (dep, Compile) map Attributed.blank
 	)
-}
+}

sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala

@@ -1,4 +1,5 @@
 import sbt._
+import Import._
 import Keys._
 import java.net.URLClassLoader