Skip to content

Commit 6a80286

Browse files
GooolerGoooler
authored
Move DependencyFilter into tasks package (#1272)
It should be a public API.
1 parent b9503bb commit 6a80286

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

‎api/shadow.api‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +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 abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter : java/io/Serializable {
68-
public abstract fun dependency (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
69-
public abstract fun dependency (Lorg/gradle/api/artifacts/Dependency;)Lorg/gradle/api/specs/Spec;
70-
public abstract fun exclude (Lorg/gradle/api/specs/Spec;)Lcom/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter;
71-
public abstract fun include (Lorg/gradle/api/specs/Spec;)Lcom/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter;
72-
public abstract fun project (Ljava/lang/String;)Lorg/gradle/api/specs/Spec;
73-
public abstract fun project (Ljava/util/Map;)Lorg/gradle/api/specs/Spec;
74-
public abstract fun resolve (Ljava/util/Collection;)Lorg/gradle/api/file/FileCollection;
75-
public abstract fun resolve (Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/file/FileCollection;
76-
}
77-
7867
public abstract interface class com/github/jengelman/gradle/plugins/shadow/internal/ZipCompressor {
7968
public abstract fun createArchiveOutputStream (Ljava/io/File;)Lorg/apache/tools/zip/ZipOutputStream;
8069
}
@@ -168,6 +157,17 @@ public class com/github/jengelman/gradle/plugins/shadow/tasks/DefaultInheritMani
168157
public fun writeTo (Ljava/lang/Object;)Lorg/gradle/api/java/archives/Manifest;
169158
}
170159

160+
public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter : java/io/Serializable {
161+
public abstract fun dependency (Ljava/lang/Object;)Lorg/gradle/api/specs/Spec;
162+
public abstract fun dependency (Lorg/gradle/api/artifacts/Dependency;)Lorg/gradle/api/specs/Spec;
163+
public abstract fun exclude (Lorg/gradle/api/specs/Spec;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter;
164+
public abstract fun include (Lorg/gradle/api/specs/Spec;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter;
165+
public abstract fun project (Ljava/lang/String;)Lorg/gradle/api/specs/Spec;
166+
public abstract fun project (Ljava/util/Map;)Lorg/gradle/api/specs/Spec;
167+
public abstract fun resolve (Ljava/util/Collection;)Lorg/gradle/api/file/FileCollection;
168+
public abstract fun resolve (Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/file/FileCollection;
169+
}
170+
171171
public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest : org/gradle/api/java/archives/Manifest {
172172
public abstract fun inheritFrom ([Ljava/lang/Object;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;
173173
public abstract fun inheritFrom ([Ljava/lang/Object;Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;

‎src/docs/changes/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
- **BREAKING CHANGE:** Move tracking unused classes logic out of `ShadowCopyAction`. ([#1257](https://github.com/GradleUp/shadow/pull/1257))
1313
- Reduce duplicated `SimpleRelocator` to improve performance. ([#1271](https://github.com/GradleUp/shadow/pull/1271))
14+
- **BREAKING CHANGE:** Move `DependencyFilter` from `com.github.jengelman.gradle.plugins.shadow.internal` into `com.github.jengelman.gradle.plugins.shadow.tasks`. ([#1272](https://github.com/GradleUp/shadow/pull/1272))
1415

1516
**Removed**
1617

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

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

3+
import com.github.jengelman.gradle.plugins.shadow.tasks.DependencyFilter
34
import org.gradle.api.Project
45
import org.gradle.api.artifacts.Configuration
56
import org.gradle.api.artifacts.Dependency

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DependencyFilter.kt‎ renamed to ‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/DependencyFilter.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.internal
1+
package com.github.jengelman.gradle.plugins.shadow.tasks
22

33
import java.io.Serializable
44
import org.gradle.api.artifacts.Configuration

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.github.jengelman.gradle.plugins.shadow.tasks
33
import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin
44
import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter
55
import com.github.jengelman.gradle.plugins.shadow.internal.DefaultZipCompressor
6-
import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter
76
import com.github.jengelman.gradle.plugins.shadow.internal.MinimizeDependencyFilter
87
import com.github.jengelman.gradle.plugins.shadow.internal.UnusedTracker
98
import com.github.jengelman.gradle.plugins.shadow.internal.ZipCompressor
@@ -15,6 +14,7 @@ import com.github.jengelman.gradle.plugins.shadow.internal.sourceSets
1514
import com.github.jengelman.gradle.plugins.shadow.relocation.CacheableRelocator
1615
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
1716
import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
17+
import com.github.jengelman.gradle.plugins.shadow.tasks.DependencyFilter
1818
import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
1919
import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer
2020
import com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer

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

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

3-
import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter
43
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
54
import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
5+
import com.github.jengelman.gradle.plugins.shadow.tasks.DependencyFilter
66
import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer
77
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
88
import java.lang.reflect.InvocationTargetException

0 commit comments

Comments
 (0)