From 4ef5e85390b9f9c5f6bf2fdc7a918e97151cfcc5 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 11 Apr 2017 16:41:13 +0100 Subject: [PATCH] Drop deprecated default resolvers --- main/src/main/scala/sbt/Defaults.scala | 13 +++---------- .../dependency-management/override2/build.sbt | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 606116c91..1d98fa48c 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2192,16 +2192,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") - - @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") + val sbtIvySnapshots: URLRepository = Resolver.sbtIvyRepo("snapshots") + val typesafeReleases: URLRepository = Resolver.typesafeIvyRepo("releases") + val sbtPluginReleases: URLRepository = Resolver.sbtPluginRepo("releases") def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID = if (plugin) dep.withConfigurations(Some(Provided.name)) else dep diff --git a/sbt/src/sbt-test/dependency-management/override2/build.sbt b/sbt/src/sbt-test/dependency-management/override2/build.sbt index f4ff463f6..c3308a42a 100644 --- a/sbt/src/sbt-test/dependency-management/override2/build.sbt +++ b/sbt/src/sbt-test/dependency-management/override2/build.sbt @@ -4,8 +4,8 @@ addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0", sbtVers scalaBinaryVersion := "2.9.1" -resolvers += Classpaths.typesafeResolver +resolvers += Classpaths.typesafeReleases dependencyOverrides := Set("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.1") -autoScalaLibrary := false \ No newline at end of file +autoScalaLibrary := false