From 96717c644d90bd97d41498c5a29ad7d2802fb46f Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 12 Dec 2023 21:21:00 +0100 Subject: [PATCH] [Gradle] Suppress deprecation warning for `KotlinCompilationToRunnableFiles` usage The actual usage was already under suppression; however, we don't have support for suppressing import statements (KT-30155) We need to handle these suppressions within KT-58227 and KT-64273 --- .../kotlin/gradle/internal/KotlinDependenciesManagement.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt index 1978b2a5446..8450d4f7e0a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt @@ -14,7 +14,6 @@ import org.gradle.api.artifacts.dsl.DependencyHandler import org.gradle.api.provider.Provider import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles import org.jetbrains.kotlin.gradle.plugin.KotlinProjectSetupAction import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider @@ -86,7 +85,7 @@ private fun excludeStdlibAndKotlinTestCommonFromPlatformCompilations(project: Pr // there several JVM-like targets, like KotlinWithJava, or KotlinAndroid, and they don't have common supertype // aside from KotlinTarget -@Suppress("DEPRECATION") +@Suppress("DEPRECATION") // KT-58227, KT-64273 private fun KotlinTarget.excludeStdlibAndKotlinTestCommonFromPlatformCompilations() { compilations.all { listOfNotNull( @@ -94,7 +93,7 @@ private fun KotlinTarget.excludeStdlibAndKotlinTestCommonFromPlatformCompilation it.defaultSourceSet.apiMetadataConfigurationName, it.defaultSourceSet.implementationMetadataConfigurationName, it.defaultSourceSet.compileOnlyMetadataConfigurationName, - (it as? KotlinCompilationToRunnableFiles<*>)?.runtimeDependencyConfigurationName, + (it as? org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles<*>)?.runtimeDependencyConfigurationName, // Additional configurations for (old) jvmWithJava-preset. Remove it when we drop it completely (it as? KotlinWithJavaCompilation<*, *>)?.apiConfigurationName