@@ -161,65 +161,65 @@ abstract class DependencyExtractor :
161161 }
162162
163163 val rootId = if (projectIdentityPath == null ) " build $rootPath " else componentId(rootComponent)
164- val rootSource = DependencySource (rootId, rootPath)
165- val resolvedConfiguration = ResolvedConfiguration (rootSource , details.configurationName)
164+ val rootOrigin = DependencyOrigin (rootId, rootPath)
165+ val resolvedConfiguration = ResolvedConfiguration (rootOrigin , details.configurationName)
166166
167167 for (dependencyComponent in getResolvedDependencies(rootComponent)) {
168168 val directDep = createComponentNode(
169169 componentId(dependencyComponent),
170- rootSource ,
170+ rootOrigin ,
171171 true ,
172172 dependencyComponent,
173173 repositoryLookup
174174 )
175175 resolvedConfiguration.addDependency(directDep)
176176
177- walkComponentDependencies(dependencyComponent, directDep.source , repositoryLookup, resolvedConfiguration)
177+ walkComponentDependencies(dependencyComponent, directDep.origin , repositoryLookup, resolvedConfiguration)
178178 }
179179
180180 resolvedConfigurations.add(resolvedConfiguration)
181181 }
182182
183183 private fun walkComponentDependencies (
184184 component : ResolvedComponentResult ,
185- parentSource : DependencySource ,
185+ parentOrigin : DependencyOrigin ,
186186 repositoryLookup : RepositoryUrlLookup ,
187187 resolvedConfiguration : ResolvedConfiguration
188188 ) {
189- val componentSource = getSource (component, parentSource )
190- val direct = componentSource != parentSource
189+ val componentOrigin = getOrigin (component, parentOrigin )
190+ val direct = componentOrigin != parentOrigin
191191
192192 for (dependencyComponent in getResolvedDependencies(component)) {
193193 val dependencyId = componentId(dependencyComponent)
194194 if (! resolvedConfiguration.hasDependency(dependencyId)) {
195195 val dependencyNode =
196- createComponentNode(dependencyId, componentSource , direct, dependencyComponent, repositoryLookup)
196+ createComponentNode(dependencyId, componentOrigin , direct, dependencyComponent, repositoryLookup)
197197 resolvedConfiguration.addDependency(dependencyNode)
198198
199- walkComponentDependencies(dependencyComponent, componentSource , repositoryLookup, resolvedConfiguration)
199+ walkComponentDependencies(dependencyComponent, componentOrigin , repositoryLookup, resolvedConfiguration)
200200 }
201201 }
202202 }
203203
204- private fun getSource (component : ResolvedComponentResult , source : DependencySource ): DependencySource {
204+ private fun getOrigin (component : ResolvedComponentResult , parentOrigin : DependencyOrigin ): DependencyOrigin {
205205 val componentId = component.id
206206 if (componentId is DefaultProjectComponentIdentifier ) {
207- return DependencySource (componentId(component), componentId.identityPath.path)
207+ return DependencyOrigin (componentId(component), componentId.identityPath.path)
208208 }
209- return source
209+ return parentOrigin
210210 }
211211
212212 private fun getResolvedDependencies (component : ResolvedComponentResult ): List <ResolvedComponentResult > {
213213 return component.dependencies.filterIsInstance<ResolvedDependencyResult >().map { it.selected }.filter { it != component }
214214 }
215215
216- private fun createComponentNode (componentId : String , source : DependencySource , isDirectDependency : Boolean , component : ResolvedComponentResult , repositoryLookup : RepositoryUrlLookup ): ResolvedDependency {
216+ private fun createComponentNode (componentId : String , origin : DependencyOrigin , isDirectDependency : Boolean , component : ResolvedComponentResult , repositoryLookup : RepositoryUrlLookup ): ResolvedDependency {
217217 val componentDependencies = component.dependencies.filterIsInstance<ResolvedDependencyResult >().map { componentId(it.selected) }
218218 val repositoryUrl = repositoryLookup.doLookup(component)
219219 val isProjectDependency = component.id is ProjectComponentIdentifier
220220 return ResolvedDependency (
221221 componentId,
222- source ,
222+ origin ,
223223 isDirectDependency,
224224 isProjectDependency,
225225 coordinates(component),
0 commit comments