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

delete useJCenter settingKey

This commit is contained in:
xuwei-k 2024-10-22 08:52:14 +09:00
parent acf8ec77c3
commit 026f78d056
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3252,7 +3252,6 @@ object Classpaths {
publishTo :== None, publishTo :== None,
resolvers :== Vector.empty, resolvers :== Vector.empty,
includePluginResolvers :== false, includePluginResolvers :== false,
useJCenter :== false,
retrievePattern :== Resolver.defaultRetrievePattern, retrievePattern :== Resolver.defaultRetrievePattern,
transitiveClassifiers :== Seq(SourceClassifier, DocClassifier), transitiveClassifiers :== Seq(SourceClassifier, DocClassifier),
sourceArtifactTypes :== Artifact.DefaultSourceTypes.toVector, sourceArtifactTypes :== Artifact.DefaultSourceTypes.toVector,
@ -3318,18 +3317,17 @@ object Classpaths {
externalResolvers.?.value, externalResolvers.?.value,
resolvers.value, resolvers.value,
appResolvers.value, appResolvers.value,
useJCenter.value
) match { ) match {
case (Some(delegated), Seq(), _, _) => delegated case (Some(delegated), Seq(), _) => delegated
case (_, rs, Some(ars), _) => ars ++ rs case (_, rs, Some(ars)) => ars ++ rs
case (_, rs, _, uj) => Resolver.combineDefaultResolvers(rs.toVector, uj, mavenCentral = true) case (_, rs, _) =>
Resolver.combineDefaultResolvers(rs.toVector, jcenter = false, mavenCentral = true)
}), }),
appResolvers := { appResolvers := {
val ac = appConfiguration.value val ac = appConfiguration.value
val uj = useJCenter.value
appRepositories(ac) map { ars => appRepositories(ac) map { ars =>
val useMavenCentral = ars contains Resolver.DefaultMavenRepository val useMavenCentral = ars contains Resolver.DefaultMavenRepository
Resolver.reorganizeAppResolvers(ars, uj, useMavenCentral) Resolver.reorganizeAppResolvers(ars, jcenter = false, useMavenCentral)
} }
}, },
bootResolvers := { bootResolvers := {

1
main/src/main/scala/sbt/Keys.scala
View File

@ -578,7 +578,6 @@ object Keys {
val otherResolvers = taskKey[Seq[Resolver]]("Resolvers not included in the main resolver chain, such as those in module configurations.").withRank(CSetting) val otherResolvers = taskKey[Seq[Resolver]]("Resolvers not included in the main resolver chain, such as those in module configurations.").withRank(CSetting)
val scalaCompilerBridgeResolvers = taskKey[Seq[Resolver]]("Resolvers used to resolve compiler bridges.").withRank(CSetting) val scalaCompilerBridgeResolvers = taskKey[Seq[Resolver]]("Resolvers used to resolve compiler bridges.").withRank(CSetting)
val includePluginResolvers = settingKey[Boolean]("Include the resolvers from the metabuild.").withRank(CSetting) val includePluginResolvers = settingKey[Boolean]("Include the resolvers from the metabuild.").withRank(CSetting)
val useJCenter = settingKey[Boolean]("Use JCenter as the default repository.").withRank(CSetting)
val moduleConfigurations = settingKey[Seq[ModuleConfiguration]]("Defines module configurations, which override resolvers on a per-module basis.").withRank(BMinusSetting) val moduleConfigurations = settingKey[Seq[ModuleConfiguration]]("Defines module configurations, which override resolvers on a per-module basis.").withRank(BMinusSetting)
val retrievePattern = settingKey[String]("Pattern used to retrieve managed dependencies to the current build.").withRank(DSetting) val retrievePattern = settingKey[String]("Pattern used to retrieve managed dependencies to the current build.").withRank(DSetting)
val retrieveConfiguration = settingKey[Option[RetrieveConfiguration]]("Configures retrieving dependencies to the current build.").withRank(DSetting) val retrieveConfiguration = settingKey[Option[RetrieveConfiguration]]("Configures retrieving dependencies to the current build.").withRank(DSetting)

4
sbt-app/src/sbt-test/dependency-management/default-resolvers/test
View File

@ -1,9 +1,5 @@
> check > check
> set useJCenter := true
> check2
> reload > reload
> set resolvers += Resolver.jcenterRepo > set resolvers += Resolver.jcenterRepo