Skip to content

Commit abcf6aa

Browse files
GooolerGoooler
authored
Move ZipCompressor into internal (#1037)
1 parent 2cae500 commit abcf6aa

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎api/shadow.api‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/inter
103103
public abstract fun resolve (Lorg/gradle/api/file/FileCollection;)Lorg/gradle/api/file/FileCollection;
104104
}
105105

106+
public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor : org/gradle/api/internal/file/archive/compression/ArchiveOutputStreamFactory {
107+
}
108+
106109
public abstract class com/github/jengelman/gradle/plugins/shadow/legacy/LegacyShadowPlugin : org/gradle/api/Plugin {
107110
public fun <init> ()V
108111
public synthetic fun apply (Ljava/lang/Object;)V
@@ -233,7 +236,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask$Co
233236

234237
public class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction : org/gradle/api/internal/file/copy/CopyAction {
235238
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$Companion;
236-
public fun <init> (Ljava/io/File;Lcom/github/jengelman/gradle/plugins/shadow/tasks/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
239+
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
237240
public fun execute (Lorg/gradle/api/internal/file/copy/CopyActionProcessingStream;)Lorg/gradle/api/tasks/WorkResult;
238241
}
239242

@@ -293,7 +296,6 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
293296
public final fun getConfigurations ()Ljava/util/List;
294297
public final fun getDependencyFilter ()Lcom/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter;
295298
public final fun getIncludedDependencies ()Lorg/gradle/api/file/FileCollection;
296-
public final fun getInternalCompressor ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/ZipCompressor;
297299
public fun getManifest ()Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;
298300
public synthetic fun getManifest ()Lorg/gradle/api/java/archives/Manifest;
299301
public final fun getRelocationPrefix ()Ljava/lang/String;
@@ -360,9 +362,6 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
360362
public abstract fun transform (Ljava/lang/Class;Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowSpec;
361363
}
362364

363-
public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks/ZipCompressor : org/gradle/api/internal/file/archive/compression/ArchiveOutputStreamFactory {
364-
}
365-
366365
public class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
367366
public fun <init> ()V
368367
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z

‎lint-baseline.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
8686
<location
8787
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
88-
line="25"
88+
line="26"
8989
column="1"/>
9090
</issue>
9191

@@ -96,7 +96,7 @@
9696
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
9797
<location
9898
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
99-
line="26"
99+
line="27"
100100
column="1"/>
101101
</issue>
102102

@@ -107,7 +107,7 @@
107107
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
108108
<location
109109
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
110-
line="27"
110+
line="28"
111111
column="1"/>
112112
</issue>
113113

@@ -118,7 +118,7 @@
118118
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
119119
<location
120120
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
121-
line="28"
121+
line="29"
122122
column="1"/>
123123
</issue>
124124

@@ -129,7 +129,7 @@
129129
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
130130
<location
131131
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
132-
line="29"
132+
line="30"
133133
column="1"/>
134134
</issue>
135135

@@ -140,7 +140,7 @@
140140
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
141141
<location
142142
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
143-
line="30"
143+
line="31"
144144
column="1"/>
145145
</issue>
146146

@@ -151,7 +151,7 @@
151151
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
152152
<location
153153
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
154-
line="31"
154+
line="32"
155155
column="1"/>
156156
</issue>
157157

@@ -162,7 +162,7 @@
162162
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
163163
<location
164164
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
165-
line="24"
165+
line="25"
166166
column="1"/>
167167
</issue>
168168

@@ -173,7 +173,7 @@
173173
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
174174
<location
175175
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
176-
line="25"
176+
line="26"
177177
column="1"/>
178178
</issue>
179179

@@ -184,7 +184,7 @@
184184
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
185185
<location
186186
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
187-
line="26"
187+
line="27"
188188
column="1"/>
189189
</issue>
190190

@@ -195,7 +195,7 @@
195195
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
196196
<location
197197
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
198-
line="27"
198+
line="28"
199199
column="1"/>
200200
</issue>
201201

@@ -205,7 +205,7 @@
205205
errorLine1="import org.gradle.api.internal.file.archive.compression.ArchiveOutputStreamFactory"
206206
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
207207
<location
208-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ZipCompressor.kt"
208+
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor.kt"
209209
line="3"
210210
column="1"/>
211211
</issue>

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

Lines changed: 0 additions & 1 deletion
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.tasks.ZipCompressor
43
import java.io.File
54
import org.apache.tools.zip.Zip64Mode
65
import org.apache.tools.zip.ZipOutputStream

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ZipCompressor.kt‎ renamed to ‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jengelman.gradle.plugins.shadow.tasks
1+
package com.github.jengelman.gradle.plugins.shadow.internal
22

33
import org.gradle.api.internal.file.archive.compression.ArchiveOutputStreamFactory
44

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.github.jengelman.gradle.plugins.shadow.tasks
33
import com.github.jengelman.gradle.plugins.shadow.ShadowStats
44
import com.github.jengelman.gradle.plugins.shadow.impl.RelocatorRemapper
55
import com.github.jengelman.gradle.plugins.shadow.internal.UnusedTracker
6+
import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
67
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
78
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
89
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.DefaultZipCompressor
77
import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter
88
import com.github.jengelman.gradle.plugins.shadow.internal.MinimizeDependencyFilter
99
import com.github.jengelman.gradle.plugins.shadow.internal.UnusedTracker
10+
import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
1011
import com.github.jengelman.gradle.plugins.shadow.relocation.CacheableRelocator
1112
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
1213
import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
@@ -130,7 +131,7 @@ public abstract class ShadowJar :
130131
}
131132

132133
@get:Internal
133-
public val internalCompressor: ZipCompressor
134+
internal val internalCompressor: ZipCompressor
134135
get() {
135136
return when (entryCompression) {
136137
ZipEntryCompression.DEFLATED -> DefaultZipCompressor(isZip64, ZipOutputStream.DEFLATED)

0 commit comments

Comments
 (0)