From 77830cc46aea58492b0bd75eec8705a224bf0867 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 28 Dec 2023 10:37:49 +0100
Subject: [PATCH] [Gradle] Fix warnings in KotlinJvmAndroidCompilation

^KT-56904 In Progress
---
 .../plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt | 4 +++-
 .../gradle/targets/jvm/KotlinJvmAndroidCompilation.kt      | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt
index 8c11d6a93fb..33acb75e8d4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilationToRunnableFiles.kt
@@ -24,4 +24,6 @@ internal constructor(compilation: KotlinCompilationImpl) : AbstractKotlinCompila
         set(value) {
             compilation.runtimeDependencyFiles = value
         }
-}
\ No newline at end of file
+}
+
+internal typealias DeprecatedAbstractKotlinCompilationToRunnableFiles<T> = AbstractKotlinCompilationToRunnableFiles<T>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt
index f63877223ed..cafd5b64e56 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilation.kt
@@ -6,7 +6,6 @@
 @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
-import com.android.build.gradle.api.BaseVariant
 import org.gradle.api.Action
 import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
@@ -17,12 +16,14 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationImpl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import org.jetbrains.kotlin.gradle.utils.*
 import javax.inject.Inject
 
+@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
 open class KotlinJvmAndroidCompilation @Inject internal constructor(
     compilation: KotlinCompilationImpl,
-    val androidVariant: BaseVariant
-) : AbstractKotlinCompilationToRunnableFiles<KotlinJvmOptions>(compilation) {
+    val androidVariant: DeprecatedAndroidBaseVariant
+) : DeprecatedAbstractKotlinCompilationToRunnableFiles<KotlinJvmOptions>(compilation) {
 
     override val target: KotlinAndroidTarget = compilation.target as KotlinAndroidTarget