[Gradle] Deprecate KotlinCompile DSL

^KT-63419 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-23 16:23:17 +01:00
committed by Space Team
parent 2f70478e67
commit 24acf800d6
6 changed files with 16 additions and 10 deletions
@@ -22,6 +22,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
* *
* @see [KotlinCommonOptions] * @see [KotlinCommonOptions]
*/ */
@Deprecated(
message = "Replaced with 'KotlinCompilationTask' that exposes the compiler options DSL. More details are here: https://kotl.in/u1r8ln"
)
@KotlinGradlePluginDsl @KotlinGradlePluginDsl
interface KotlinCompile<out T : KotlinCommonOptions> : Task { interface KotlinCompile<out T : KotlinCommonOptions> : Task {
@@ -20,9 +20,12 @@ 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.KotlinJvmCompile as KotlinJvmCompileApi import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile as KotlinJvmCompileApi
interface KotlinJsCompile : KotlinCompile<KotlinJsOptions> @Suppress("DEPRECATION")
interface KotlinJsCompile : KotlinCompile<KotlinJsOptions>,
KotlinCompilationTask<KotlinJsCompilerOptions>
@Deprecated( @Deprecated(
message = "Moved into API artifact", message = "Moved into API artifact",
@@ -30,7 +33,13 @@ interface KotlinJsCompile : KotlinCompile<KotlinJsOptions>
) )
interface KotlinJvmCompile : KotlinJvmCompileApi interface KotlinJvmCompile : KotlinJvmCompileApi
interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions> @Suppress("DEPRECATION")
internal interface KotlinNativeCompileTask : KotlinCompile<KotlinCommonOptions>,
KotlinCompilationTask<KotlinNativeCompilerOptions>
@Suppress("DEPRECATION")
interface KotlinCommonCompile : KotlinCompile<KotlinMultiplatformCommonOptions>,
KotlinCompilationTask<KotlinMultiplatformCommonCompilerOptions>
interface KotlinJsDce : Task { interface KotlinJsDce : Task {
@get:Internal @get:Internal
@@ -6,7 +6,6 @@
@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
package org.jetbrains.kotlin.gradle.tasks package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.Action
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.* import org.gradle.api.artifacts.*
@@ -28,7 +27,6 @@ import org.jetbrains.kotlin.cli.common.arguments.*
import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.compilerRunner.KotlinNativeCInteropRunner.Companion.run import org.jetbrains.kotlin.compilerRunner.KotlinNativeCInteropRunner.Companion.run
import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
import org.jetbrains.kotlin.gradle.internal.isInIdeaSync import org.jetbrains.kotlin.gradle.internal.isInIdeaSync
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -277,13 +275,12 @@ internal constructor(
final override val compilation: KotlinCompilationInfo, final override val compilation: KotlinCompilationInfo,
override val compilerOptions: KotlinNativeCompilerOptions, override val compilerOptions: KotlinNativeCompilerOptions,
private val objectFactory: ObjectFactory, private val objectFactory: ObjectFactory,
private val providerFactory: ProviderFactory, providerFactory: ProviderFactory,
private val execOperations: ExecOperations, private val execOperations: ExecOperations,
) : AbstractKotlinNativeCompile<KotlinCommonOptions, K2NativeCompilerArguments>(objectFactory), ) : AbstractKotlinNativeCompile<KotlinCommonOptions, K2NativeCompilerArguments>(objectFactory),
KotlinCompile<KotlinCommonOptions>, KotlinNativeCompileTask,
K2MultiplatformCompilationTask, K2MultiplatformCompilationTask,
UsesBuildMetricsService, UsesBuildMetricsService,
KotlinCompilationTask<KotlinNativeCompilerOptions>,
UsesBuildFusService, UsesBuildFusService,
UsesKotlinNativeBundleBuildService { UsesKotlinNativeBundleBuildService {
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.tasks.Nested import org.gradle.api.tasks.Nested
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
/** /**
* Analogous to [KotlinCompilationTask] for K2 * Analogous to [KotlinCompilationTask] for K2
@@ -50,7 +50,6 @@ abstract class Kotlin2JsCompile @Inject constructor(
objectFactory: ObjectFactory, objectFactory: ObjectFactory,
workerExecutor: WorkerExecutor, workerExecutor: WorkerExecutor,
) : AbstractKotlinCompile<K2JSCompilerArguments>(objectFactory, workerExecutor), ) : AbstractKotlinCompile<K2JSCompilerArguments>(objectFactory, workerExecutor),
KotlinCompilationTask<KotlinJsCompilerOptions>,
UsesLibraryFilterCachingService, UsesLibraryFilterCachingService,
UsesBuildFusService, UsesBuildFusService,
KotlinJsCompile, KotlinJsCompile,
@@ -44,7 +44,6 @@ abstract class KotlinCompileCommon @Inject constructor(
workerExecutor: WorkerExecutor, workerExecutor: WorkerExecutor,
objectFactory: ObjectFactory objectFactory: ObjectFactory
) : AbstractKotlinCompile<K2MetadataCompilerArguments>(objectFactory, workerExecutor), ) : AbstractKotlinCompile<K2MetadataCompilerArguments>(objectFactory, workerExecutor),
KotlinCompilationTask<KotlinMultiplatformCommonCompilerOptions>,
KotlinCommonCompile { KotlinCommonCompile {
init { init {