diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index cb353df1f..0d6683a91 100644 --- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -5,6 +5,7 @@ package sbt.librarymanagement import java.io.{ IOException, File } import java.net.{ URI, URL } +import scala.annotation.nowarn import scala.xml.XML import org.xml.sax.SAXParseException import sbt.util.Logger @@ -102,6 +103,7 @@ private[librarymanagement] abstract class ResolverFunctions { @deprecated("Renamed to SbtRepositoryRoot.", "1.0.0") val SbtPluginRepositoryRoot = SbtRepositoryRoot val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories" + val SonatypeS01RepositoryRoot = "https://s01.oss.sonatype.org/content/repositories" val SonatypeReleasesRepository = "https://oss.sonatype.org/service/local/repositories/releases/content/" val JavaNet2RepositoryName = "java.net Maven2 Repository" @@ -153,12 +155,20 @@ private[librarymanagement] abstract class ResolverFunctions { url("sbt-plugin-" + status, new URL(SbtRepositoryRoot + "/sbt-plugin-" + status + "/"))( ivyStylePatterns ) + @deprecated("Use sonatypeOssRepos instead", "1.7.0") def sonatypeRepo(status: String) = MavenRepository( "sonatype-" + status, if (status == "releases") SonatypeReleasesRepository else SonatypeRepositoryRoot + "/" + status ) + private def sonatypeS01Repo(status: String) = + MavenRepository( + "sonatype-s01-" + status, + SonatypeS01RepositoryRoot + "/" + status + ) + def sonatypeOssRepos(status: String) = + Vector(sonatypeRepo(status): @nowarn("cat=deprecation"), sonatypeS01Repo(status)) def bintrayRepo(owner: String, repo: String) = MavenRepository(s"bintray-$owner-$repo", s"https://dl.bintray.com/$owner/$repo/") def bintrayIvyRepo(owner: String, repo: String) =