From 98212a7c4a8a636fe0c315be30be3aee53bda3c8 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 29 Jun 2026 09:25:07 +0800 Subject: [PATCH] Refine deprecations --- .../plugins/shadow/internal/DefaultInheritManifest.kt | 1 + .../gradle/plugins/shadow/tasks/InheritManifest.kt | 10 +++++++--- .../gradle/plugins/shadow/tasks/ShadowCopyAction.kt | 4 +++- .../PreserveFirstFoundResourceTransformer.kt | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt index 887a26419..f3a953320 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt @@ -21,6 +21,7 @@ internal class DefaultInheritManifest( private val internalManifest: Manifest = manifest ?: DefaultManifest(fileResolver), ) : InheritManifest, Manifest by internalManifest { + @Suppress("OVERRIDE_DEPRECATION") override fun inheritFrom(vararg inheritPaths: Any, action: Action) { inheritPaths.forEach { from(it, action) } } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.kt index fef8d50ff..b8ba3428d 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.kt @@ -5,17 +5,21 @@ import org.gradle.api.java.archives.Manifest import org.gradle.api.java.archives.ManifestMergeSpec @Deprecated( - message = "This is deprecated and will be removed in a future release.", + message = "Use `Manifest` instead. This will be removed in Shadow 10.", replaceWith = ReplaceWith("Manifest", "org.gradle.api.java.archives.Manifest"), ) public interface InheritManifest : Manifest { @Deprecated( - message = "This is deprecated and will be removed in a future release.", + message = "Use `from` instead. This will be removed in Shadow 10.", replaceWith = ReplaceWith("from"), ) public fun inheritFrom(vararg inheritPaths: Any) { - inheritFrom(inheritPaths = inheritPaths, action = {}) + @Suppress("DEPRECATION") inheritFrom(inheritPaths = inheritPaths, action = {}) } + @Deprecated( + "Use `from` instead. This will be removed in Shadow 10.", + replaceWith = ReplaceWith("from"), + ) public fun inheritFrom(vararg inheritPaths: Any, action: Action) } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt index a4979caf5..fd8f98dfd 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt @@ -37,7 +37,9 @@ import org.gradle.api.tasks.WorkResults * [org.gradle.api.internal.file.archive.ZipCopyAction.java](https://github.com/gradle/gradle/blob/b893c2b085046677cf858fb3d5ce00e68e556c3a/platforms/core-configuration/file-operations/src/main/java/org/gradle/api/internal/file/archive/ZipCopyAction.java). */ public open class ShadowCopyAction -@Deprecated("This should not be used as a public API. Will be made internal in a future release.") +@Deprecated( + "This constructor should not be used as a public API. Will be made internal in Shadow 10." +) constructor( private val zipFile: File, private val zosProvider: (File) -> ZipOutputStream, diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PreserveFirstFoundResourceTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PreserveFirstFoundResourceTransformer.kt index 7fad8bf0e..d4b71abea 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PreserveFirstFoundResourceTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PreserveFirstFoundResourceTransformer.kt @@ -40,7 +40,10 @@ public open class PreserveFirstFoundResourceTransformer( @get:Internal protected val found: MutableSet = mutableSetOf() - @get:Deprecated("Use `include(..)` instead") // TODO: remove this in Shadow 10. + @get:Deprecated( + message = "Use `include(..)` instead. This will be removed in Shadow 10.", + replaceWith = ReplaceWith("include()"), + ) @get:Input public open val resources: SetProperty = objectFactory.setProperty()