Mark RelocatorRemapper as internal

GradleUp · Feb 5, 2025 · e27a6e4 · e27a6e4
1 parent a34d3c3
commit e27a6e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/api/shadow.api b/api/shadow.api
@@ -90,15 +90,6 @@ public class com/github/jengelman/gradle/plugins/shadow/ShadowStats {
 	public fun toString ()Ljava/lang/String;
 }
 
-public class com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper : org/objectweb/asm/commons/Remapper {
-	public fun <init> (Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
-	public fun hasRelocators ()Z
-	public fun map (Ljava/lang/String;)Ljava/lang/String;
-	public fun mapPath (Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$RelativeArchivePath;)Ljava/lang/String;
-	public fun mapPath (Ljava/lang/String;)Ljava/lang/String;
-	public fun mapValue (Ljava/lang/Object;)Ljava/lang/Object;
-}
-
 public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter : java/io/Serializable {
 	public abstract fun dependency (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
 	public abstract fun dependency (Lorg/gradle/api/artifacts/Dependency;)Lorg/gradle/api/specs/Spec;

diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md
@@ -7,6 +7,10 @@
 
 - Sync `ShadowApplicationPlugin` with `ApplicationPlugin`. ([#1224](https://github.com/GradleUp/shadow/pull/1224))
 
+**Changed**
+
+- **BREAKING CHANGE:** Mark `RelocatorRemapper` as `internal`. ([#1227](https://github.com/GradleUp/shadow/pull/1227))
+
 
 ## [v9.0.0-beta7] (2025-02-02)
 

diff --git a/.../plugins/shadow/impl/RelocatorRemapper.kt → ...gins/shadow/internal/RelocatorRemapper.kt b/.../plugins/shadow/impl/RelocatorRemapper.kt → ...gins/shadow/internal/RelocatorRemapper.kt
@@ -1,4 +1,4 @@
-package com.github.jengelman.gradle.plugins.shadow.impl
+package com.github.jengelman.gradle.plugins.shadow.internal
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats
 import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext
@@ -14,13 +14,13 @@ import org.objectweb.asm.commons.Remapper
  *
  * @author John Engelman
  */
-public open class RelocatorRemapper(
+internal class RelocatorRemapper(
   private val relocators: Set<Relocator>,
   private val stats: ShadowStats,
 ) : Remapper() {
   private val classPattern: Pattern = Pattern.compile("(\\[*)?L(.+)")
 
-  public open fun hasRelocators(): Boolean = relocators.isNotEmpty()
+  fun hasRelocators(): Boolean = relocators.isNotEmpty()
 
   override fun mapValue(value: Any): Any {
     return if (value is String) {
@@ -55,11 +55,11 @@ public open class RelocatorRemapper(
     return name
   }
 
-  public open fun mapPath(path: String): String {
+  fun mapPath(path: String): String {
     return map(path.substring(0, path.indexOf('.')))
   }
 
-  public open fun mapPath(path: ShadowCopyAction.RelativeArchivePath): String {
+  fun mapPath(path: ShadowCopyAction.RelativeArchivePath): String {
     return mapPath(path.pathString)
   }
 }
diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt
@@ -1,7 +1,7 @@
 package com.github.jengelman.gradle.plugins.shadow.tasks
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats
-import com.github.jengelman.gradle.plugins.shadow.impl.RelocatorRemapper
+import com.github.jengelman.gradle.plugins.shadow.internal.RelocatorRemapper
 import com.github.jengelman.gradle.plugins.shadow.internal.UnusedTracker
 import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
 import com.github.jengelman.gradle.plugins.shadow.internal.createDefaultFileTreeElement