From 09a6f95a153841d65724d862450b4f6b2cba719a Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 28 Dec 2023 10:47:01 +0100 Subject: [PATCH] [Gradle] Fix warnings in KotlinJvmCompilation ^KT-56904 In Progress --- .../org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt | 5 ++++- .../kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index b3d5a3b1795..692a3867472 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -194,4 +194,7 @@ val KotlinCompilation.runtimeDependencyCo @Deprecated("Scheduled for removal with Kotlin 2.0") interface KotlinCompilationWithResources : KotlinCompilation { val processResourcesTaskName: String -} \ No newline at end of file +} + +@Suppress("Deprecation") +typealias DeprecatedKotlinCompilationWithResources = KotlinCompilationWithResources diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt index fd51355c4ca..e2a25621813 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilation.kt @@ -25,10 +25,11 @@ import org.jetbrains.kotlin.gradle.utils.Future import org.jetbrains.kotlin.gradle.utils.lenient import javax.inject.Inject +@Suppress("TYPEALIAS_EXPANSION_DEPRECATION") open class KotlinJvmCompilation @Inject internal constructor( compilation: KotlinCompilationImpl, -) : AbstractKotlinCompilationToRunnableFiles(compilation), - KotlinCompilationWithResources { +) : DeprecatedAbstractKotlinCompilationToRunnableFiles(compilation), + DeprecatedKotlinCompilationWithResources { final override val target: KotlinJvmTarget = compilation.target as KotlinJvmTarget