azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Deprecate dceOptions in KotlinJsDce task

Browse Source 
^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-23 17:26:29 +01:00
committed by Space Team
parent 24acf800d6
commit 4921a29aa5
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
-1
View File
@@ -267,7 +267,6 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinCompile$DefaultImpls {
} }
public final class org/jetbrains/kotlin/gradle/dsl/KotlinCompileKt { public final class org/jetbrains/kotlin/gradle/dsl/KotlinCompileKt {
public static final field KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE Ljava/lang/String;
} }
public abstract interface annotation class org/jetbrains/kotlin/gradle/dsl/KotlinGradlePluginDsl : java/lang/annotation/Annotation { public abstract interface annotation class org/jetbrains/kotlin/gradle/dsl/KotlinGradlePluginDsl : java/lang/annotation/Annotation {
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
+1 -1
View File
@@ -71,4 +71,4 @@ const val KOTLIN_OPTIONS_DEPRECATION_MESSAGE = "Please migrate to the compilerOp
* @suppress * @suppress
*/ */
@InternalKotlinGradlePluginApi @InternalKotlinGradlePluginApi
const val KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE = "Please migrate to toolOptions DSL. More details are here: https://kotl.in/u1r8ln" const val KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE = "Please migrate to the toolOptions DSL. More details are here: https://kotl.in/u1r8ln"
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt
+9 -9
View File
@@ -16,11 +16,11 @@
package org.jetbrains.kotlin.gradle.dsl package org.jetbrains.kotlin.gradle.dsl
import groovy.lang.Closure
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Internal
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
import org.jetbrains.kotlin.gradle.tasks.KotlinToolTask
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile as KotlinJvmCompileApi import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile as KotlinJvmCompileApi
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@@ -41,21 +41,21 @@ internal interface KotlinNativeCompileTask : KotlinCompile<KotlinCommonOptions>,
interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions>, interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions>,
KotlinCompilationTask<KotlinMultiplatformCommonCompilerOptions> KotlinCompilationTask<KotlinMultiplatformCommonCompilerOptions>
interface KotlinJsDce : Task { interface KotlinJsDce : Task, KotlinToolTask<KotlinJsDceCompilerToolOptions> {
@Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
@get:Internal @get:Internal
val dceOptions: KotlinJsDceOptions val dceOptions: KotlinJsDceOptions
@get:Input @Suppress("DEPRECATION")
val keep: MutableList<String> @Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
fun dceOptions(fn: KotlinJsDceOptions.() -> Unit) { fun dceOptions(fn: KotlinJsDceOptions.() -> Unit) {
dceOptions.fn() dceOptions.fn()
} }
fun dceOptions(fn: Closure<*>) { @get:Input
fn.delegate = dceOptions val keep: MutableList<String>
fn.call()
}
fun keep(vararg fqn: String) fun keep(vararg fqn: String)
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
+1 -1
View File
@@ -43,7 +43,6 @@ import javax.inject.Inject
abstract class KotlinJsDce @Inject constructor( abstract class KotlinJsDce @Inject constructor(
objectFactory: ObjectFactory objectFactory: ObjectFactory
) : AbstractKotlinCompileTool<K2JSDceArguments>(objectFactory), ) : AbstractKotlinCompileTool<K2JSDceArguments>(objectFactory),
KotlinToolTask<KotlinJsDceCompilerToolOptions>,
KotlinJsDce { KotlinJsDce {
init { init {
@@ -68,6 +67,7 @@ abstract class KotlinJsDce @Inject constructor(
@Internal @Internal
var kotlinFilesOnly: Boolean = false var kotlinFilesOnly: Boolean = false
@Deprecated(KOTLIN_OPTIONS_AS_TOOLS_DEPRECATION_MESSAGE)
@get:Internal @get:Internal
override val dceOptions: KotlinJsDceOptions = object : KotlinJsDceOptions { override val dceOptions: KotlinJsDceOptions = object : KotlinJsDceOptions {
override val options: KotlinJsDceCompilerToolOptions override val options: KotlinJsDceCompilerToolOptions