Skip to content

Fix the regression of the mainClassName input #1603

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 5 commits into from
Aug 7, 2025
Merged

Fix the regression of the mainClassName input #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06f152f
Enable `shadowJarIsCachedCorrectlyAfterApplicationChanged`
Goooler Aug 7, 2025
afba45d
Add `mainClassName` input back
Goooler Aug 7, 2025
e82de5a
Wrap `applicationExtension.mainClass` as a provider
Goooler Aug 7, 2025
fdae31a
Revert "Wrap `applicationExtension.mainClass` as a provider"
Goooler Aug 7, 2025
b56def4
Use `convention`
Goooler Aug 7, 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
2 changes: 0 additions & 2 deletions ...nalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/ShadowJarCachingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import kotlin.io.path.appendText
import kotlin.io.path.readText
import kotlin.io.path.writeText
import org.gradle.api.file.DuplicatesStrategy
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test

class ShadowJarCachingTest : BaseCachingTest() {
Expand Down Expand Up @@ -211,7 +210,6 @@ class ShadowJarCachingTest : BaseCachingTest() {
}
}

@Disabled("TODO: https://github.com/GradleUp/shadow/pull/1601#discussion_r2260096815")
@Test
fun shadowJarIsCachedCorrectlyAfterApplicationChanged() {
val mainClassName = "my.Main"
Expand Down
12 changes: 7 additions & 5 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,18 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
}

protected open fun Project.configureShadowJarMainClass() {
val mainClassName = applicationExtension.mainClass
// Default to empty string to avoid the error of the value not being configured yet.
val mainClassName = applicationExtension.mainClass.convention("")
tasks.shadowJar.configure { task ->
task.inputs.property("mainClassName", mainClassName)
task.doFirst {
// Inject the attribute if it is not already present.
if (!task.manifest.attributes.contains(mainClassAttributeKey)) {
task.manifest.attributes[mainClassAttributeKey] = mainClassName.orNull.also { value ->
if (value.isNullOrEmpty()) {
error("The main class must be specified and not left empty in `application.mainClass` or manifest attributes.")
}
val realClass = mainClassName.orNull
if (realClass.isNullOrEmpty()) {
error("The main class must be specified and not left empty in `application.mainClass` or manifest attributes.")
}
task.manifest.attributes[mainClassAttributeKey] = realClass
}
}
}
Expand Down
Loading