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

Merge pull request #6085 from eed3si9n/wip/metabuild-classpath2 

Use the classpath obtained by the launcher for metabuild, take 2
This commit is contained in:
eugene yokota 2020-11-15 14:40:28 -05:00 committed by GitHub
parent fedee2ba06 b1a8f11011
commit d34c34d177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ++= {