Skip to content
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

Tidy up ShadowApplicationPlugin #1198

Merged
merged 11 commits into from
Jan 29, 2025
Merged

Tidy up ShadowApplicationPlugin #1198

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
97481ae
Reuse installShadowDist
Goooler Jan 26, 2025
8247fca
Remove src/dist from
Goooler Jan 26, 2025
cd17873
Revert "Remove src/dist from"
Goooler Jan 26, 2025
ca094d0
Cleanups
Goooler Jan 26, 2025
8f0eaa0
Test canIncludeSrcDistByDefault
Goooler Jan 29, 2025
e39e3be
Reuse shadowDistZipTask
Goooler Jan 29, 2025
b62892c
Check `run` result in canOverrideMainClassAttrInManifestBlock
Goooler Jan 29, 2025
c4cf30d
Remove explicit inputs for startShadowScripts
Goooler Jan 29, 2025
9fa1499
Test startShadowScriptsExecutedCorrectlyAfterShadowJarChanged
Goooler Jan 29, 2025
a3ff145
Revert "Test startShadowScriptsExecutedCorrectlyAfterShadowJarChanged"
Goooler Jan 29, 2025
ae8a13a
Revert "Remove explicit inputs for startShadowScripts"
Goooler Jan 29, 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
1 change: 0 additions & 1 deletion 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 @@ -77,7 +77,6 @@ public abstract class ShadowApplicationPlugin : Plugin<Project> {
project.resources.text.fromString(windowsStartScript)

task.classpath = project.files(shadowJar)
task.inputs.files(project.files(shadowJar))
Copy link
Member Author

@Goooler Goooler Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Address this to #1216.

task.mainClass.set(javaApplication.mainClass)
task.conventionMapping.map("applicationName", javaApplication::getApplicationName)
task.conventionMapping.map("outputDir") { project.layout.buildDirectory.dir("scriptsShadow").get().asFile }
Expand Down