Cleanups of resolve (#1620)

Co-authored-by: Copilot <[email protected]>

Author: Goooler

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultDependencyFilter.kt

@@ -12,10 +12,10 @@ internal class DefaultDependencyFilter(
     includedDependencies: MutableSet<ResolvedDependency>,
     excludedDependencies: MutableSet<ResolvedDependency>,
   ) {
-    dependencies.forEach {
-      val added = if (it.isIncluded()) includedDependencies.add(it) else excludedDependencies.add(it)
+    dependencies.forEach { dep ->
+      val added = if (dep.isIncluded()) includedDependencies.add(dep) else excludedDependencies.add(dep)
       if (added) {
-        resolve(it.children, includedDependencies, excludedDependencies)
+        resolve(dep.children, includedDependencies, excludedDependencies)
       }
     }
   }

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeDependencyFilter.kt

@@ -12,22 +12,15 @@ internal class MinimizeDependencyFilter(
     includedDependencies: MutableSet<ResolvedDependency>,
     excludedDependencies: MutableSet<ResolvedDependency>,
   ) {
-    dependencies.forEach {
-      val added = if (it.isIncluded() && !isParentExcluded(excludedDependencies, it)) {
-        includedDependencies.add(it)
+    dependencies.forEach { dep ->
+      val added = if (dep.isIncluded() && !excludedDependencies.any { it in dep.parents }) {
+        includedDependencies.add(dep)
       } else {
-        excludedDependencies.add(it)
+        excludedDependencies.add(dep)
       }
       if (added) {
-        resolve(it.children, includedDependencies, excludedDependencies)
+        resolve(dep.children, includedDependencies, excludedDependencies)
       }
     }
   }
-
-  private fun isParentExcluded(
-    excludedDependencies: Set<ResolvedDependency>,
-    dependency: ResolvedDependency,
-  ): Boolean {
-    return excludedDependencies.any { it in dependency.parents }
-  }
 }

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt

@@ -56,11 +56,15 @@ public interface DependencyFilter : Serializable {
     )
 
     override fun resolve(configuration: Configuration): FileCollection {
-      val included = mutableSetOf<ResolvedDependency>()
-      val excluded = mutableSetOf<ResolvedDependency>()
-      resolve(configuration.resolvedConfiguration.firstLevelModuleDependencies, included, excluded)
+      val includes = mutableSetOf<ResolvedDependency>()
+      val excludes = mutableSetOf<ResolvedDependency>()
+      resolve(
+        dependencies = configuration.resolvedConfiguration.firstLevelModuleDependencies,
+        includedDependencies = includes,
+        excludedDependencies = excludes,
+      )
       return project.files(configuration.files) -
-        project.files(excluded.flatMap { it.moduleArtifacts.map(ResolvedArtifact::getFile) })
+        project.files(excludes.flatMap { it.moduleArtifacts.map(ResolvedArtifact::getFile) })
     }
 
     override fun resolve(configurations: Collection<Configuration>): FileCollection {