Merge pull request #1793 from sbt/wip/aether-resolver

Use Aether for resolving maven dependencies

build.sbt

@@ -412,15 +412,26 @@ lazy val sbtProj = (project in sbtPath).
     normalizedName := "sbt"
   )
 
-def scriptedTask: Initialize[InputTask[Unit]] = InputTask(scriptedSource(dir => (s: State) => scriptedParser(dir))) { result =>
-  (proguard in Proguard, fullClasspath in scriptedSbtProj in Test, scalaInstance in scriptedSbtProj, publishAll, scriptedSource, result) map {
-    (launcher, scriptedSbtClasspath, scriptedSbtInstance, _, sourcePath, args) =>
-      doScripted(launcher, scriptedSbtClasspath, scriptedSbtInstance, sourcePath, args)
-  }
+lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
+  dependsOn(sbtProj, ivyProj % "test->test").
+  settings(baseSettings: _*).
+  settings(
+    name := "sbt-maven-resolver",
+    libraryDependencies ++= aetherLibs,
+    sbtPlugin := true
+  )
+
+def scriptedTask: Initialize[InputTask[Unit]] = Def.inputTask {
+  val result = scriptedSource(dir => (s: State) => scriptedParser(dir)).parsed
+  publishAll.value
+  doScripted((proguard in Proguard).value, (fullClasspath in scriptedSbtProj in Test).value,
+    (scalaInstance in scriptedSbtProj).value, scriptedSource.value, result, scriptedPrescripted.value)
 }
 
-def scriptedUnpublishedTask: Initialize[InputTask[Unit]] = InputTask(scriptedSource(dir => (s: State) => scriptedParser(dir))) { result =>
-  (proguard in Proguard, fullClasspath in scriptedSbtProj in Test, scalaInstance in scriptedSbtProj, scriptedSource, result) map doScripted
+def scriptedUnpublishedTask: Initialize[InputTask[Unit]] = Def.inputTask {
+  val result = scriptedSource(dir => (s: State) => scriptedParser(dir)).parsed
+  doScripted((proguard in Proguard).value, (fullClasspath in scriptedSbtProj in Test).value,
+    (scalaInstance in scriptedSbtProj).value, scriptedSource.value, result, scriptedPrescripted.value)
 }
 
 lazy val publishAll = TaskKey[Unit]("publish-all")
@@ -435,7 +446,7 @@ def allProjects = Seq(launchInterfaceProj, launchProj, testSamples, interfacePro
   compileInterfaceProj, compileIncrementalProj, compilePersistProj, compilerProj,
   compilerIntegrationProj, compilerIvyProj,
   scriptedBaseProj, scriptedSbtProj, scriptedPluginProj,
-  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj)
+  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, mavenResolverPluginProj)
 def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided))
 lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
 
@@ -444,13 +455,25 @@ def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings
   Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++ Formatting.sbtFilesSettings ++
   Transform.conscriptSettings(launchProj)
 def otherRootSettings = Seq(
+  Scripted.scriptedPrescripted := { _ => },
   Scripted.scripted <<= scriptedTask,
   Scripted.scriptedUnpublished <<= scriptedUnpublishedTask,
   Scripted.scriptedSource <<= (sourceDirectory in sbtProj) / "sbt-test",
   publishAll := {
     (publishLocal).all(ScopeFilter(inAnyProject)).value
   }
-)
+) ++ inConfig(Scripted.MavenResolverPluginTest)(Seq(
+  Scripted.scripted <<= scriptedTask,
+  Scripted.scriptedUnpublished <<= scriptedUnpublishedTask,
+  Scripted.scriptedPrescripted := { f =>
+    val inj = f / "project" / "maven.sbt"
+    if (!inj.exists) {
+      IO.write(inj, """libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
+        |sbtBinaryVersion.value, scalaBinaryVersion.value)""".stripMargin)
+      // sLog.value.info(s"""Injected project/maven.sbt to $f""")
+    }
+  }
+))
 lazy val docProjects: ScopeFilter = ScopeFilter(
   inAnyProject -- inProjects(root, sbtProj, scriptedBaseProj, scriptedSbtProj, scriptedPluginProj),
   inConfigurations(Compile)