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

View File

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

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

View File

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