mirror of https://github.com/sbt/sbt.git
Get parent metadata prior to requiring import dependencies
This commit is contained in:
parent
bb4fcfceb6
commit
83e04a8e45
|
|
@ -785,31 +785,42 @@ final case class Resolution(
|
||||||
project: Project
|
project: Project
|
||||||
): Set[ModuleVersion] = {
|
): Set[ModuleVersion] = {
|
||||||
|
|
||||||
val approxProperties0 =
|
val needsParent =
|
||||||
project.parent
|
project.parent.exists { par =>
|
||||||
.flatMap(projectCache.get)
|
val parentFound = projectCache.contains(par) || errorCache.contains(par)
|
||||||
.map(_._2.properties)
|
!parentFound
|
||||||
.fold(project.properties)(project.properties ++ _)
|
}
|
||||||
|
|
||||||
val approxProperties = propertiesMap(approxProperties0) ++ projectProperties(project)
|
if (needsParent)
|
||||||
|
project.parent.toSet
|
||||||
|
else {
|
||||||
|
|
||||||
val profileDependencies =
|
val approxProperties0 =
|
||||||
profiles(
|
project.parent
|
||||||
project,
|
.flatMap(projectCache.get)
|
||||||
approxProperties,
|
.map(_._2.properties)
|
||||||
osInfo,
|
.fold(project.properties)(project.properties ++ _)
|
||||||
jdkVersion,
|
|
||||||
userActivations
|
|
||||||
).flatMap(p => p.dependencies ++ p.dependencyManagement)
|
|
||||||
|
|
||||||
val modules = withProperties(
|
val approxProperties = propertiesMap(approxProperties0) ++ projectProperties(project)
|
||||||
project.dependencies ++ project.dependencyManagement ++ profileDependencies,
|
|
||||||
approxProperties
|
val profileDependencies =
|
||||||
).collect {
|
profiles(
|
||||||
case ("import", dep) => dep.moduleVersion
|
project,
|
||||||
|
approxProperties,
|
||||||
|
osInfo,
|
||||||
|
jdkVersion,
|
||||||
|
userActivations
|
||||||
|
).flatMap(p => p.dependencies ++ p.dependencyManagement)
|
||||||
|
|
||||||
|
val modules = withProperties(
|
||||||
|
project.dependencies ++ project.dependencyManagement ++ profileDependencies,
|
||||||
|
approxProperties
|
||||||
|
).collect {
|
||||||
|
case ("import", dep) => dep.moduleVersion
|
||||||
|
}
|
||||||
|
|
||||||
|
modules.toSet
|
||||||
}
|
}
|
||||||
|
|
||||||
modules.toSet ++ project.parent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
org.kie:kie-api:6.5.0.Final:compile
|
||||||
|
org.slf4j:slf4j-api:1.7.2:compile
|
||||||
|
|
@ -607,6 +607,14 @@ object CentralTests extends TestSuite {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
'parentBeforeImports - {
|
||||||
|
* - resolutionCheck(
|
||||||
|
Module("org.kie", "kie-api"),
|
||||||
|
"6.5.0.Final",
|
||||||
|
extraRepo = Some(MavenRepository("https://repository.jboss.org/nexus/content/repositories/public"))
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue