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

Merge pull request #393 from armanbilge/feature/sonatypeRepos 

Deprecate `sonatypeRepo`, add `sonatypeOssRepos` to `Resolver`
This commit is contained in:
eugene yokota 2022-05-07 19:04:44 -04:00 committed by GitHub
parent 6798813515 7a2f81ea05
commit e15f0c149a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
View File

@ -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) =