From b245cf5f58c998b6f3500d7a13806b7b872e9e48 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 12 Jul 2016 08:41:48 +0100
Subject: [PATCH] Remove resolvers to repositories that don't exist

Fixes #2195
---
 main/src/main/scala/sbt/Defaults.scala | 6 +++---
 main/src/main/scala/sbt/Opts.scala     | 6 +-----
 project/Dependencies.scala             | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 4025238a9..91ab2bc7c 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -123,7 +123,7 @@ object Defaults extends BuildCommon {
       retrieveManagedSync :== false,
       configurationsToRetrieve :== None,
       scalaOrganization :== ScalaArtifacts.Organization,
-      sbtResolver := { if (sbtVersion.value endsWith "-SNAPSHOT") Classpaths.typesafeSnapshots else Classpaths.typesafeReleases },
+      sbtResolver := { if (sbtVersion.value endsWith "-SNAPSHOT") Classpaths.sbtIvySnapshots else Classpaths.typesafeReleases },
       crossVersion :== CrossVersion.Disabled,
       buildDependencies <<= Classpaths.constructBuildDependencies,
       version :== "0.1-SNAPSHOT",
@@ -1818,8 +1818,9 @@ object Classpaths {
     flatten(defaultConfiguration in p get data) getOrElse Configurations.Default
   def flatten[T](o: Option[Option[T]]): Option[T] = o flatMap idFun
 
+  val sbtIvySnapshots = Resolver.sbtIvyRepo("snapshots")
+
   lazy val typesafeReleases = Resolver.typesafeIvyRepo("releases")
-  lazy val typesafeSnapshots = Resolver.typesafeIvyRepo("snapshots")
 
   @deprecated("Use `typesafeReleases` instead", "0.12.0")
   lazy val typesafeResolver = typesafeReleases
@@ -1827,7 +1828,6 @@ object Classpaths {
   def typesafeRepo(status: String) = Resolver.typesafeIvyRepo(status)
 
   lazy val sbtPluginReleases = Resolver.sbtPluginRepo("releases")
-  lazy val sbtPluginSnapshots = Resolver.sbtPluginRepo("snapshots")
 
   def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID =
     if (plugin) dep.copy(configurations = Some(Provided.name)) else dep
diff --git a/main/src/main/scala/sbt/Opts.scala b/main/src/main/scala/sbt/Opts.scala
index 201eb3bbf..1adea2a5f 100644
--- a/main/src/main/scala/sbt/Opts.scala
+++ b/main/src/main/scala/sbt/Opts.scala
@@ -52,13 +52,9 @@ object DefaultOptions {
   def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version)
 
   def resolvers(snapshot: Boolean): Seq[Resolver] = {
-    if (snapshot) Seq(Classpaths.typesafeSnapshots, resolver.sonatypeSnapshots) else Nil
-  }
-  def pluginResolvers(plugin: Boolean, snapshot: Boolean): Seq[Resolver] = {
-    if (plugin && snapshot) Seq(Classpaths.typesafeSnapshots, Classpaths.sbtPluginSnapshots) else Nil
+    if (snapshot) Seq(resolver.sonatypeSnapshots) else Nil
   }
   def addResolvers: Setting[_] = Keys.resolvers <++= Keys.isSnapshot apply resolvers
-  def addPluginResolvers: Setting[_] = Keys.resolvers <++= (Keys.sbtPlugin, Keys.isSnapshot) apply pluginResolvers
 
   @deprecated("Use `credentials(State)` instead to make use of configuration path dynamically configured via `Keys.globalSettingsDirectory`; relying on ~/.ivy2 is not recommended anymore.", "0.12.0")
   def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f37324a5b..1bed90908 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,7 +11,7 @@ object Dependencies {
   // sbt modules
   val ioVersion = "1.0.0-M6"
   val utilVersion = "0.1.0-M13"
-  val librarymanagementVersion = "0.1.0-M12"
+  val librarymanagementVersion = "0.1.0-X1"
   val zincVersion = "1.0.0-X1"
   lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
   lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion