Skip to content

Commit ff07ac1

Browse files
committed
Stop using start script templates bundled in Shadow (#1750)
* Remove `unixStartScriptGenerator` and `windowsStartScriptGenerator` overrides * Update changelog * Fix tests
1 parent 70f0be9 commit ff07ac1

File tree

5 files changed

+4
-272
lines changed

5 files changed

+4
-272
lines changed

src/docs/changes/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
## [Unreleased]
55

6+
**Changed**
7+
8+
- Stop using start script templates bundled in Shadow. ([#1750](https://github.com/GradleUp/shadow/pull/1750))
9+
610
**Fixed**
711

812
- Fix resolving BOM dependencies when `minimize` is enabled. ([#1638](https://github.com/GradleUp/shadow/pull/1638))

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ class ShadowApplicationPlugin implements Plugin<Project> {
7979

8080
protected void addCreateScriptsTask(Project project) {
8181
project.tasks.register(SHADOW_SCRIPTS_TASK_NAME, CreateStartScripts) { startScripts ->
82-
startScripts.unixStartScriptGenerator.template = project.resources.text.fromString(this.class.getResource("internal/unixStartScript.txt").text)
83-
startScripts.windowsStartScriptGenerator.template = project.resources.text.fromString(this.class.getResource("internal/windowsStartScript.txt").text)
8482
startScripts.description = 'Creates OS specific scripts to run the project as a JVM application using the shadow jar'
8583
startScripts.group = ApplicationPlugin.APPLICATION_GROUP
8684
startScripts.classpath = project.files(jar)

src/main/resources/com/github/jengelman/gradle/plugins/shadow/internal/unixStartScript.txt

Lines changed: 0 additions & 183 deletions
This file was deleted.

src/main/resources/com/github/jengelman/gradle/plugins/shadow/internal/windowsStartScript.txt

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ApplicationSpec.groovy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class ApplicationSpec extends PluginSpecification {
6666
File startScript = getFile('build/install/myapp-shadow/bin/myapp')
6767
assert startScript.exists()
6868
assert startScript.text.contains("CLASSPATH=\$APP_HOME/lib/myapp-1.0-all.jar")
69-
assert startScript.text.contains("-jar \"\\\"\$CLASSPATH\\\"\" \"\$APP_ARGS\"")
7069
assert startScript.text.contains("exec \"\$JAVACMD\" \"\$@\"")
7170

7271
cleanup:
@@ -146,7 +145,6 @@ class ApplicationSpec extends PluginSpecification {
146145
File startScript = getFile('build/install/myapp-shadow/bin/myapp')
147146
assert startScript.exists()
148147
assert startScript.text.contains("CLASSPATH=\$APP_HOME/lib/myapp-1.0-all.jar")
149-
assert startScript.text.contains("-jar \"\\\"\$CLASSPATH\\\"\" \"\$APP_ARGS\"")
150148
assert startScript.text.contains("exec \"\$JAVACMD\" \"\$@\"")
151149

152150
cleanup:

0 commit comments

Comments
 (0)