From 1c7f2b3066ce8be76bd7398d9c8ecdfe325207d3 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 19 Jan 2024 20:59:01 +0100
Subject: [PATCH] [Gradle] Fix warnings in
 Agp7AddKotlinSourcesToAndroidSourceSetConfigurator

^KT-56904 In Progress
---
 ...AddKotlinSourcesToAndroidSourceSetConfigurator.kt | 12 ++++++++----
 .../jetbrains/kotlin/gradle/utils/androidCompat.kt   |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/configurator/Agp7AddKotlinSourcesToAndroidSourceSetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/configurator/Agp7AddKotlinSourcesToAndroidSourceSetConfigurator.kt
index 3a236db9848..ba9e2147ffc 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/configurator/Agp7AddKotlinSourcesToAndroidSourceSetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/configurator/Agp7AddKotlinSourcesToAndroidSourceSetConfigurator.kt
@@ -5,15 +5,19 @@
 
 package org.jetbrains.kotlin.gradle.plugin.sources.android.configurator
 
-import com.android.build.gradle.api.AndroidSourceDirectorySet
-import com.android.build.gradle.api.AndroidSourceSet
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
+import org.jetbrains.kotlin.gradle.utils.*
 
 object Agp7AddKotlinSourcesToAndroidSourceSetConfigurator: KotlinAndroidSourceSetConfigurator {
-    override fun configure(target: KotlinAndroidTarget, kotlinSourceSet: KotlinSourceSet, androidSourceSet: AndroidSourceSet) {
+    override fun configure(
+        target: KotlinAndroidTarget,
+        kotlinSourceSet: KotlinSourceSet,
+        @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet
+    ) {
+        @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
         val androidKotlinSourceDirectorySet = androidSourceSet.javaClass.getMethod("getKotlin")
-            .invoke(androidSourceSet) as AndroidSourceDirectorySet
+            .invoke(androidSourceSet) as DeprecatedAndroidSourceDirectorySet
 
         androidKotlinSourceDirectorySet.setSrcDirs(listOf(target.project.provider { kotlinSourceSet.kotlin.srcDirs }))
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
index e92f80cb144..c886d9c8e48 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
@@ -8,6 +8,7 @@
 package org.jetbrains.kotlin.gradle.utils
 
 internal typealias DeprecatedAndroidSourceSet = com.android.build.gradle.api.AndroidSourceSet
+internal typealias DeprecatedAndroidSourceDirectorySet = com.android.build.gradle.api.AndroidSourceDirectorySet
 internal typealias DeprecatedAndroidBaseVariant = com.android.build.gradle.api.BaseVariant
 internal typealias DeprecatedAndroidApplicationVariant = com.android.build.gradle.api.ApplicationVariant
 internal typealias DeprecatedAndroidLibraryVariant = com.android.build.gradle.api.LibraryVariant