Merge branch 'hotfix/0.7.3'

README.md

@@ -21,7 +21,7 @@ How to use
                 }
             }
             dependencies {
-                classpath 'org.gradle.plugins:shadow:0.7.2'
+                classpath 'org.gradle.plugins:shadow:0.7.3'
             }
         }
 

gradle.properties

@@ -1,3 +1,3 @@
-currentVersion=0.7.2
+currentVersion=0.7.3
 bintray_repo=gradle-plugins
 bintray_package=org.gradle.plugins:shadow

it/appending-transformer/build.gradle

@@ -0,0 +1,13 @@
+import org.gradle.api.plugins.shadow.transformers.AppendingTransformer
+
+dependencies {
+    compile 'org.apache.maven.its.shade.at:one:0.1'
+    compile 'org.apache.maven.its.shade.at:two:0.1'
+}
+
+shadow {
+    artifactAttached = false
+    transformer(AppendingTransformer) {
+        resource = 'META-INF/services/org.apache.maven.Shade'
+    }
+}

it/appending-transformer/repo/org/apache/maven/its/shade/at/one/0.1/one-0.1.pom

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.shade.at</groupId>
+  <artifactId>one</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+</project>

it/appending-transformer/repo/org/apache/maven/its/shade/at/one/maven-metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.shade.at</groupId>
+  <artifactId>one</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20100321160306</lastUpdated>
+  </versioning>
+</metadata>

it/appending-transformer/repo/org/apache/maven/its/shade/at/two/0.1/two-0.1.pom

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.shade.at</groupId>
+  <artifactId>two</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+</project>

it/appending-transformer/repo/org/apache/maven/its/shade/at/two/maven-metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.shade.at</groupId>
+  <artifactId>two</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20100321160331</lastUpdated>
+  </versioning>
+</metadata>

it/appending-transformer/verify.groovy

@@ -0,0 +1,23 @@
+{ project ->
+
+    def jar = file("${buildDir}/libs/${project.name}-${currentVersion}.jar")
+
+    assert jar.exists()
+
+    def jarFile = zipTree(jar)
+
+    def shadeService = jarFile.matching {
+        include { fileTreeElement ->
+            fileTreeElement.relativePath.toString() == 'META-INF/services/org.apache.maven.Shade'
+        }
+    }.files as List
+
+    assert shadeService.size() == 1
+
+    def serviceText = shadeService[0].text
+    def providers = serviceText.split('(\r\n)|(\r)|(\n)')
+    assert providers.size() == 2
+    assert providers[0] == 'one # NOTE: No newline terminates this line/file'
+    assert providers[1] == 'two # NOTE: No newline terminates this line/file'
+
+}

it/filter-artifact-contents-shortcut/build.gradle

@@ -12,7 +12,7 @@ shadow {
         exclude 'org/apache/*'
         exclude 'org/apache/maven/b/'
     }
-    include 'META-INF/MANIFEST.MF'
+//    include 'META-INF/MANIFEST.MF'
     exclude 'org/*'
     exclude 'META-INF/**/'
 }

it/settings.gradle

@@ -1,14 +1,14 @@
-include 'archivesBaseName'
-include 'archivesBaseName-attached'
-include 'artifact-includes-excludes'
-include 'artifact-includes-excludes-shortcut'
-include 'baseName'
-include 'baseName-attached'
-include 'filter-artifact-contents'
-include 'implicit-inclusion-of-project-artifact'
-include 'manifest-retained'
-include 'manifest-transformed'
-include 'non-runtime-scope-excluded'
-include 'pom-packaging'
-include 'services-resource-transformer'
-include 'xml-transformer-ignores-dtd'
+import groovy.io.FileType
+
+def path = [] as LinkedList
+rootDir.traverse(
+        type: FileType.FILES,
+        nameFilter: ~/.+\.gradle/,
+        maxDepth: 3,
+        preDir: { path << it.name },
+        postDir: { path.removeLast() }
+) {
+    if (path) {
+        include path.join(':')
+    }
+}

shadow/src/main/groovy/org/gradle/api/plugins/shadow/ShadowTaskExtension.groovy

@@ -65,11 +65,13 @@ class ShadowTaskExtension {
 
     ShadowTaskExtension filter(String artifact, Closure c) {
         if (!artifact) throw new GradleException('Must specify artifact for filter!')
-        ArchiveFilter filter = new ArchiveFilter(artifact: artifact)
+        ArchiveFilter filter = filters.find { it.artifact == artifact } ?: new ArchiveFilter(artifact: artifact)
         c.delegate = filter
         c.resolveStrategy = Closure.DELEGATE_ONLY
         c()
-        filters << filter
+        if (!filters.contains(filter)) {
+            filters << filter
+        }
         this
     }
 

shadow/src/main/groovy/org/gradle/api/plugins/shadow/filter/Filter.groovy

@@ -32,5 +32,7 @@ interface Filter {
 
     boolean isFiltered(String classFile)
 
+    boolean isSpecificallyIncluded(String classFile)
+
     void finished()
 }

shadow/src/main/groovy/org/gradle/api/plugins/shadow/impl/DefaultCaster.groovy

@@ -246,13 +246,10 @@ class DefaultCaster implements Caster {
     }
 
     private boolean isFiltered(List<Filter> filters, String name) {
-        for (Filter filter : filters) {
-            if (filter.isFiltered(name)) {
-                return true
-            }
-        }
-
-        return false
+//        if (filters.any { it.isSpecificallyIncluded(name)}) {
+//            return false
+//        }
+        return filters.any { it.isFiltered(name) }
     }
 
     private boolean resourceTransformed(List<Transformer> resourceTransformers, String name, InputStream is,

shadow/src/main/groovy/org/gradle/api/plugins/shadow/transformers/AppendingTransformer.groovy

@@ -48,7 +48,7 @@ class AppendingTransformer implements Transformer {
 
     void transform(String path, InputStream is, List<Relocator> relocators) {
         IOUtil.copy(is, data)
-        data.write('\n')
+        data.write('\n'.bytes)
 
         is.close()
     }