From 5ed28a6a79696089ef3cdf3f1fff4f4068d337f5 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 15 Jan 2024 10:39:59 +0100 Subject: [PATCH] [Gradle] Fix warnings in KotlinAndroidSourceSetNaming ^KT-56904 In Progress --- .../plugin/sources/android/KotlinAndroidSourceSetNaming.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetNaming.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetNaming.kt index 7c5dc8e1ab9..4867cdeaeca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetNaming.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/KotlinAndroidSourceSetNaming.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.plugin.sources.android -import com.android.build.gradle.api.BaseVariant import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget +import org.jetbrains.kotlin.gradle.utils.* internal interface KotlinAndroidSourceSetNaming { @@ -25,5 +25,8 @@ internal interface KotlinAndroidSourceSetNaming { * Returns `null`, if this naming schema does not know about it. In this case, the * 'default' defaultSourceSetName will be constructed by the compilation. */ - fun defaultKotlinSourceSetName(target: KotlinAndroidTarget, variant: BaseVariant): String? = null + fun defaultKotlinSourceSetName( + target: KotlinAndroidTarget, + @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") variant: DeprecatedAndroidBaseVariant + ): String? = null }