Skip to content

Commit 6ff7ad9

Browse files
GooolerGoooler
authored
Drop ShadowStats and related usages (#1264)
* Remove `ShadowStats` * Mark `RelocateClassContext` and `RelocatePathContext` as value classes * Update changelog
1 parent 4fe5708 commit 6ff7ad9

File tree

17 files changed

+40
-233
lines changed

17 files changed

+40
-233
lines changed

‎api/shadow.api‎

Lines changed: 22 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -64,32 +64,6 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowPlugin :
6464
public fun apply (Lorg/gradle/api/Project;)V
6565
}
6666

67-
public class com/github/jengelman/gradle/plugins/shadow/ShadowStats {
68-
public fun <init> ()V
69-
public fun finishJar ()V
70-
public fun getAverageTimePerJar ()D
71-
public fun getAverageTimeSecsPerJar ()D
72-
public fun getBuildScanData ()Ljava/util/Map;
73-
public fun getJarCount ()I
74-
public fun getJarEndTime ()J
75-
public fun getJarStartTime ()J
76-
public fun getJarTiming ()J
77-
public fun getProcessingJar ()Z
78-
public fun getRelocationString ()Ljava/lang/String;
79-
public fun getRelocations ()Ljava/util/Map;
80-
public fun getTotalTime ()J
81-
public fun getTotalTimeSecs ()D
82-
public fun printStats ()V
83-
public fun relocate (Ljava/lang/String;Ljava/lang/String;)V
84-
public fun setJarCount (I)V
85-
public fun setJarEndTime (J)V
86-
public fun setJarStartTime (J)V
87-
public fun setProcessingJar (Z)V
88-
public fun setTotalTime (J)V
89-
public fun startJar ()V
90-
public fun toString ()Ljava/lang/String;
91-
}
92-
9367
public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter : java/io/Serializable {
9468
public abstract fun dependency (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
9569
public abstract fun dependency (Lorg/gradle/api/artifacts/Dependency;)Lorg/gradle/api/specs/Spec;
@@ -115,68 +89,40 @@ public abstract interface annotation class com/github/jengelman/gradle/plugins/s
11589
}
11690

11791
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext {
118-
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Companion;
119-
public fun <init> (Ljava/lang/String;)V
120-
public fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
121-
public synthetic fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
122-
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
123-
public final fun component1 ()Ljava/lang/String;
124-
public final fun component2 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
125-
public final fun copy (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
126-
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
92+
public static final synthetic fun box-impl (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
93+
public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
12794
public fun equals (Ljava/lang/Object;)Z
95+
public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
96+
public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
12897
public final fun getClassName ()Ljava/lang/String;
129-
public final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
13098
public fun hashCode ()I
99+
public static fun hashCode-impl (Ljava/lang/String;)I
131100
public fun toString ()Ljava/lang/String;
132-
}
133-
134-
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder {
135-
public fun <init> ()V
136-
public final fun build ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
137-
public final fun className (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
138-
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
139-
}
140-
141-
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Companion {
142-
public final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
101+
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
102+
public final synthetic fun unbox-impl ()Ljava/lang/String;
143103
}
144104

145105
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext {
146-
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Companion;
147-
public fun <init> (Ljava/lang/String;)V
148-
public fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
149-
public synthetic fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
150-
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
151-
public final fun component1 ()Ljava/lang/String;
152-
public final fun component2 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
153-
public final fun copy (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
154-
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
106+
public static final synthetic fun box-impl (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
107+
public static fun constructor-impl (Ljava/lang/String;)Ljava/lang/String;
155108
public fun equals (Ljava/lang/Object;)Z
109+
public static fun equals-impl (Ljava/lang/String;Ljava/lang/Object;)Z
110+
public static final fun equals-impl0 (Ljava/lang/String;Ljava/lang/String;)Z
156111
public final fun getPath ()Ljava/lang/String;
157-
public final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
158112
public fun hashCode ()I
113+
public static fun hashCode-impl (Ljava/lang/String;)I
159114
public fun toString ()Ljava/lang/String;
160-
}
161-
162-
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder {
163-
public fun <init> ()V
164-
public final fun build ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
165-
public final fun path (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
166-
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
167-
}
168-
169-
public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Companion {
170-
public final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
115+
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
116+
public final synthetic fun unbox-impl ()Ljava/lang/String;
171117
}
172118

173119
public abstract interface class com/github/jengelman/gradle/plugins/shadow/relocation/Relocator {
174120
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/Relocator$Companion;
175121
public abstract fun applyToSourceContent (Ljava/lang/String;)Ljava/lang/String;
176122
public abstract fun canRelocateClass (Ljava/lang/String;)Z
177123
public abstract fun canRelocatePath (Ljava/lang/String;)Z
178-
public abstract fun relocateClass (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;)Ljava/lang/String;
179-
public abstract fun relocatePath (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;)Ljava/lang/String;
124+
public abstract fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
125+
public abstract fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
180126
}
181127

182128
public final class com/github/jengelman/gradle/plugins/shadow/relocation/Relocator$Companion {
@@ -198,8 +144,8 @@ public class com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocat
198144
public final fun getExcludes ()Lorg/gradle/api/provider/SetProperty;
199145
public final fun getIncludes ()Lorg/gradle/api/provider/SetProperty;
200146
public fun include (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocator;
201-
public fun relocateClass (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;)Ljava/lang/String;
202-
public fun relocatePath (Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;)Ljava/lang/String;
147+
public fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
148+
public fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
203149
}
204150

205151
public class com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritManifest : com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest, org/gradle/api/java/archives/Manifest {
@@ -227,7 +173,7 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
227173

228174
public class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction : org/gradle/api/internal/file/copy/CopyAction {
229175
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$Companion;
230-
public fun <init> (Ljava/io/File;Lcom/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor;Lorg/gradle/api/internal/DocumentationRegistry;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lorg/gradle/api/tasks/util/PatternSet;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ZLjava/util/Set;)V
176+
public fun <init> (Ljava/io/File;Lcom/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor;Lorg/gradle/api/internal/DocumentationRegistry;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lorg/gradle/api/tasks/util/PatternSet;ZLjava/util/Set;)V
231177
public fun execute (Lorg/gradle/api/internal/file/copy/CopyActionProcessingStream;)Lorg/gradle/api/tasks/WorkResult;
232178
}
233179

@@ -565,20 +511,17 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
565511
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Companion;
566512
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;)V
567513
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;)V
568-
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
569-
public synthetic fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
514+
public synthetic fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
570515
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
571516
public final fun component1 ()Ljava/lang/String;
572517
public final fun component2 ()Ljava/io/InputStream;
573518
public final fun component3 ()Ljava/util/Set;
574-
public final fun component4 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
575-
public final fun copy (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
576-
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
519+
public final fun copy (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
520+
public static synthetic fun copy$default (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;ILjava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
577521
public fun equals (Ljava/lang/Object;)Z
578522
public final fun getInputStream ()Ljava/io/InputStream;
579523
public final fun getPath ()Ljava/lang/String;
580524
public final fun getRelocators ()Ljava/util/Set;
581-
public final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
582525
public fun hashCode ()I
583526
public fun toString ()Ljava/lang/String;
584527
}
@@ -589,7 +532,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
589532
public final fun inputStream (Ljava/io/InputStream;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
590533
public final fun path (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
591534
public final fun relocators (Ljava/util/Set;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
592-
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
593535
}
594536

595537
public final class com/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Companion {

‎src/docs/changes/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
**Removed**
1515

1616
- **BREAKING CHANGE:** Remove `BaseStreamAction`. ([#1258](https://github.com/GradleUp/shadow/pull/1258))
17+
- **BREAKING CHANGE:** Remove `ShadowStats`. ([#1264](https://github.com/GradleUp/shadow/pull/1264))
1718

1819

1920
## [v9.0.0-beta8] (2025-02-08)

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowStats.kt‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RealStreamAction.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.jengelman.gradle.plugins.shadow.internal
22

3-
import com.github.jengelman.gradle.plugins.shadow.ShadowStats
43
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
54
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction.ArchiveFileTreeElement
65
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction.RelativeArchivePath
@@ -34,12 +33,11 @@ internal class RealStreamAction(
3433
private val relocators: Set<Relocator>,
3534
private val patternSet: PatternSet,
3635
private val unusedClasses: Set<String>,
37-
private val stats: ShadowStats,
3836
private val zipFile: File,
3937
private val preserveFileTimestamps: Boolean,
4038
private val logger: Logger,
4139
) : CopyActionProcessingStreamAction {
42-
private val remapper = RelocatorRemapper(relocators, stats)
40+
private val remapper = RelocatorRemapper(relocators)
4341
private val visitedFiles = mutableSetOf<String>()
4442

4543
init {
@@ -100,7 +98,6 @@ internal class RealStreamAction(
10098
}
10199

102100
private fun processArchive(fileDetails: FileCopyDetails) {
103-
stats.startJar()
104101
ZipFile(fileDetails.file).use { archive ->
105102
archive.entries.asSequence()
106103
.map {
@@ -114,7 +111,6 @@ internal class RealStreamAction(
114111
}
115112
}
116113
}
117-
stats.finishJar()
118114
}
119115

120116
private fun visitArchiveDirectory(archiveDir: RelativeArchivePath) {
@@ -242,7 +238,6 @@ internal class RealStreamAction(
242238
path = mappedPath,
243239
inputStream = steam,
244240
relocators = relocators,
245-
stats = stats,
246241
),
247242
)
248243
}

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.jengelman.gradle.plugins.shadow.internal
22

3-
import com.github.jengelman.gradle.plugins.shadow.ShadowStats
43
import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext
54
import com.github.jengelman.gradle.plugins.shadow.relocation.RelocatePathContext
65
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
@@ -16,7 +15,6 @@ import org.objectweb.asm.commons.Remapper
1615
*/
1716
internal class RelocatorRemapper(
1817
private val relocators: Set<Relocator>,
19-
private val stats: ShadowStats,
2018
) : Remapper() {
2119
private val classPattern: Pattern = Pattern.compile("(\\[*)?L(.+)")
2220

@@ -44,10 +42,10 @@ internal class RelocatorRemapper(
4442

4543
for (relocator in relocators) {
4644
if (relocator.canRelocateClass(newName)) {
47-
val classContext = RelocateClassContext(className = newName, stats = stats)
45+
val classContext = RelocateClassContext(newName)
4846
return prefix + relocator.relocateClass(classContext) + suffix
4947
} else if (relocator.canRelocatePath(newName)) {
50-
val pathContext = RelocatePathContext(path = newName, stats = stats)
48+
val pathContext = RelocatePathContext(newName)
5149
return prefix + relocator.relocatePath(pathContext) + suffix
5250
}
5351
}

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext.kt‎

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

3-
import com.github.jengelman.gradle.plugins.shadow.ShadowStats
4-
5-
public data class RelocateClassContext @JvmOverloads constructor(
6-
val className: String,
7-
val stats: ShadowStats = ShadowStats(),
8-
) {
9-
public class Builder {
10-
private var className = ""
11-
private var stats = ShadowStats()
12-
13-
public fun className(className: String): Builder = apply { this.className = className }
14-
public fun stats(stats: ShadowStats): Builder = apply { this.stats = stats }
15-
public fun build(): RelocateClassContext = RelocateClassContext(className, stats)
16-
}
17-
18-
public companion object {
19-
@JvmStatic
20-
public fun builder(): Builder = Builder()
21-
}
22-
}
3+
@JvmInline
4+
public value class RelocateClassContext(
5+
public val className: String,
6+
)

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext.kt‎

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

3-
import com.github.jengelman.gradle.plugins.shadow.ShadowStats
4-
5-
public data class RelocatePathContext @JvmOverloads constructor(
6-
val path: String,
7-
val stats: ShadowStats = ShadowStats(),
8-
) {
9-
public class Builder {
10-
private var path = ""
11-
private var stats = ShadowStats()
12-
13-
public fun path(path: String): Builder = apply { this.path = path }
14-
public fun stats(stats: ShadowStats): Builder = apply { this.stats = stats }
15-
public fun build(): RelocatePathContext = RelocatePathContext(path, stats)
16-
}
17-
18-
public companion object {
19-
@JvmStatic
20-
public fun builder(): Builder = Builder()
21-
}
22-
}
3+
@JvmInline
4+
public value class RelocatePathContext(
5+
public val path: String,
6+
)

0 commit comments

Comments
 (0)