From a561f3a901cbff26cf3fd32ccafbe7bc4978561f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 16 Jan 2022 21:34:54 +0000 Subject: [PATCH 1/3] Add shortcut for s01.oss.sonatype.org to Resolver Fixes https://github.com/sbt/sbt/issues/6787. See also: https://central.sonatype.org/news/20210223_new-users-on-s01/ --- .../main/scala/sbt/librarymanagement/ResolverExtra.scala | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index cb353df1f..003c6015a 100644 --- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -102,6 +102,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" @@ -159,6 +160,11 @@ private[librarymanagement] abstract class ResolverFunctions { if (status == "releases") SonatypeReleasesRepository else SonatypeRepositoryRoot + "/" + status ) + def sonatypeS01Repo(status: String) = + MavenRepository( + "sonatype-s01-" + status, + SonatypeS01RepositoryRoot + "/" + 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) = From c17309a91438a45491359fb94099b8828b72d246 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 16 Jan 2022 19:56:58 +0000 Subject: [PATCH 2/3] Deprecate sonatypeRepo, add sonatypeRepos --- .../main/scala/sbt/librarymanagement/ResolverExtra.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index 003c6015a..4bb59b79c 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 @@ -154,17 +155,20 @@ private[librarymanagement] abstract class ResolverFunctions { url("sbt-plugin-" + status, new URL(SbtRepositoryRoot + "/sbt-plugin-" + status + "/"))( ivyStylePatterns ) + @deprecated("Use sonatypeRepos instead", "1.7.0") def sonatypeRepo(status: String) = MavenRepository( "sonatype-" + status, if (status == "releases") SonatypeReleasesRepository else SonatypeRepositoryRoot + "/" + status ) - def sonatypeS01Repo(status: String) = + private def sonatypeS01Repo(status: String) = MavenRepository( "sonatype-s01-" + status, SonatypeS01RepositoryRoot + "/" + status ) + def sonatypeRepos(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) = From 7a2f81ea05ad1228c3c8bad7eccc742cddd07a44 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 31 Jan 2022 23:23:34 +0000 Subject: [PATCH 3/3] sonatypeRepos -> sonatypeOssRepos --- core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index 4bb59b79c..0d6683a91 100644 --- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -155,7 +155,7 @@ private[librarymanagement] abstract class ResolverFunctions { url("sbt-plugin-" + status, new URL(SbtRepositoryRoot + "/sbt-plugin-" + status + "/"))( ivyStylePatterns ) - @deprecated("Use sonatypeRepos instead", "1.7.0") + @deprecated("Use sonatypeOssRepos instead", "1.7.0") def sonatypeRepo(status: String) = MavenRepository( "sonatype-" + status, @@ -167,7 +167,7 @@ private[librarymanagement] abstract class ResolverFunctions { "sonatype-s01-" + status, SonatypeS01RepositoryRoot + "/" + status ) - def sonatypeRepos(status: String) = + 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/")