From 74da8c836c0b398bedfa4ea835a0b7a077cec25d Mon Sep 17 00:00:00 2001 From: Goooler Date: Fri, 6 Dec 2024 23:02:38 +0800 Subject: [PATCH] Expose sourcePackageExcludes and sourcePathExcludes --- api/shadow.api | 2 ++ .../plugins/shadow/relocation/SimpleRelocator.kt | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/shadow.api b/api/shadow.api index c73a61e14..ac0778723 100644 --- a/api/shadow.api +++ b/api/shadow.api @@ -198,6 +198,8 @@ public class com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocat public fun exclude (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator; public final fun getExcludes ()Lorg/gradle/api/provider/SetProperty; public final fun getIncludes ()Lorg/gradle/api/provider/SetProperty; + public final fun getSourcePackageExcludes ()Lorg/gradle/api/provider/SetProperty; + public final fun getSourcePathExcludes ()Lorg/gradle/api/provider/SetProperty; public fun include (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator; public fun relocateClass (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;)Ljava/lang/String; public fun relocatePath (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;)Ljava/lang/String; diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt index b24bf463a..e698539ec 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator.kt @@ -26,8 +26,6 @@ public open class SimpleRelocator @JvmOverloads constructor( private val pathPattern: String private val shadedPattern: String private val shadedPathPattern: String - private val sourcePackageExcludes = mutableSetOf() - private val sourcePathExcludes = mutableSetOf() @get:Input public val includes: SetProperty = objectFactory.setProperty(String::class.java) @@ -35,6 +33,12 @@ public open class SimpleRelocator @JvmOverloads constructor( @get:Input public val excludes: SetProperty = objectFactory.setProperty(String::class.java) + @get:Input + public val sourcePackageExcludes: SetProperty = objectFactory.setProperty(String::class.java) + + @get:Input + public val sourcePathExcludes: SetProperty = objectFactory.setProperty(String::class.java) + init { if (rawString) { this.pathPattern = pattern.orEmpty() @@ -134,8 +138,8 @@ public open class SimpleRelocator @JvmOverloads constructor( override fun applyToSourceContent(sourceContent: String): String { if (rawString) return sourceContent - val content = shadeSourceWithExcludes(sourceContent, pattern, shadedPattern, sourcePackageExcludes) - return shadeSourceWithExcludes(content, pathPattern, shadedPathPattern, sourcePathExcludes) + val content = shadeSourceWithExcludes(sourceContent, pattern, shadedPattern, sourcePackageExcludes.get()) + return shadeSourceWithExcludes(content, pathPattern, shadedPathPattern, sourcePathExcludes.get()) } private fun isIncluded(path: String): Boolean {