From e2a06c66cc355627f2999e67c4f55e5c80016906 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 11 Jan 2024 09:57:37 +0100 Subject: [PATCH] [Gradle] Fix warnings in KotlinCompilationSourceSetsContainerFactories ^KT-56904 In Progress --- .../KotlinCompilationSourceSetsContainerFactories.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationSourceSetsContainerFactories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationSourceSetsContainerFactories.kt index c39e3b49699..8d583c26687 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationSourceSetsContainerFactories.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationSourceSetsContainerFactories.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory -import com.android.build.gradle.api.BaseVariant import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet @@ -14,7 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationSourceSetsContainer import org.jetbrains.kotlin.gradle.plugin.sources.android.kotlinAndroidSourceSetLayout -import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName +import org.jetbrains.kotlin.gradle.utils.* internal class DefaultKotlinCompilationSourceSetsContainerFactory( private val defaultSourceSetNaming: DefaultSourceSetNaming = DefaultDefaultSourceSetNaming @@ -41,7 +40,8 @@ internal class DefaultKotlinCompilationSourceSetsContainerFactory( } internal class AndroidCompilationSourceSetsContainerFactory( - private val target: KotlinAndroidTarget, private val variant: BaseVariant + private val target: KotlinAndroidTarget, + @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") private val variant: DeprecatedAndroidBaseVariant ) : KotlinCompilationImplFactory.KotlinCompilationSourceSetsContainerFactory { override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationSourceSetsContainer { val sourceSetName = target.project.kotlinAndroidSourceSetLayout.naming.defaultKotlinSourceSetName(this.target, variant)