Undeprecate 'kotlinOptions' DSL
'@ReplaceWith' is not that flexible in this case and proper IDE support required for smooth migration. After such migration in IDE will be added - deprecation should be restored. ^KT-54399 Fixed
This commit is contained in:
committed by
teamcity
parent
a244aaf162
commit
860d3fda95
-10
@@ -23,11 +23,6 @@ interface KotlinNativeArtifact : KotlinArtifact {
|
||||
val modes: Set<NativeBuildType>
|
||||
val isStatic: Boolean
|
||||
val linkerOptions: List<String>
|
||||
@Suppress("DEPRECATION")
|
||||
@Deprecated(
|
||||
message = "Replaced by toolOptionsConfigure",
|
||||
replaceWith = ReplaceWith("toolOptionsConfigure")
|
||||
)
|
||||
val kotlinOptionsFn: KotlinCommonToolOptions.() -> Unit
|
||||
val toolOptionsConfigure: KotlinCommonCompilerToolOptions.() -> Unit
|
||||
val binaryOptions: Map<String, String>
|
||||
@@ -65,11 +60,6 @@ interface KotlinNativeArtifactConfig : KotlinArtifactConfig {
|
||||
fun modes(vararg modes: NativeBuildType)
|
||||
var isStatic: Boolean
|
||||
var linkerOptions: List<String>
|
||||
@Suppress("DEPRECATION")
|
||||
@Deprecated(
|
||||
message = "Replaced with toolOptions()",
|
||||
replaceWith = ReplaceWith("toolOptions(fn)")
|
||||
)
|
||||
fun kotlinOptions(fn: Action<KotlinCommonToolOptions>)
|
||||
fun toolOptions(configure: Action<KotlinCommonCompilerToolOptions>)
|
||||
fun binaryOption(name: String, value: String)
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinCommonCompilerOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
|
||||
override val options: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
|
||||
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinCommonCompilerToolOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinCommonToolOptions {
|
||||
val options: org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerToolOptions
|
||||
|
||||
|
||||
-20
@@ -10,35 +10,15 @@ import org.gradle.api.Action
|
||||
import org.gradle.api.Task
|
||||
import org.gradle.api.tasks.Internal
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by KotlinCompilationTask",
|
||||
replaceWith = ReplaceWith(
|
||||
"KotlinCompilationTask",
|
||||
"org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask"
|
||||
)
|
||||
)
|
||||
@Suppress("DEPRECATION")
|
||||
interface KotlinCompile<out T : KotlinCommonOptions> : Task {
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions input",
|
||||
replaceWith = ReplaceWith("compilerOptions")
|
||||
)
|
||||
@get:Internal
|
||||
val kotlinOptions: T
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions { .. }",
|
||||
replaceWith = ReplaceWith("compilerOptions(fn)")
|
||||
)
|
||||
fun kotlinOptions(fn: T.() -> Unit) {
|
||||
kotlinOptions.fn()
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions(Action)",
|
||||
replaceWith = ReplaceWith("compilerOptions(fn)")
|
||||
)
|
||||
fun kotlinOptions(fn: Action<in T>) {
|
||||
fn.execute(kotlinOptions)
|
||||
}
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinJsDceCompilerToolOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinJsDceOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions {
|
||||
override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJsDceCompilerToolOptions
|
||||
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinJsCompilerOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
|
||||
override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptions
|
||||
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinJvmCompilerOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
|
||||
override val options: org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
|
||||
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.gradle.dsl
|
||||
|
||||
@Deprecated("Use KotlinMultiplatformCommonCompilerOptions instead", level = DeprecationLevel.WARNING)
|
||||
interface KotlinMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions {
|
||||
override val options: org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptions
|
||||
}
|
||||
|
||||
-12
@@ -70,25 +70,13 @@ interface KotlinCompilation<out T : KotlinCommonOptionsDeprecated> : Named,
|
||||
|
||||
val compileTaskProvider: TaskProvider<out KotlinCompilationTask<*>>
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions",
|
||||
replaceWith = ReplaceWith("compilerOptions.options")
|
||||
)
|
||||
val kotlinOptions: T
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions.configure { }",
|
||||
replaceWith = ReplaceWith("compilerOptions.configure(configure)")
|
||||
)
|
||||
fun kotlinOptions(configure: T.() -> Unit) {
|
||||
@Suppress("DEPRECATION")
|
||||
configure(kotlinOptions)
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
message = "Replaced by compilerOptions(Action)",
|
||||
replaceWith = ReplaceWith("compilerOptions.configure(configure)")
|
||||
)
|
||||
fun kotlinOptions(configure: Action<@UnsafeVariance T>) {
|
||||
@Suppress("DEPRECATION")
|
||||
configure.execute(kotlinOptions)
|
||||
|
||||
Reference in New Issue
Block a user