[bug] closes #90, startShadowScripts should cause execute shadowJar

GradleUp · Aug 26, 2014 · 04df838 · 04df838
1 parent a0216e9
commit 04df838
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,8 @@
+v1.1.1
+======
+
++ Fix bug in `'createStartScripts'` task that was causing it to not execute `'shadowJar'` task ([Issue #90](https://github.com/johnrengelman/shadow/issues/90))
+
 v1.1.0
 ======
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ instead of a port of the Maven Shade code. Documentation for version 0.8 and pri
 buildscript {
   repositories { jcenter() }
   dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.1.0'
+    classpath 'com.github.jengelman.gradle.plugins:shadow:1.1.1'
   }
 }
 

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.groovy
@@ -71,10 +71,11 @@ class ShadowApplicationPlugin implements Plugin<Project> {
         def startScripts = project.tasks.create(SHADOW_SCRIPTS_TASK_NAME, ShadowCreateStartScripts)
         startScripts.description = 'Creates OS specific scripts to run the project as a JVM application using the shadow jar'
         startScripts.group = ApplicationPlugin.APPLICATION_GROUP
-        startScripts.conventionMapping.mainApplicationJar = { project.tasks[ShadowJavaPlugin.SHADOW_JAR_TASK_NAME].archivePath }
+        startScripts.conventionMapping.mainApplicationJar = { jar.archivePath }
         startScripts.conventionMapping.applicationName = { pluginConvention.applicationName }
         startScripts.conventionMapping.outputDir = { new File(project.buildDir, 'scriptsShadow') }
         startScripts.conventionMapping.defaultJvmOpts = { pluginConvention.applicationDefaultJvmArgs }
+        startScripts.inputs.file jar
     }
 
     protected void addInstallTask(Project project) {

diff --git a/...n/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCreateStartScripts.groovy b/...n/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCreateStartScripts.groovy
@@ -1,11 +1,9 @@
 package com.github.jengelman.gradle.plugins.shadow.tasks
 
 import com.github.jengelman.gradle.plugins.shadow.internal.StartScriptGenerator
-import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.1.0
+1.1.1
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+    v1.1.1
+    ======
+    + Fix bug in `'createStartScripts'` task that was causing it to not execute `'shadowJar'` task ([Issue #90](https://github.com/johnrengelman/shadow/issues/90))
     v1.1.0
     ======
@@ Expand Down @@