luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2670 from dwijnand/remove-404-resolvers 

Remove resolvers to repositories that don't exist
This commit is contained in:
eugene yokota 2016-07-18 11:10:18 -04:00 committed by GitHub
parent 5abccaedd2 b245cf5f58
commit 4b0ccd2dab
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/Defaults.scala
View File

@ -123,7 +123,7 @@ object Defaults extends BuildCommon {
retrieveManagedSync :== false, retrieveManagedSync :== false,
configurationsToRetrieve :== None, configurationsToRetrieve :== None,
scalaOrganization :== ScalaArtifacts.Organization, 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, crossVersion :== CrossVersion.Disabled,
buildDependencies <<= Classpaths.constructBuildDependencies, buildDependencies <<= Classpaths.constructBuildDependencies,
version :== "0.1-SNAPSHOT", version :== "0.1-SNAPSHOT",
@ -1799,8 +1799,9 @@ object Classpaths {
flatten(defaultConfiguration in p get data) getOrElse Configurations.Default flatten(defaultConfiguration in p get data) getOrElse Configurations.Default
def flatten[T](o: Option[Option[T]]): Option[T] = o flatMap idFun 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 typesafeReleases = Resolver.typesafeIvyRepo("releases")
lazy val typesafeSnapshots = Resolver.typesafeIvyRepo("snapshots")
@deprecated("Use `typesafeReleases` instead", "0.12.0") @deprecated("Use `typesafeReleases` instead", "0.12.0")
lazy val typesafeResolver = typesafeReleases lazy val typesafeResolver = typesafeReleases
@ -1808,7 +1809,6 @@ object Classpaths {
def typesafeRepo(status: String) = Resolver.typesafeIvyRepo(status) def typesafeRepo(status: String) = Resolver.typesafeIvyRepo(status)
lazy val sbtPluginReleases = Resolver.sbtPluginRepo("releases") lazy val sbtPluginReleases = Resolver.sbtPluginRepo("releases")
lazy val sbtPluginSnapshots = Resolver.sbtPluginRepo("snapshots")
def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID = def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID =
if (plugin) dep.copy(configurations = Some(Provided.name)) else dep if (plugin) dep.copy(configurations = Some(Provided.name)) else dep

6
main/src/main/scala/sbt/Opts.scala
View File

@ -52,13 +52,9 @@ object DefaultOptions {
def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version) def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version)
def resolvers(snapshot: Boolean): Seq[Resolver] = { def resolvers(snapshot: Boolean): Seq[Resolver] = {
if (snapshot) Seq(Classpaths.typesafeSnapshots, resolver.sonatypeSnapshots) else Nil if (snapshot) Seq(resolver.sonatypeSnapshots) else Nil
}
def pluginResolvers(plugin: Boolean, snapshot: Boolean): Seq[Resolver] = {
if (plugin && snapshot) Seq(Classpaths.typesafeSnapshots, Classpaths.sbtPluginSnapshots) else Nil
} }
def addResolvers: Setting[_] = Keys.resolvers <++= Keys.isSnapshot apply resolvers 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") @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") def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials")

2
project/Dependencies.scala
View File

@ -11,7 +11,7 @@ object Dependencies {
// sbt modules // sbt modules
val ioVersion = "1.0.0-M6" val ioVersion = "1.0.0-M6"
val utilVersion = "0.1.0-M13" val utilVersion = "0.1.0-M13"
val librarymanagementVersion = "0.1.0-M12" val librarymanagementVersion = "0.1.0-X1"
val zincVersion = "1.0.0-X1" val zincVersion = "1.0.0-X1"
lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion