Skip to content

Commit

Permalink
Revert "Expose sourcePackageExcludes and sourcePathExcludes"
Browse files Browse the repository at this point in the history
This reverts commit 74da8c8.
  • Loading branch information
Goooler committed Dec 7, 2024
1 parent 60a6aea commit 4f12072
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 0 additions & 2 deletions api/shadow.api
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,6 @@ 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,15 @@ public open class SimpleRelocator @JvmOverloads constructor(
private val pathPattern: String
private val shadedPattern: String
private val shadedPathPattern: String
private val sourcePackageExcludes = mutableSetOf<String>()
private val sourcePathExcludes = mutableSetOf<String>()

@get:Input
public val includes: SetProperty<String> = objectFactory.setProperty(String::class.java)

@get:Input
public val excludes: SetProperty<String> = objectFactory.setProperty(String::class.java)

@get:Input
public val sourcePackageExcludes: SetProperty<String> = objectFactory.setProperty(String::class.java)

@get:Input
public val sourcePathExcludes: SetProperty<String> = objectFactory.setProperty(String::class.java)

init {
if (rawString) {
this.pathPattern = pattern.orEmpty()
Expand Down Expand Up @@ -136,10 +132,13 @@ public open class SimpleRelocator @JvmOverloads constructor(
return if (rawString) clazz else clazz.replaceFirst(pattern.toRegex(), shadedPattern)
}

/**
* We don't call this function now, so we don't have to expose [sourcePackageExcludes] and [sourcePathExcludes] as inputs.
*/
override fun applyToSourceContent(sourceContent: String): String {
if (rawString) return sourceContent
val content = shadeSourceWithExcludes(sourceContent, pattern, shadedPattern, sourcePackageExcludes.get())
return shadeSourceWithExcludes(content, pathPattern, shadedPathPattern, sourcePathExcludes.get())
val content = shadeSourceWithExcludes(sourceContent, pattern, shadedPattern, sourcePackageExcludes)
return shadeSourceWithExcludes(content, pathPattern, shadedPathPattern, sourcePathExcludes)
}

private fun isIncluded(path: String): Boolean {
Expand Down

0 comments on commit 4f12072

Please sign in to comment.