mirror of https://github.com/sbt/sbt.git
Enable classpath ordering (w/ disable option) (#174)
This commit is contained in:
parent
03e6e7b47e
commit
5bd2db84ee
|
|
@ -38,7 +38,9 @@ import xsbti.Logger
|
|||
extraProjects: Vector[Project] = Vector.empty,
|
||||
forceVersions: Vector[(Module, String)] = Vector.empty,
|
||||
@since
|
||||
reconciliation: Vector[(ModuleMatchers, Reconciliation)] = Vector.empty
|
||||
reconciliation: Vector[(ModuleMatchers, Reconciliation)] = Vector.empty,
|
||||
@since
|
||||
classpathOrder: Boolean = true,
|
||||
) {
|
||||
|
||||
def withLog(log: Logger): CoursierConfiguration =
|
||||
|
|
|
|||
|
|
@ -171,7 +171,8 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
|
|||
projectName = projectName,
|
||||
sbtClassifiers = false,
|
||||
cache = cache0,
|
||||
parallel = conf.parallelDownloads
|
||||
parallel = conf.parallelDownloads,
|
||||
classpathOrder = conf.classpathOrder,
|
||||
)
|
||||
|
||||
val sbtBootJarOverrides = SbtBootJars(
|
||||
|
|
|
|||
|
|
@ -13,5 +13,6 @@ final case class ArtifactsParams(
|
|||
projectName: String,
|
||||
sbtClassifiers: Boolean,
|
||||
cache: FileCache[Task],
|
||||
parallel: Int
|
||||
parallel: Int,
|
||||
classpathOrder: Boolean,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ object ArtifactsRun {
|
|||
.withResolutions(params.resolutions)
|
||||
.withArtifactTypes(Set(Type.all))
|
||||
.withClassifiers(params.classifiers.getOrElse(Nil).toSet)
|
||||
.withClasspathOrder(false)
|
||||
.withClasspathOrder(params.classpathOrder)
|
||||
.addExtraArtifacts { l =>
|
||||
if (params.includeSignatures)
|
||||
l.flatMap(_._3.extra.get("sig").toSeq)
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@ object ArtifactsTasks {
|
|||
.withCachePolicies(cachePolicies)
|
||||
.withCredentials(credentials)
|
||||
.withFollowHttpToHttpsRedirections(true),
|
||||
parallel = parallelDownloads
|
||||
parallel = parallelDownloads,
|
||||
classpathOrder = true,
|
||||
)
|
||||
|
||||
val resOrError = ArtifactsRun.artifacts(
|
||||
|
|
|
|||
Loading…
Reference in New Issue