Skip to content

Simplify apiJars/toMinimize/sourceSetsClassesDirs initializations #2276

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

Closed
Goooler wants to merge 1 commit into from
+18 −21
Closed

Simplify apiJars/toMinimize/sourceSetsClassesDirs initializations #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/GradleCompat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ internal inline val Project.runtimeConfiguration: Configuration
internal inline val Project.sourceSets: SourceSetContainer
get() = extensions.getByType(SourceSetContainer::class.java)

internal inline val Project.sourceSetsOrNull: SourceSetContainer?
get() = extensions.findByType(SourceSetContainer::class.java)

internal inline val Project.distributions: DistributionContainer
get() = extensions.getByType(DistributionContainer::class.java)

Expand Down
36 changes: 15 additions & 21 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.minimizeWithR8
import com.github.jengelman.gradle.plugins.shadow.internal.multiReleaseAttributeKey
import com.github.jengelman.gradle.plugins.shadow.internal.property
import com.github.jengelman.gradle.plugins.shadow.internal.setProperty
import com.github.jengelman.gradle.plugins.shadow.internal.sourceSets
import com.github.jengelman.gradle.plugins.shadow.internal.sourceSetsOrNull
import com.github.jengelman.gradle.plugins.shadow.internal.useZip
import com.github.jengelman.gradle.plugins.shadow.relocation.CacheableRelocator
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
Expand Down Expand Up @@ -113,32 +113,34 @@ public abstract class ShadowJar : Jar() {
)
public open val minimizeJar: Property<Boolean> = objectFactory.property(false)

/**
* The configurations to include dependencies from.
*
* Defaults to a set that contains `runtimeClasspath` or `runtime` configuration.
*/
@get:Classpath
public open val configurations: SetProperty<Configuration> = objectFactory.setProperty()

/** Options for [minimize]. */
@get:Nested public open val minimizeSpec: MinimizeSpec = _minimizeSpec

@get:Classpath
public open val toMinimize: ConfigurableFileCollection = objectFactory.fileCollection {
_minimizeJar.map {
if (it) (_minimizeSpec.resolve(configurations.get()) - apiJars) else emptySet()
}
configurations.map { _minimizeSpec.resolve(it) - apiJars }
}
Comment on lines 127 to 130

@Goooler Goooler Sep 3, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right! #2277.


@get:Classpath
public open val apiJars: ConfigurableFileCollection = objectFactory.fileCollection {
_minimizeJar.map { if (it) project.getApiJars() else emptySet<File>() }
project.getApiJars()
}

@get:InputFiles
@get:PathSensitive(PathSensitivity.RELATIVE)
public open val sourceSetsClassesDirs: ConfigurableFileCollection = objectFactory.fileCollection {
_minimizeJar.map {
if (it) {
project.sourceSets.map { sourceSet ->
sourceSet.output.classesDirs.filter(File::isDirectory)
}
} else {
emptySet()
}
project.provider {
project.sourceSetsOrNull?.map {
it.output.classesDirs.filter(File::isDirectory)
} ?: emptySet<File>()
}
}

Expand Down Expand Up @@ -170,14 +172,6 @@ public abstract class ShadowJar : Jar() {
/** [Relocator]s to be applied in the shadow steps. */
@get:Nested public open val relocators: SetProperty<Relocator> = objectFactory.setProperty()

/**
* The configurations to include dependencies from.
*
* Defaults to a set that contains `runtimeClasspath` or `runtime` configuration.
*/
@get:Classpath
public open val configurations: SetProperty<Configuration> = objectFactory.setProperty()

@get:Internal // The resolved result is tracked by includedDependencies.
public open val dependencyFilter: Property<DependencyFilter> =
objectFactory.property(DefaultDependencyFilter(project))
Expand Down