Skip to content
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

Drop ShadowStats and related usages #1264

Merged
merged 3 commits into from
Feb 18, 2025
Merged

Drop ShadowStats and related usages #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49c8cb6
Remove `ShadowStats`
Goooler Feb 18, 2025
363b41f
Mark `RelocateClassContext` and `RelocatePathContext` as value classes
Goooler Feb 18, 2025
8a014de
Update changelog
Goooler Feb 18, 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
102 changes: 22 additions & 80 deletions api/shadow.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,32 +64,6 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/ShadowPlugin :
public fun apply (Lorg/gradle/api/Project;)V
}

public class com/github/jengelman/gradle/plugins/shadow/ShadowStats {
public fun <init> ()V
public fun finishJar ()V
public fun getAverageTimePerJar ()D
public fun getAverageTimeSecsPerJar ()D
public fun getBuildScanData ()Ljava/util/Map;
public fun getJarCount ()I
public fun getJarEndTime ()J
public fun getJarStartTime ()J
public fun getJarTiming ()J
public fun getProcessingJar ()Z
public fun getRelocationString ()Ljava/lang/String;
public fun getRelocations ()Ljava/util/Map;
public fun getTotalTime ()J
public fun getTotalTimeSecs ()D
public fun printStats ()V
public fun relocate (Ljava/lang/String;Ljava/lang/String;)V
public fun setJarCount (I)V
public fun setJarEndTime (J)V
public fun setJarStartTime (J)V
public fun setProcessingJar (Z)V
public fun setTotalTime (J)V
public fun startJar ()V
public fun toString ()Ljava/lang/String;
}

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;
Expand All @@ -115,68 +89,40 @@ 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 field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Companion;
public fun <init> (Ljava/lang/String;)V
public fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
public synthetic fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public final fun copy (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)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;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILjava/lang/Object;)Lcom/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 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 final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public fun hashCode ()I
public static fun hashCode-impl (Ljava/lang/String;)I
public fun toString ()Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder {
public fun <init> ()V
public final fun build ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext;
public final fun className (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Companion {
public final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext$Builder;
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 field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Companion;
public fun <init> (Ljava/lang/String;)V
public fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
public synthetic fun <init> (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public final fun copy (Ljava/lang/String;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)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;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILjava/lang/Object;)Lcom/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 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 final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public fun hashCode ()I
public static fun hashCode-impl (Ljava/lang/String;)I
public fun toString ()Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder {
public fun <init> ()V
public final fun build ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext;
public final fun path (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Companion {
public final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext$Builder;
public static fun toString-impl (Ljava/lang/String;)Ljava/lang/String;
public final synthetic fun unbox-impl ()Ljava/lang/String;
}

public abstract interface class com/github/jengelman/gradle/plugins/shadow/relocation/Relocator {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/relocation/Relocator$Companion;
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 (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 abstract fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
public abstract fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
}

public final class com/github/jengelman/gradle/plugins/shadow/relocation/Relocator$Companion {
Expand All @@ -198,8 +144,8 @@ public class com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocat
public final fun getExcludes ()Lorg/gradle/api/provider/SetProperty;
public final fun getIncludes ()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;
public fun relocateClass-XBGRxQs (Ljava/lang/String;)Ljava/lang/String;
public fun relocatePath-bvWaKNU (Ljava/lang/String;)Ljava/lang/String;
}

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

public class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction : org/gradle/api/internal/file/copy/CopyAction {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$Companion;
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
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
public fun execute (Lorg/gradle/api/internal/file/copy/CopyActionProcessingStream;)Lorg/gradle/api/tasks/WorkResult;
}

Expand Down Expand Up @@ -565,20 +511,17 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Companion;
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;)V
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;)V
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
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
public synthetic fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public static final fun builder ()Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/io/InputStream;
public final fun component3 ()Ljava/util/Set;
public final fun component4 ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
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;
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;
public final fun copy (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/Set;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
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;
public fun equals (Ljava/lang/Object;)Z
public final fun getInputStream ()Ljava/io/InputStream;
public final fun getPath ()Ljava/lang/String;
public final fun getRelocators ()Ljava/util/Set;
public final fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand All @@ -589,7 +532,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
public final fun inputStream (Ljava/io/InputStream;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
public final fun path (Ljava/lang/String;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
public final fun relocators (Ljava/util/Set;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
public final fun stats (Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Builder;
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext$Companion {
Expand Down
1 change: 1 addition & 0 deletions src/docs/changes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
**Removed**

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


## [v9.0.0-beta8] (2025-02-08)
Expand Down
72 changes: 0 additions & 72 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowStats.kt
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RealStreamAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.jengelman.gradle.plugins.shadow.internal

import com.github.jengelman.gradle.plugins.shadow.ShadowStats
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction.ArchiveFileTreeElement
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction.RelativeArchivePath
Expand Down Expand Up @@ -34,12 +33,11 @@ internal class RealStreamAction(
private val relocators: Set<Relocator>,
private val patternSet: PatternSet,
private val unusedClasses: Set<String>,
private val stats: ShadowStats,
private val zipFile: File,
private val preserveFileTimestamps: Boolean,
private val logger: Logger,
) : CopyActionProcessingStreamAction {
private val remapper = RelocatorRemapper(relocators, stats)
private val remapper = RelocatorRemapper(relocators)
private val visitedFiles = mutableSetOf<String>()

init {
Expand Down Expand Up @@ -100,7 +98,6 @@ internal class RealStreamAction(
}

private fun processArchive(fileDetails: FileCopyDetails) {
stats.startJar()
ZipFile(fileDetails.file).use { archive ->
archive.entries.asSequence()
.map {
Expand All @@ -114,7 +111,6 @@ internal class RealStreamAction(
}
}
}
stats.finishJar()
}

private fun visitArchiveDirectory(archiveDir: RelativeArchivePath) {
Expand Down Expand Up @@ -242,7 +238,6 @@ internal class RealStreamAction(
path = mappedPath,
inputStream = steam,
relocators = relocators,
stats = stats,
),
)
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
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
import com.github.jengelman.gradle.plugins.shadow.relocation.RelocatePathContext
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
Expand All @@ -16,7 +15,6 @@ import org.objectweb.asm.commons.Remapper
*/
internal class RelocatorRemapper(
private val relocators: Set<Relocator>,
private val stats: ShadowStats,
) : Remapper() {
private val classPattern: Pattern = Pattern.compile("(\\[*)?L(.+)")

Expand Down Expand Up @@ -44,10 +42,10 @@ internal class RelocatorRemapper(

for (relocator in relocators) {
if (relocator.canRelocateClass(newName)) {
val classContext = RelocateClassContext(className = newName, stats = stats)
val classContext = RelocateClassContext(newName)
return prefix + relocator.relocateClass(classContext) + suffix
} else if (relocator.canRelocatePath(newName)) {
val pathContext = RelocatePathContext(path = newName, stats = stats)
val pathContext = RelocatePathContext(newName)
return prefix + relocator.relocatePath(pathContext) + suffix
}
}
Expand Down
24 changes: 4 additions & 20 deletions ...main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocateClassContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
package com.github.jengelman.gradle.plugins.shadow.relocation

import com.github.jengelman.gradle.plugins.shadow.ShadowStats

public data class RelocateClassContext @JvmOverloads constructor(
val className: String,
val stats: ShadowStats = ShadowStats(),
) {
public class Builder {
private var className = ""
private var stats = ShadowStats()

public fun className(className: String): Builder = apply { this.className = className }
public fun stats(stats: ShadowStats): Builder = apply { this.stats = stats }
public fun build(): RelocateClassContext = RelocateClassContext(className, stats)
}

public companion object {
@JvmStatic
public fun builder(): Builder = Builder()
}
}
@JvmInline
public value class RelocateClassContext(
public val className: String,
)
24 changes: 4 additions & 20 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/relocation/RelocatePathContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
package com.github.jengelman.gradle.plugins.shadow.relocation

import com.github.jengelman.gradle.plugins.shadow.ShadowStats

public data class RelocatePathContext @JvmOverloads constructor(
val path: String,
val stats: ShadowStats = ShadowStats(),
) {
public class Builder {
private var path = ""
private var stats = ShadowStats()

public fun path(path: String): Builder = apply { this.path = path }
public fun stats(stats: ShadowStats): Builder = apply { this.stats = stats }
public fun build(): RelocatePathContext = RelocatePathContext(path, stats)
}

public companion object {
@JvmStatic
public fun builder(): Builder = Builder()
}
}
@JvmInline
public value class RelocatePathContext(
public val path: String,
)
Loading