From bc7c342003b5d3ca394be3dc3bbfd48444e3807d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 17 Jan 2024 20:52:49 +0100 Subject: [PATCH] [Gradle] Fix warnings in MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker ^KT-56904 In Progress --- .../MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/checker/MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/checker/MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.kt index 60918bccd89..1557807b3f4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/checker/MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/checker/MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.gradle.plugin.sources.android.checker -import com.android.build.gradle.api.AndroidSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.sources.android.KotlinAndroidSourceSetLayout +import org.jetbrains.kotlin.gradle.utils.* /** * Will detect usage of "Android Style" source directories (like 'src/main/kotlin') and emit a warning @@ -23,7 +23,7 @@ internal object MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker : KotlinA target: KotlinAndroidTarget, layout: KotlinAndroidSourceSetLayout, kotlinSourceSet: KotlinSourceSet, - androidSourceSet: AndroidSourceSet + @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") androidSourceSet: DeprecatedAndroidSourceSet ) { if (target.project.kotlinPropertiesProvider.ignoreMppAndroidSourceSetLayoutV2AndroidStyleDirs) return val projectRoot = target.project.rootDir