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

Merge pull request #4670 from eed3si9n/wip/bridgebug 

exclude inter-project resolvers when resolving the compiler bridge
This commit is contained in:
eugene yokota 2019-05-13 02:54:44 -04:00 committed by GitHub
parent c1d2e703b6 d8c9eb90c6
commit 41197a9c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/scala/sbt/internal/LMCoursier.scala
View File

@ -9,7 +9,12 @@ package sbt
package internal
import java.io.File
import lmcoursier.definitions.{ Classifier, Configuration => CConfiguration, CacheLogger }
import lmcoursier.definitions.{
Classifier,
Configuration => CConfiguration,
CacheLogger,
Project => CProject
}
import lmcoursier._
import sbt.librarymanagement._
import Keys._
@ -45,7 +50,12 @@ private[sbt] object LMCoursier {
val rs = resolversTask.value
val scalaOrg = scalaOrganization.value
val scalaVer = scalaVersion.value
val interProjectDependencies = csrInterProjectDependencies.value
val interProjectDependencies0 = csrInterProjectDependencies.value.toVector
// during the resolution of sbt artifacts, such as compiler bridge source
// interproject dependencies should not be used (otherwise you can't compile sbt/zinc using sbt)
val interProjectDependencies: Vector[CProject] =
if (sbtClassifiers) Vector()
else interProjectDependencies0
val excludeDeps = Inputs.exclusions(
allExcludeDependencies.value,
scalaVer,
@ -71,7 +81,7 @@ private[sbt] object LMCoursier {
Classpaths.warnResolversConflict(rs, log)
CoursierConfiguration()
.withResolvers(rs.toVector)
.withInterProjectDependencies(interProjectDependencies.toVector)
.withInterProjectDependencies(interProjectDependencies)
.withFallbackDependencies(fallbackDeps.toVector)
.withExcludeDependencies(
excludeDeps.toVector.map {