Skip to content

Commit 5307503

Browse files
committed
Expose patternSet of ApacheLicenseResourceTransformer as public
1 parent 3ce3b73 commit 5307503

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

api/shadow.api

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,14 +250,10 @@ public final class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar$Co
250250
public final synthetic fun getShadowJar (Lorg/gradle/api/tasks/TaskContainer;)Lorg/gradle/api/tasks/TaskProvider;
251251
}
252252

253-
public class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/ResourceTransformer {
253+
public class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/PatternFilterableResourceTransformer {
254254
public fun <init> ()V
255-
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
256-
public fun getName ()Ljava/lang/String;
257-
public fun getObjectFactory ()Lorg/gradle/api/model/ObjectFactory;
258-
public fun hasTransformedResource ()Z
259-
public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
260-
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
255+
public fun <init> (Lorg/gradle/api/tasks/util/PatternSet;)V
256+
public synthetic fun <init> (Lorg/gradle/api/tasks/util/PatternSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
261257
}
262258

263259
public class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/ResourceTransformer {

docs/changes/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
- Add `PatternFilterableResourceTransformer` to simplify pattern based `ResourceTransformer`s. ([#1849](https://github.com/GradleUp/shadow/pull/1849))
99
- Expose `patternSet` of `ServiceFileTransformer` as `public`. ([#1849](https://github.com/GradleUp/shadow/pull/1849))
10+
- Expose `patternSet` of `ApacheLicenseResourceTransformer` as `public`. ([#1850](https://github.com/GradleUp/shadow/pull/1850))
1011

1112
### Changed
1213

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.jengelman.gradle.plugins.shadow.transformers
22

3-
import org.gradle.api.file.FileTreeElement
3+
import org.gradle.api.tasks.util.PatternSet
44

55
/**
66
* Prevents duplicate copies of the license.
@@ -10,17 +10,12 @@ import org.gradle.api.file.FileTreeElement
1010
* @author John Engelman
1111
*/
1212
@CacheableTransformer
13-
public open class ApacheLicenseResourceTransformer : ResourceTransformer by ResourceTransformer.Companion {
14-
override fun canTransformResource(element: FileTreeElement): Boolean {
15-
val path = element.path
16-
return LICENSE_PATH.equals(path, ignoreCase = true) ||
17-
LICENSE_TXT_PATH.regionMatches(0, path, 0, LICENSE_TXT_PATH.length, ignoreCase = true) ||
18-
LICENSE_MD_PATH.regionMatches(0, path, 0, LICENSE_MD_PATH.length, ignoreCase = true)
19-
}
20-
21-
private companion object {
22-
private const val LICENSE_PATH = "META-INF/LICENSE"
23-
private const val LICENSE_TXT_PATH = "META-INF/LICENSE.txt"
24-
private const val LICENSE_MD_PATH = "META-INF/LICENSE.md"
25-
}
26-
}
13+
public open class ApacheLicenseResourceTransformer(
14+
patternSet: PatternSet = PatternSet()
15+
.apply { isCaseSensitive = false }
16+
.include(
17+
"META-INF/LICENSE",
18+
"META-INF/LICENSE.txt",
19+
"META-INF/LICENSE.md",
20+
),
21+
) : PatternFilterableResourceTransformer(patternSet = patternSet)

0 commit comments

Comments
 (0)