From 83cb152fd78423ab89593f677d74e65e81934d69 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 14 Feb 2011 18:56:29 -0500 Subject: [PATCH] rename 'inherits' to the more appropriate 'delegates' --- main/Build.scala | 6 +++--- main/Project.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/Build.scala b/main/Build.scala index fe67eb1768..5cb2fcfe27 100644 --- a/main/Build.scala +++ b/main/Build.scala @@ -239,7 +239,7 @@ object Load getConfiguration(lb.units, ref._1, ref._2, config).extendsConfigs.map(c => ConfigKey(c.name)) def projectInherit(lb: LoadedBuild, ref: (URI, String)): Seq[ProjectRef] = - getProject(lb.units, ref._1, ref._2).inherits + getProject(lb.units, ref._1, ref._2).delegates // build, load, and evaluate all units. // 1) Compile all plugin definitions @@ -423,7 +423,7 @@ object Load def resolveRefs(prs: Seq[ProjectRef]) = prs map resolveRef def resolveDeps(ds: Seq[Project.ClasspathDependency]) = ds map resolveDep def resolveDep(d: Project.ClasspathDependency) = d.copy(project = resolveRef(d.project)) - p => p.copy(aggregate = resolveRefs(p.aggregate), dependencies = resolveDeps(p.dependencies), inherits = resolveRefs(p.inherits)) + p => p.copy(aggregate = resolveRefs(p.aggregate), dependencies = resolveDeps(p.dependencies), delegates = resolveRefs(p.delegates)) } def projects(unit: BuildUnit): Seq[Project] = { @@ -564,7 +564,7 @@ object Load // these are unresolved references def referenced(definitions: Seq[Project]): Seq[ProjectRef] = definitions flatMap referenced - def referenced(definition: Project): Seq[ProjectRef] = definition.inherits ++ definition.aggregate ++ definition.dependencies.map(_.project) + def referenced(definition: Project): Seq[ProjectRef] = definition.delegates ++ definition.aggregate ++ definition.dependencies.map(_.project) final class BuildStructure(val units: Map[URI, LoadedBuildUnit], val root: URI, val settings: Seq[Setting[_]], val data: Settings[Scope], val index: StructureIndex, val streams: Streams, val delegates: Scope => Seq[Scope], val scopeLocal: ScopeLocal) diff --git a/main/Project.scala b/main/Project.scala index 84f0035c60..0fd0a78e4e 100644 --- a/main/Project.scala +++ b/main/Project.scala @@ -11,11 +11,11 @@ package sbt import CommandSupport.logger import compile.Eval -final case class Project(id: String, base: File, aggregate: Seq[ProjectRef] = Nil, dependencies: Seq[Project.ClasspathDependency] = Nil, inherits: Seq[ProjectRef] = Nil, +final case class Project(id: String, base: File, aggregate: Seq[ProjectRef] = Nil, dependencies: Seq[Project.ClasspathDependency] = Nil, delegates: Seq[ProjectRef] = Nil, settings: Seq[Project.Setting[_]] = Project.defaultSettings, configurations: Seq[Configuration] = Configurations.default) { def dependsOn(deps: Project.ClasspathDependency*): Project = copy(dependencies = dependencies ++ deps) - def inherits(from: ProjectRef*): Project = copy(inherits = inherits ++ from) + def delegates(from: ProjectRef*): Project = copy(delegates = delegates ++ from) def aggregate(refs: ProjectRef*): Project = copy(aggregate = aggregate ++ refs) def configs(cs: Configuration*): Project = copy(configurations = configurations ++ cs) def settings(ss: Project.Setting[_]*): Project = copy(settings = settings ++ ss)