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

Drop deprecated default resolvers

This commit is contained in:
Dale Wijnand 2017-04-11 16:41:13 +01:00
parent 0d32f6fc76
commit 4ef5e85390
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2192,16 +2192,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") val sbtIvySnapshots: URLRepository = Resolver.sbtIvyRepo("snapshots")
val typesafeReleases: URLRepository = Resolver.typesafeIvyRepo("releases")
lazy val typesafeReleases = Resolver.typesafeIvyRepo("releases") val sbtPluginReleases: URLRepository = Resolver.sbtPluginRepo("releases")
@deprecated("Use `typesafeReleases` instead", "0.12.0")
lazy val typesafeResolver = typesafeReleases
@deprecated("Use `Resolver.typesafeIvyRepo` instead", "0.12.0")
def typesafeRepo(status: String) = Resolver.typesafeIvyRepo(status)
lazy val sbtPluginReleases = Resolver.sbtPluginRepo("releases")
def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID = def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID =
if (plugin) dep.withConfigurations(Some(Provided.name)) else dep if (plugin) dep.withConfigurations(Some(Provided.name)) else dep

2
sbt/src/sbt-test/dependency-management/override2/build.sbt
View File

@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0", sbtVers
scalaBinaryVersion := "2.9.1" scalaBinaryVersion := "2.9.1"
resolvers += Classpaths.typesafeResolver resolvers += Classpaths.typesafeReleases
dependencyOverrides := Set("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.1") dependencyOverrides := Set("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.1")