Skip to content

Fallback RelocateClassContext and RelocatePathContext to data classes #1445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2025
Merged

Fallback RelocateClassContext and RelocatePathContext to data classes #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae3e5df
Use data class for `RelocateClassContext` and `RelocatePathContext`
Goooler May 28, 2025
93524ab
Update changelog
Goooler May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions api/shadow.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,31 +81,25 @@ public abstract interface annotation class com/github/jengelman/gradle/plugins/s
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext {
public static final synthetic fun box-impl (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
public fun <init> (Ljava/lang/String;)V
public final fun component1 ()Ljava/lang/String;
public final fun copy (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;Ljava/lang/String;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
public fun equals (Ljava/lang/Object;)Z
public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
public final fun getClassName ()Ljava/lang/String;
public fun hashCode ()I
public static fun hashCode-impl (Ljava/lang/String;)I
public fun toString ()Ljava/lang/String;
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
public final synthetic fun unbox-impl ()Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext {
public static final synthetic fun box-impl (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
public fun <init> (Ljava/lang/String;)V
public final fun component1 ()Ljava/lang/String;
public final fun copy (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;Ljava/lang/String;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
public fun equals (Ljava/lang/Object;)Z
public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
public final fun getPath ()Ljava/lang/String;
public fun hashCode ()I
public static fun hashCode-impl (Ljava/lang/String;)I
public fun toString ()Ljava/lang/String;
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
public final synthetic fun unbox-impl ()Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocationContextKt {
Expand All @@ -118,8 +112,8 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/reloc
public abstract fun applyToSourceContent (Ljava/lang/String;)Ljava/lang/String;
public abstract fun canRelocateClass (Ljava/lang/String;)Z
public abstract fun canRelocatePath (Ljava/lang/String;)Z
public abstract fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
public abstract fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
public abstract fun relocateClass (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;)Ljava/lang/String;
public abstract fun relocatePath (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;)Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/Relocator$Companion {
Expand All @@ -143,8 +137,8 @@ public class com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocat
public final fun getIncludes ()Ljava/util/Set;
public fun hashCode ()I
public fun include (Ljava/lang/String;)V
public fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
public fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
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;
}

public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter : java/io/Serializable {
Expand Down
1 change: 1 addition & 0 deletions docs/changes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
**Fixed**

- Allow using file trees of JARs together with the configuration cache. ([#1441](https://github.com/GradleUp/shadow/pull/1441))
- Fallback `RelocateClassContext` and `RelocatePathContext` to data classes. ([#1445](https://github.com/GradleUp/shadow/pull/1445))

## [9.0.0-beta13](https://github.com/GradleUp/shadow/releases/tag/9.0.0-beta13) - 2025-04-29

Expand Down
6 changes: 2 additions & 4 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocationContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.github.jengelman.gradle.plugins.shadow.relocation

@JvmInline
public value class RelocateClassContext(
public data class RelocateClassContext(
public val className: String,
)

@JvmInline
public value class RelocatePathContext(
public data class RelocatePathContext(
public val path: String,
)

Expand Down