From e72704ce866956c0fd16027bc69832ebe2bdeac0 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 8 Feb 2024 21:58:53 +0100
Subject: [PATCH] [Gradle] Fix warnings in ConfigureBuildSideEffect

^KT-56904 In Progress
---
 .../jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt    | 3 +++
 .../kotlin/gradle/targets/ConfigureBuildSideEffect.kt      | 7 +++----
 2 files changed, 6 insertions(+), 4 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 692a3867472..8caea8947e9 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
@@ -186,6 +186,9 @@ interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptionsDeprecated> :
     override var runtimeDependencyFiles: FileCollection
 }
 
+@Suppress("Deprecation")
+typealias DeprecatedKotlinCompilationToRunnableFiles<T> = KotlinCompilationToRunnableFiles<T>
+
 @Deprecated("Scheduled for removal with Kotlin 2.0")
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER", "deprecation") // kept for compatibility
 val <T : KotlinCommonOptionsDeprecated> KotlinCompilation<T>.runtimeDependencyConfigurationName: String?
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/ConfigureBuildSideEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/ConfigureBuildSideEffect.kt
index f0e1072485c..4d052c13e6c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/ConfigureBuildSideEffect.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/ConfigureBuildSideEffect.kt
@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.gradle.targets
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.tasks.TaskProvider
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles
+import org.jetbrains.kotlin.gradle.plugin.*
 
+@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
 internal val ConfigureBuildSideEffect = KotlinTargetSideEffect { target ->
     val project = target.project
 
@@ -18,8 +18,7 @@ internal val ConfigureBuildSideEffect = KotlinTargetSideEffect { target ->
     val buildDependent = project.tasks.named(JavaBasePlugin.BUILD_DEPENDENTS_TASK_NAME)
 
     val testCompilation = target.compilations.findByName(KotlinCompilation.TEST_COMPILATION_NAME)
-    @Suppress("DEPRECATION")
-    if (testCompilation is KotlinCompilationToRunnableFiles) {
+    if (testCompilation is DeprecatedKotlinCompilationToRunnableFiles) {
         addDependsOnTaskInOtherProjects(project, buildNeeded, true, testCompilation.runtimeDependencyConfigurationName)
         addDependsOnTaskInOtherProjects(project, buildDependent, false, testCompilation.runtimeDependencyConfigurationName)
     }