Skip to content

Cleanups of resolve #1620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 3 commits into from
Aug 9, 2025
Merged

Cleanups of resolve #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79671eb
Cleanups of resolve
Goooler Aug 9, 2025
826c066
Update src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/int…
Goooler Aug 9, 2025
ed4782e
Renames
Goooler Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ain/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultDependencyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down
17 changes: 5 additions & 12 deletions ...in/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/MinimizeDependencyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
}
12 changes: 8 additions & 4 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down