Skip to content

Commit

Permalink
Enable explicitApi
Browse files Browse the repository at this point in the history
  • Loading branch information
@Goooler
Goooler committed Sep 24, 2024
1 parent 6616c53 commit 7aeb49a
Show file tree
Hide file tree
Showing 37 changed files with 224 additions and 218 deletions.
50 changes: 23 additions & 27 deletions api/shadow.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ public final class com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin :
public fun <init> (Lorg/gradle/api/component/SoftwareComponentFactory;)V
public synthetic fun apply (Ljava/lang/Object;)V
public fun apply (Lorg/gradle/api/Project;)V
public static final fun configureShadowTask (Lorg/gradle/api/Project;Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/tasks/TaskProvider;
}

public final class com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin$Companion {
public final fun configureShadowTask (Lorg/gradle/api/Project;Lorg/gradle/api/artifacts/Configuration;)Lorg/gradle/api/tasks/TaskProvider;
}

public final class com/github/jengelman/gradle/plugins/shadow/ShadowPlugin : org/gradle/api/Plugin {
Expand Down Expand Up @@ -159,7 +161,7 @@ public abstract interface class com/github/jengelman/gradle/plugins/shadow/tasks
public abstract fun inheritFrom ([Ljava/lang/Object;Lorg/gradle/api/Action;)Lcom/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest;
}

public final class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask : org/gradle/api/DefaultTask {
public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask : org/gradle/api/DefaultTask {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask$Companion;
public static final field DESC Ljava/lang/String;
public static final field NAME Ljava/lang/String;
Expand All @@ -171,6 +173,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/tasks/KnowsTask$Co
}

public final class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction : org/gradle/api/internal/file/copy/CopyAction {
public static final field CONSTANT_TIME_FOR_ZIP_ENTRIES J
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$Companion;
public fun execute (Lorg/gradle/api/internal/file/copy/CopyActionProcessingStream;)Lorg/gradle/api/tasks/WorkResult;
}
Expand All @@ -195,7 +198,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAc
}

public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$BaseStreamAction : org/gradle/api/internal/file/CopyActionProcessingStreamAction {
public fun <init> (Lcom/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction;)V
public fun <init> ()V
protected final fun isArchive (Lorg/gradle/api/file/FileCopyDetails;)Z
protected final fun isClass (Lorg/gradle/api/file/FileCopyDetails;)Z
public fun processFile (Lorg/gradle/api/internal/file/copy/FileCopyDetailsInternal;)V
Expand All @@ -204,7 +207,6 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCop
}

public final class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$Companion {
public final fun getCONSTANT_TIME_FOR_ZIP_ENTRIES ()J
}

public final class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction$RelativeArchivePath : org/gradle/api/file/RelativePath {
Expand Down Expand Up @@ -279,7 +281,8 @@ public abstract class com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer$Companion;
public static final field LICENSE_PATH Ljava/lang/String;
public static final field LICENSE_TXT_PATH Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public fun getName ()Ljava/lang/String;
Expand All @@ -288,11 +291,9 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Apach
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer$Companion;
public static final field NOTICE_PATH Ljava/lang/String;
public static final field NOTICE_TXT_PATH Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public final fun getAddHeader ()Z
Expand Down Expand Up @@ -321,9 +322,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Apach
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
Expand Down Expand Up @@ -364,7 +362,14 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/DontI
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer$Companion;
public static final field EXTENSION_CLASSES_KEY Ljava/lang/String;
public static final field GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH Ljava/lang/String;
public static final field GROOVY_LEGACY_EXTENSION_MODULE_DESCRIPTOR_PATH Ljava/lang/String;
public static final field MERGED_MODULE_NAME Ljava/lang/String;
public static final field MERGED_MODULE_VERSION Ljava/lang/String;
public static final field MODULE_NAME_KEY Ljava/lang/String;
public static final field MODULE_VERSION_KEY Ljava/lang/String;
public static final field STATIC_EXTENSION_CLASSES_KEY Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public fun getName ()Ljava/lang/String;
Expand All @@ -373,9 +378,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Groov
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/IncludeResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public field file Ljava/io/File;
public field resource Ljava/lang/String;
Expand All @@ -392,7 +394,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Inclu
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformer$Companion;
public static final field PLUGIN_CACHE_FILE Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public fun getName ()Ljava/lang/String;
Expand All @@ -401,9 +403,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Log4j
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public fun <init> ()V
public final fun append (Ljava/lang/String;Ljava/lang/Comparable;)Lcom/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformer;
Expand Down Expand Up @@ -439,7 +438,7 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/NoOpT
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer$Companion;
public static final field PROPERTIES_SUFFIX Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public final fun getCharset ()Ljava/nio/charset/Charset;
Expand All @@ -460,11 +459,9 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Prope
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer, org/gradle/api/tasks/util/PatternFilterable {
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer$Companion;
public static final field GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATTERN Ljava/lang/String;
public static final field SERVICES_PATTERN Ljava/lang/String;
public fun <init> ()V
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
public fun exclude (Lgroovy/lang/Closure;)Lorg/gradle/api/tasks/util/PatternFilterable;
Expand All @@ -486,9 +483,6 @@ public final class com/github/jengelman/gradle/plugins/shadow/transformers/Servi
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer$Companion {
}

public final class com/github/jengelman/gradle/plugins/shadow/transformers/ServiceFileTransformer$ServiceStream : java/io/ByteArrayOutputStream {
public fun <init> ()V
public final fun append (Ljava/io/InputStream;)V
Expand All @@ -510,13 +504,15 @@ 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;Ljava/util/List;Lcom/github/jengelman/gradle/plugins/shadow/ShadowStats;)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 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 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;
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ java {
}

kotlin {
explicitApi()
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
}

Expand Down
20 changes: 10 additions & 10 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/DependencyFilter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,49 @@ import org.gradle.api.artifacts.ResolvedDependency
import org.gradle.api.file.FileCollection
import org.gradle.api.specs.Spec

interface DependencyFilter {
public interface DependencyFilter {
/**
* Resolve a FileCollection against the include/exclude rules in the filter
*/
fun resolve(configuration: FileCollection): FileCollection
public fun resolve(configuration: FileCollection): FileCollection

/**
* Resolve all FileCollections against the include/exclude ruels in the filter and combine the results
*/
fun resolve(configurations: Collection<FileCollection>): FileCollection
public fun resolve(configurations: Collection<FileCollection>): FileCollection

/**
* Exclude dependencies that match the provided spec.
*/
fun exclude(spec: Spec<ResolvedDependency>): DependencyFilter
public fun exclude(spec: Spec<ResolvedDependency>): DependencyFilter

/**
* Include dependencies that match the provided spec.
*/
fun include(spec: Spec<ResolvedDependency>): DependencyFilter
public fun include(spec: Spec<ResolvedDependency>): DependencyFilter

/**
* Create a spec that matches the provided project notation on group, name, and version
*/
fun project(notation: Map<String, *>): Spec<ResolvedDependency>
public fun project(notation: Map<String, *>): Spec<ResolvedDependency>

/**
* Create a spec that matches the default configuration for the provided project path on group, name, and version
*/
fun project(notation: String): Spec<ResolvedDependency>
public fun project(notation: String): Spec<ResolvedDependency>

/**
* Create a spec that matches dependencies using the provided notation on group, name, and version
*/
fun dependency(notation: Any): Spec<ResolvedDependency>
public fun dependency(notation: Any): Spec<ResolvedDependency>

/**
* Create a spec that matches the provided dependency on group, name, and version
*/
fun dependency(dependency: Dependency): Spec<ResolvedDependency>
public fun dependency(dependency: Dependency): Spec<ResolvedDependency>

/**
* Create a spec that matches the provided closure
*/
fun dependency(spec: Closure<*>): Spec<ResolvedDependency>
public fun dependency(spec: Closure<*>): Spec<ResolvedDependency>
}
10 changes: 5 additions & 5 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.application.CreateStartScripts
import org.gradle.jvm.toolchain.JavaToolchainService

class ShadowApplicationPlugin : Plugin<Project> {
public class ShadowApplicationPlugin : Plugin<Project> {
private val shadowJar: TaskProvider<ShadowJar>
get() = project.tasks.named(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME, ShadowJar::class.java)

Expand Down Expand Up @@ -134,9 +134,9 @@ class ShadowApplicationPlugin : Plugin<Project> {
}
}

companion object {
const val SHADOW_RUN_TASK_NAME = "runShadow"
const val SHADOW_SCRIPTS_TASK_NAME = "startShadowScripts"
const val SHADOW_INSTALL_TASK_NAME = "installShadowDist"
public companion object {
public const val SHADOW_RUN_TASK_NAME: String = "runShadow"
public const val SHADOW_SCRIPTS_TASK_NAME: String = "startShadowScripts"
public const val SHADOW_INSTALL_TASK_NAME: String = "installShadowDist"
}
}
10 changes: 5 additions & 5 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.util.GradleVersion

class ShadowBasePlugin : Plugin<Project> {
public class ShadowBasePlugin : Plugin<Project> {
override fun apply(project: Project) {
if (GradleVersion.current() < GradleVersion.version("8.3")) {
throw GradleException("This version of Shadow supports Gradle 8.3+ only. Please upgrade.")
Expand All @@ -21,9 +21,9 @@ class ShadowBasePlugin : Plugin<Project> {
}
}

companion object {
const val EXTENSION_NAME: String = "shadow"
const val CONFIGURATION_NAME: String = "shadow"
const val COMPONENT_NAME: String = "shadow"
public companion object {
public const val EXTENSION_NAME: String = "shadow"
public const val CONFIGURATION_NAME: String = "shadow"
public const val COMPONENT_NAME: String = "shadow"
}
}
4 changes: 2 additions & 2 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowExtension.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import org.gradle.api.Project
import org.gradle.api.publish.maven.MavenPublication

@Deprecated("This is deprecated since 8.3.2")
abstract class ShadowExtension(project: Project) {
public abstract class ShadowExtension(project: Project) {
private val components = project.components

@Deprecated(
message = "configure publication using component.shadow directly.",
replaceWith = ReplaceWith("publication.from(components.getByName(\"shadow\"))"),
)
fun component(publication: MavenPublication) {
public fun component(publication: MavenPublication) {
publication.from(components.findByName("shadow"))
}
}
13 changes: 7 additions & 6 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.gradle.api.tasks.TaskProvider
import org.gradle.jvm.tasks.Jar
import org.gradle.plugin.devel.plugins.JavaGradlePluginPlugin

class ShadowJavaPlugin @Inject constructor(
public class ShadowJavaPlugin @Inject constructor(
private val softwareComponentFactory: SoftwareComponentFactory,
) : Plugin<Project> {

Expand Down Expand Up @@ -72,12 +72,13 @@ class ShadowJavaPlugin @Inject constructor(
}
}

companion object {
const val SHADOW_JAR_TASK_NAME = "shadowJar"
const val SHADOW_GROUP = "Shadow"
const val SHADOW_RUNTIME_ELEMENTS_CONFIGURATION_NAME = "shadowRuntimeElements"
public companion object {
public const val SHADOW_JAR_TASK_NAME: String = "shadowJar"
public const val SHADOW_GROUP: String = "Shadow"
public const val SHADOW_RUNTIME_ELEMENTS_CONFIGURATION_NAME: String = "shadowRuntimeElements"

fun configureShadowTask(
@JvmStatic
public fun configureShadowTask(
project: Project,
shadowConfiguration: Configuration,
): TaskProvider<ShadowJar> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.api.Project
import org.gradle.api.plugins.ApplicationPlugin
import org.gradle.api.plugins.JavaPlugin

class ShadowPlugin : Plugin<Project> {
public class ShadowPlugin : Plugin<Project> {

override fun apply(project: Project) {
with(project.plugins) {
Expand Down
Loading

0 comments on commit 7aeb49a

Please sign in to comment.