From f89e5d0e8b5af08a4631840d3858cb5e85f7acbe Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 13 Dec 2024 13:18:28 +0100 Subject: [PATCH] Remove deprecated methods from ProguardTask --- .../sgtsilvio/gradle/proguard/ProguardTask.kt | 69 ------------------- 1 file changed, 69 deletions(-) diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/proguard/ProguardTask.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/proguard/ProguardTask.kt index 18b9e4b..9bd6c9d 100644 --- a/src/main/kotlin/io/github/sgtsilvio/gradle/proguard/ProguardTask.kt +++ b/src/main/kotlin/io/github/sgtsilvio/gradle/proguard/ProguardTask.kt @@ -282,75 +282,6 @@ abstract class ProguardTask : JavaExec() { action.execute(library) } - @get:Internal - @get:Deprecated( - "Renamed to reflect that it can contain archive files and/or directories.", ReplaceWith("inputClasspath") - ) - val inJars get() = inputClasspath - - @get:Internal - @get:Deprecated( - "Renamed to reflect that it can contain archive files and/or directories.", ReplaceWith("outputClasspath") - ) - val outJars get() = outputClasspath - - @get:Internal - @get:Deprecated( - "Renamed to reflect that it can contain archive files and/or directories.", ReplaceWith("libraryClasspath") - ) - val libraryJars get() = libraryClasspath - - /** - * Adds input jars with an optional filter. - * - * The order in which the [inJars] and [outJars] methods are called defines the order of the `-injars` and - * `-outjars` arguments. - */ - @Deprecated( - "Inputs and outputs have been refactored to be modifiable whereas this method was add-only.", - ReplaceWith("addInput { classpath.from(files)\nthis.filter.set(filter) }") - ) - fun inJars(files: Any, filter: String = "") { - if (inputOutputGroups.last().outputs.isNotEmpty()) { - addInputOutputGroup {} - } - inputOutputGroups.last().addInput { - classpath.from(files) - this.filter.set(filter) - } - } - - /** - * Adds an output jar with an optional filter. - * - * The order in which the [inJars] and [outJars] methods are called defines the order of the `-injars` and - * `-outjars` arguments. - */ - @Deprecated( - "Inputs and outputs have been refactored to be modifiable whereas this method was add-only.", - ReplaceWith("addOutput { archiveFile.set(file)\nthis.filter.set(filter) }") - ) - fun outJars(file: Any, filter: String = "") { - inputOutputGroups.last().addOutput { - archiveFile.set(project.layout.file(project.files(file).elements.map { it.first().asFile })) - this.filter.set(filter) - } - } - - /** - * Adds library jars with an optional filter. - */ - @Deprecated( - "Inputs and outputs have been refactored to be modifiable whereas this method was add-only.", - ReplaceWith("addLibrary { classpath.from(files)\nthis.filter.set(filter) }") - ) - fun libraryJars(files: Any, filter: String = "") { - addLibrary { - classpath.from(files) - this.filter.set(filter) - } - } - override fun exec() { standardOutput = LineOutputStream { logger.info(it) } errorOutput = LineOutputStream { logger.error(it) }