From b1a8f110117559241596d3006d0032b6cd7c8a1f Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 15 Nov 2020 12:19:03 -0500
Subject: [PATCH] Use the classpath obtained by the launcher for metabuild,
 take 2

Ref https://github.com/sbt/sbt/pull/4443
Fixes https://github.com/sbt/sbt/issues/5750

In #4443 I implemented an optimization where the metabuild would no longer re-resolve numerous sbt artifacts for metabuilds each time, and instead use whatever the JARs provided by the launcher. At the time, this technique didn't work for Coursier so I've placed in some workarounds for it. Now that Coursier's resolution has improved, it seems like the workaround is actually causing more harm. This removes the bandaid, and local testing shows that it seems to be working.

For instance, we no longer need to put in `ThisBuild / useCoursier := false` in sbt/sbt's `project/plugins.sbt`.
---
 main/src/main/scala/sbt/Defaults.scala | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 97605fd5d..1a0ee4d2b 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2496,7 +2496,6 @@ object Classpaths {
       managedClasspath := {
         val isMeta = isMetaBuild.value
         val force = reresolveSbtArtifacts.value
-        val csr = useCoursier.value
         val app = appConfiguration.value
         val sbtCp0 = app.provider.mainClasspath.toList
         val sbtCp = sbtCp0 map { Attributed.blank(_) }
@@ -2505,7 +2504,7 @@ object Classpaths {
           classpathTypes.value,
           update.value
         )
-        if (isMeta && !force && !csr) mjars ++ sbtCp
+        if (isMeta && !force) mjars ++ sbtCp
         else mjars
       },
       exportedProducts := ClasspathImpl.trackedExportedProducts(TrackLevel.TrackAlways).value,
@@ -3077,7 +3076,6 @@ object Classpaths {
       val isMeta = isMetaBuild.value
       val force = reresolveSbtArtifacts.value
       val excludes = excludeDependencies.value
-      val csr = useCoursier.value
       val o = sbtdeps.organization
       val sbtModulesExcludes = Vector[ExclusionRule](
         o % "sbt",
@@ -3088,7 +3086,7 @@ object Classpaths {
         o %% "util-position",
         o %% "io"
       )
-      if (isMeta && !force && !csr) excludes.toVector ++ sbtModulesExcludes
+      if (isMeta && !force) excludes.toVector ++ sbtModulesExcludes
       else excludes
     },
     dependencyOverrides ++= {