diff --git a/ChangeLog.md b/ChangeLog.md index 192252fcc..7503456e6 100644 --- 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 index b489ab888..675fc7b91 100644 --- 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 index e264cbbbf..5c917168d 100644 --- 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 { 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/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCreateStartScripts.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCreateStartScripts.groovy index 6e2a48392..1fca0561c 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCreateStartScripts.groovy +++ b/src/main/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 index 1cc5f657e..8cfbc905b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.1.0 \ No newline at end of file +1.1.1 \ No newline at end of file