From 5b6363b0df9ac88ae28b365897b923239028c9f2 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 20 Dec 2023 22:27:11 +0100
Subject: [PATCH] [Gradle] Fix warnings in KotlinAndroidTarget

^KT-56904 In Progress
---
 .../gradle/targets/android/KotlinAndroidTarget.kt    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
index 21d58c6e141..2e0310f3b0b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/android/KotlinAndroidTarget.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.*
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.attributes.Attribute
@@ -145,14 +144,15 @@ abstract class KotlinAndroidTarget @Inject constructor(
         KotlinAndroidPlugin.androidTargetHandler().doCreateComponents()
     }
 
-    private fun isVariantPublished(variant: BaseVariant): Boolean {
-        return publishLibraryVariants?.contains(getVariantName(variant)) ?: true
-    }
+    private fun isVariantPublished(
+        @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant
+    ): Boolean = publishLibraryVariants?.contains(getVariantName(variant)) ?: true
 
     private fun AndroidProjectHandler.doCreateComponents(): Set<KotlinTargetComponent> {
         assert(project.state.executed) { "Android: doCreateComponents requires 'afterEvaluate' based project state" }
 
-        val publishableVariants = mutableListOf<BaseVariant>()
+        @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
+        val publishableVariants = mutableListOf<DeprecatedAndroidBaseVariant>()
             .apply { project.forAllAndroidVariants { add(it) } }
             .toList() // Defensive copy against unlikely modification by the lambda that captures the list above in forEachVariant { }
             .filter { getLibraryOutputTask(it) != null }
@@ -209,7 +209,7 @@ abstract class KotlinAndroidTarget @Inject constructor(
     }
 
     private fun AndroidProjectHandler.createAndroidUsageContexts(
-        variant: BaseVariant,
+        @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant,
         compilation: KotlinCompilation<*>,
         isSingleBuildType: Boolean,
     ): Set<DefaultKotlinUsageContext> {