Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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<ManifestMergeSpec>) {
inheritPaths.forEach { from(it, action) }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ManifestMergeSpec>)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ public open class PreserveFirstFoundResourceTransformer(

@get:Internal protected val found: MutableSet<String> = 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()"),
)
Comment thread
Goooler marked this conversation as resolved.
@get:Input
public open val resources: SetProperty<String> = objectFactory.setProperty()

Expand Down