Skip to content

Commit

Permalink
Migrate List to Set
Browse files Browse the repository at this point in the history
  • Loading branch information
@Goooler
Goooler committed Dec 12, 2024
1 parent 550470f commit c190c8d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
30 changes: 15 additions & 15 deletions api/shadow.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class com/github/jengelman/gradle/plugins/shadow/ShadowStats {
}

public class com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper : org/objectweb/asm/commons/Remapper {
public fun <init> (Ljava/util/List;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
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;
Expand Down Expand Up @@ -245,7 +245,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask$Co

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/List;Ljava/util/List;Lorg/gradle/api/tasks/util/PatternSet;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ZZ)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;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ZZ)V
public fun execute (Lorg/gradle/api/internal/file/copy/CopyActionProcessingStream;)Lorg/gradle/api/tasks/WorkResult;
}

Expand Down Expand Up @@ -302,7 +302,7 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
public fun dependencies (Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar;
public synthetic fun dependencies (Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
public fun getApiJars ()Lorg/gradle/api/file/ConfigurableFileCollection;
public fun getConfigurations ()Lorg/gradle/api/provider/ListProperty;
public fun getConfigurations ()Lorg/gradle/api/provider/SetProperty;
public fun getDependencyFilter ()Lorg/gradle/api/provider/Property;
public fun getEnableRelocation ()Lorg/gradle/api/provider/Property;
public fun getIncludedDependencies ()Lorg/gradle/api/file/ConfigurableFileCollection;
Expand All @@ -311,12 +311,12 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
public synthetic fun getManifest ()Lorg/gradle/api/java/archives/Manifest;
public fun getMinimizeJar ()Lorg/gradle/api/provider/Property;
public fun getRelocationPrefix ()Lorg/gradle/api/provider/Property;
public fun getRelocators ()Lorg/gradle/api/provider/ListProperty;
public fun getRelocators ()Lorg/gradle/api/provider/SetProperty;
protected fun getRootPatternSet ()Lorg/gradle/api/tasks/util/PatternSet;
public fun getSourceSetsClassesDirs ()Lorg/gradle/api/file/ConfigurableFileCollection;
public fun getStats ()Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;
public fun getToMinimize ()Lorg/gradle/api/file/ConfigurableFileCollection;
public fun getTransformers ()Lorg/gradle/api/provider/ListProperty;
public fun getTransformers ()Lorg/gradle/api/provider/SetProperty;
public fun mergeGroovyExtensionModules ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar;
public synthetic fun mergeGroovyExtensionModules ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
public fun mergeServiceFiles ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar;
Expand Down Expand Up @@ -465,7 +465,7 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/ManifestApp
public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
public fun append (Ljava/lang/String;Ljava/lang/Comparable;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer;
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public fun getAttributes ()Lorg/gradle/api/provider/ListProperty;
public fun getAttributes ()Lorg/gradle/api/provider/SetProperty;
public final fun getObjectFactory ()Lorg/gradle/api/model/ObjectFactory;
public fun hasTransformedResource ()Z
public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
Expand Down Expand Up @@ -501,7 +501,7 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesF
public fun getMergeSeparator ()Lorg/gradle/api/provider/Property;
public fun getMergeStrategy ()Lorg/gradle/api/provider/Property;
public final fun getObjectFactory ()Lorg/gradle/api/model/ObjectFactory;
public fun getPaths ()Lorg/gradle/api/provider/ListProperty;
public fun getPaths ()Lorg/gradle/api/provider/SetProperty;
public fun hasTransformedResource ()Z
public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
Expand Down Expand Up @@ -574,21 +574,21 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
public final class com/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext {
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/List;)V
public fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/List;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/io/InputStream;Ljava/util/List;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;ILkotlin/jvm/internal/DefaultConstructorMarker;)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 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/List;
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/List;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/List;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/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 fun equals (Ljava/lang/Object;)Z
public static final fun getEntryTimestamp (ZJ)J
public final fun getInputStream ()Ljava/io/InputStream;
public final fun getPath ()Ljava/lang/String;
public final fun getRelocators ()Ljava/util/List;
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 @@ -599,7 +599,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Trans
public final fun build ()Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;
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/List;)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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/impl/RelocatorRemapper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import org.objectweb.asm.commons.Remapper
* @author John Engelman
*/
public open class RelocatorRemapper(
private val relocators: List<Relocator>,
private val relocators: Set<Relocator>,
private val stats: ShadowStats,
) : Remapper() {
private val classPattern: Pattern = Pattern.compile("(\\[*)?L(.+)")
Expand Down
12 changes: 6 additions & 6 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public open class ShadowCopyAction internal constructor(
private val compressor: ZipCompressor,
private val documentationRegistry: DocumentationRegistry,
private val encoding: String?,
private val transformers: List<Transformer>,
private val relocators: List<Relocator>,
private val transformers: Set<Transformer>,
private val relocators: Set<Relocator>,
private val patternSet: PatternSet,
private val stats: ShadowStats,
private val preserveFileTimestamps: Boolean,
Expand All @@ -58,8 +58,8 @@ public open class ShadowCopyAction internal constructor(
compressor: ZipCompressor,
documentationRegistry: DocumentationRegistry,
encoding: String?,
transformers: List<Transformer>,
relocators: List<Relocator>,
transformers: Set<Transformer>,
relocators: Set<Relocator>,
patternSet: PatternSet,
stats: ShadowStats,
preserveFileTimestamps: Boolean,
Expand Down Expand Up @@ -166,8 +166,8 @@ public open class ShadowCopyAction internal constructor(
private inner class StreamAction(
private val zipOutStr: ZipOutputStream,
encoding: String?,
private val transformers: List<Transformer>,
private val relocators: List<Relocator>,
private val transformers: Set<Transformer>,
private val relocators: Set<Relocator>,
private val patternSet: PatternSet,
private val unused: Set<String>,
private val stats: ShadowStats,
Expand Down
6 changes: 3 additions & 3 deletions ...main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import java.io.InputStream
public data class TransformerContext @JvmOverloads constructor(
val path: String,
val inputStream: InputStream,
val relocators: List<Relocator> = emptyList(),
val relocators: Set<Relocator> = emptySet(),
val stats: ShadowStats = ShadowStats(),
) {
public class Builder {
private var path = ""
private var inputStream: InputStream? = null
private var relocators = emptyList<Relocator>()
private var relocators = emptySet<Relocator>()
private var stats = ShadowStats()

public fun path(path: String): Builder = apply { this.path = path }
public fun inputStream(inputStream: InputStream): Builder = apply { this.inputStream = inputStream }
public fun relocators(relocators: List<Relocator>): Builder = apply { this.relocators = relocators }
public fun relocators(relocators: Set<Relocator>): Builder = apply { this.relocators = relocators }
public fun stats(stats: ShadowStats): Builder = apply { this.stats = stats }
public fun build(): TransformerContext = TransformerContext(
path = path,
Expand Down

0 comments on commit c190c8d

Please sign in to comment.