mirror of https://github.com/sbt/sbt.git
Kill project delegation
This commit is contained in:
parent
1f02e61819
commit
a0eeec37e2
|
|
@ -49,15 +49,12 @@ sealed trait ProjectDefinition[PR <: ProjectReference] {
|
|||
*/
|
||||
def aggregate: Seq[PR]
|
||||
|
||||
@deprecated("Delegation between projects should be replaced by directly sharing settings.", "0.13.0")
|
||||
def delegates: Seq[PR]
|
||||
|
||||
/** The references to projects that are classpath dependencies of this project. */
|
||||
def dependencies: Seq[ClasspathDep[PR]]
|
||||
|
||||
/** The references to projects that are aggregate and classpath dependencies of this project. */
|
||||
def uses: Seq[PR] = aggregate ++ dependencies.map(_.project)
|
||||
def referenced: Seq[PR] = delegates ++ uses
|
||||
def referenced: Seq[PR] = uses
|
||||
|
||||
/**
|
||||
* The defined [[Plugins]] associated with this project.
|
||||
|
|
@ -169,9 +166,6 @@ sealed trait Project extends ProjectDefinition[ProjectReference] {
|
|||
Eval.later { deps } map { ds1 => ds0 ++ ds1 }
|
||||
})
|
||||
|
||||
// @deprecated("Delegation between projects should be replaced by directly sharing settings.", "0.13.0")
|
||||
// def delegateTo(from: ProjectReference*): Project = copy(delegates = delegates ++ from)
|
||||
|
||||
/**
|
||||
* Adds projects to be aggregated. When a user requests a task to run on this project from the command line,
|
||||
* the task will also be run in aggregated projects.
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ object BuildUtil {
|
|||
// check for cycles
|
||||
for ((_, lbu) <- units; proj <- lbu.defined.values) {
|
||||
deps(proj)(_.dependencies.map(_.project))
|
||||
deps(proj)(_.delegates)
|
||||
deps(proj)(_.aggregate)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -149,8 +149,10 @@ private[sbt] object Load {
|
|||
def configInheritRef(lb: LoadedBuild, ref: ProjectRef, config: ConfigKey): Seq[ConfigKey] =
|
||||
configurationOpt(lb.units, ref.build, ref.project, config).toList.flatMap(_.extendsConfigs).map(c => ConfigKey(c.name))
|
||||
|
||||
def projectInherit(lb: LoadedBuild, ref: ProjectRef): Seq[ProjectRef] =
|
||||
getProject(lb.units, ref.build, ref.project).delegates
|
||||
def projectInherit(lb: LoadedBuild, ref: ProjectRef): Seq[ProjectRef] = {
|
||||
val _ = getProject(lb.units, ref.build, ref.project)
|
||||
Nil
|
||||
}
|
||||
|
||||
// build, load, and evaluate all units.
|
||||
// 1) Compile all plugin definitions
|
||||
|
|
|
|||
Loading…
Reference in New Issue