refactor(gradle-inspector): Make use of OrtDependency extensions

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Sep 4, 2024 · 0e3900d · 0e3900d
1 parent fbc786d
commit 0e3900d
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt b/plugins/package-managers/gradle-inspector/src/main/kotlin/GradleInspector.kt
@@ -350,14 +350,11 @@ private fun Collection<OrtDependency>.toPackageRefs(
     packageDependencies: MutableCollection<OrtDependency>
 ): Set<PackageReference> =
     mapTo(mutableSetOf()) { dep ->
-        val (id, linkage) = if (dep.localPath != null) {
-            val id = Identifier("Gradle", dep.groupId, dep.artifactId, dep.version)
-            id to PackageLinkage.PROJECT_DYNAMIC
+        val id = Identifier(dep.dependencyType, dep.groupId, dep.artifactId, dep.version)
+        val linkage = if (dep.isProjectDependency) {
+            PackageLinkage.PROJECT_DYNAMIC
         } else {
-            packageDependencies += dep
-
-            val id = Identifier("Maven", dep.groupId, dep.artifactId, dep.version)
-            id to PackageLinkage.DYNAMIC
+            PackageLinkage.DYNAMIC
         }
 
         PackageReference(id, linkage, dep.dependencies.toPackageRefs(packageDependencies))