close issue #6 - shadow task up-to-date after source change

johnrengelman · johnrengelman · commit 9fb123469a5d · 2013-03-23T13:35:28.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@ task integTest(type: GradleBuild) {
     buildFile = file('it/build.gradle')
     dir = file('it')
     tasks = ['clean', 'integTest']
+    startParameter.projectProperties.currentVersion = currentVersion
 }
 integTest.dependsOn ':shadow:install'
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-currentVersion=0.7
+currentVersion=0.7.1
 bintray_repo=gradle-plugins
 bintray_package=org.gradle.plugins:shadow
diff --git a/it/gradle.properties b/it/gradle.properties
diff --git a/shadow/src/main/groovy/org/gradle/api/plugins/shadow/tasks/ShadowTask.groovy b/shadow/src/main/groovy/org/gradle/api/plugins/shadow/tasks/ShadowTask.groovy
@@ -76,12 +76,12 @@ class ShadowTask extends DefaultTask {
         project.shadow.shadowJar
     }
 
+    @InputFiles
     List<File> getJars() {
         ArtifactSelector selector = initSelector()
         getArtifacts(selector) + getDependencies(selector)
     }
 
-    @InputFiles
     List<File> getArtifacts(ArtifactSelector selector) {
         List<File> artifacts = project.configurations.runtime.artifacts.files as List
         artifacts = renameOriginalArtifacts(artifacts)
@@ -131,7 +131,6 @@ class ShadowTask extends DefaultTask {
         project.configurations."$configuration".resolvedConfiguration.resolvedArtifacts as List
     }
 
-    @InputFiles
     List<File> getDependencies(ArtifactSelector selector) {
 
         List<ResolvedArtifact> resolvedConfiguration = resolvedArtifactsToShadow

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ task integTest(type: GradleBuild) {`
`2`	`2`	`buildFile = file('it/build.gradle')`
`3`	`3`	`dir = file('it')`
`4`	`4`	`tasks = ['clean', 'integTest']`
	`5`	`+ startParameter.projectProperties.currentVersion = currentVersion`
`5`	`6`	`}`
`6`	`7`	`integTest.dependsOn ':shadow:install'`
`7`	`8`
Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ class ShadowTask extends DefaultTask {`
`76`	`76`	`project.shadow.shadowJar`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ @InputFiles`
`79`	`80`	`List<File> getJars() {`
`80`	`81`	`ArtifactSelector selector = initSelector()`
`81`	`82`	`getArtifacts(selector) + getDependencies(selector)`
`82`	`83`	`}`
`83`	`84`
`84`		`- @InputFiles`
`85`	`85`	`List<File> getArtifacts(ArtifactSelector selector) {`
`86`	`86`	`List<File> artifacts = project.configurations.runtime.artifacts.files as List`
`87`	`87`	`artifacts = renameOriginalArtifacts(artifacts)`
`@@ -131,7 +131,6 @@ class ShadowTask extends DefaultTask {`
`131`	`131`	`project.configurations."$configuration".resolvedConfiguration.resolvedArtifacts as List`
`132`	`132`	`}`
`133`	`133`
`134`		`- @InputFiles`
`135`	`134`	`List<File> getDependencies(ArtifactSelector selector) {`
`136`	`135`
`137`	`136`	`List<ResolvedArtifact> resolvedConfiguration = resolvedArtifactsToShadow`