From 026f78d056dbf9bfc149ce53365fd04a8423a26c Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Tue, 22 Oct 2024 08:52:14 +0900
Subject: [PATCH] delete useJCenter settingKey

---
 main/src/main/scala/sbt/Defaults.scala               | 12 +++++-------
 main/src/main/scala/sbt/Keys.scala                   |  1 -
 .../dependency-management/default-resolvers/test     |  4 ----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index c4c43299e..6f961ba0a 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -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 := {
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index 7e8f00daa..429794e84 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -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)
diff --git a/sbt-app/src/sbt-test/dependency-management/default-resolvers/test b/sbt-app/src/sbt-test/dependency-management/default-resolvers/test
index 769501c0a..3ca2dc123 100644
--- a/sbt-app/src/sbt-test/dependency-management/default-resolvers/test
+++ b/sbt-app/src/sbt-test/dependency-management/default-resolvers/test
@@ -1,9 +1,5 @@
 > check
 
-> set useJCenter := true
-
-> check2
-
 > reload
 
 > set resolvers += Resolver.jcenterRepo