@@ -161,65 +161,65 @@ abstract class DependencyExtractor :
161
161
}
162
162
163
163
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)
166
166
167
167
for (dependencyComponent in getResolvedDependencies(rootComponent)) {
168
168
val directDep = createComponentNode(
169
169
componentId(dependencyComponent),
170
- rootSource ,
170
+ rootOrigin ,
171
171
true ,
172
172
dependencyComponent,
173
173
repositoryLookup
174
174
)
175
175
resolvedConfiguration.addDependency(directDep)
176
176
177
- walkComponentDependencies(dependencyComponent, directDep.source , repositoryLookup, resolvedConfiguration)
177
+ walkComponentDependencies(dependencyComponent, directDep.origin , repositoryLookup, resolvedConfiguration)
178
178
}
179
179
180
180
resolvedConfigurations.add(resolvedConfiguration)
181
181
}
182
182
183
183
private fun walkComponentDependencies (
184
184
component : ResolvedComponentResult ,
185
- parentSource : DependencySource ,
185
+ parentOrigin : DependencyOrigin ,
186
186
repositoryLookup : RepositoryUrlLookup ,
187
187
resolvedConfiguration : ResolvedConfiguration
188
188
) {
189
- val componentSource = getSource (component, parentSource )
190
- val direct = componentSource != parentSource
189
+ val componentOrigin = getOrigin (component, parentOrigin )
190
+ val direct = componentOrigin != parentOrigin
191
191
192
192
for (dependencyComponent in getResolvedDependencies(component)) {
193
193
val dependencyId = componentId(dependencyComponent)
194
194
if (! resolvedConfiguration.hasDependency(dependencyId)) {
195
195
val dependencyNode =
196
- createComponentNode(dependencyId, componentSource , direct, dependencyComponent, repositoryLookup)
196
+ createComponentNode(dependencyId, componentOrigin , direct, dependencyComponent, repositoryLookup)
197
197
resolvedConfiguration.addDependency(dependencyNode)
198
198
199
- walkComponentDependencies(dependencyComponent, componentSource , repositoryLookup, resolvedConfiguration)
199
+ walkComponentDependencies(dependencyComponent, componentOrigin , repositoryLookup, resolvedConfiguration)
200
200
}
201
201
}
202
202
}
203
203
204
- private fun getSource (component : ResolvedComponentResult , source : DependencySource ): DependencySource {
204
+ private fun getOrigin (component : ResolvedComponentResult , parentOrigin : DependencyOrigin ): DependencyOrigin {
205
205
val componentId = component.id
206
206
if (componentId is DefaultProjectComponentIdentifier ) {
207
- return DependencySource (componentId(component), componentId.identityPath.path)
207
+ return DependencyOrigin (componentId(component), componentId.identityPath.path)
208
208
}
209
- return source
209
+ return parentOrigin
210
210
}
211
211
212
212
private fun getResolvedDependencies (component : ResolvedComponentResult ): List <ResolvedComponentResult > {
213
213
return component.dependencies.filterIsInstance<ResolvedDependencyResult >().map { it.selected }.filter { it != component }
214
214
}
215
215
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 {
217
217
val componentDependencies = component.dependencies.filterIsInstance<ResolvedDependencyResult >().map { componentId(it.selected) }
218
218
val repositoryUrl = repositoryLookup.doLookup(component)
219
219
val isProjectDependency = component.id is ProjectComponentIdentifier
220
220
return ResolvedDependency (
221
221
componentId,
222
- source ,
222
+ origin ,
223
223
isDirectDependency,
224
224
isProjectDependency,
225
225
coordinates(component),
0 commit comments