Merge branch 'hotfix/0.7.1'

GradleUp · Mar 23, 2013 · 2025641 · 2025641
2 parents 3b72997 + 9fb1234
commit 2025641
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
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