From 3210fdfec43f654b403b99afce2967d8aca69e8c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 18 Oct 2023 11:53:05 +0200 Subject: [PATCH] [Gradle] Inline 'sourceSetFreeCompilerArgsPropertyName' to its use site KT-61634 --- .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 3 --- .../mpp/SyncLanguageSettingsWithKotlinExtensionSetupAction.kt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 76220feb7d4..f3ba16c0d00 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -29,8 +29,5 @@ class KotlinMultiplatformPlugin : Plugin { companion object { const val METADATA_TARGET_NAME = "metadata" - - internal fun sourceSetFreeCompilerArgsPropertyName(sourceSetName: String) = - "kotlin.mpp.freeCompilerArgsForSourceSet.$sourceSetName" } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SyncLanguageSettingsWithKotlinExtensionSetupAction.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SyncLanguageSettingsWithKotlinExtensionSetupAction.kt index c1c45c76f42..9ad18553994 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SyncLanguageSettingsWithKotlinExtensionSetupAction.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/SyncLanguageSettingsWithKotlinExtensionSetupAction.kt @@ -32,7 +32,7 @@ internal val SyncLanguageSettingsWithKotlinExtensionSetupAction = KotlinProjectS languageSettings.freeCompilerArgsProvider = project.provider { val propertyValue = with(project.extensions.extraProperties) { - val sourceSetFreeCompilerArgsPropertyName = KotlinMultiplatformPlugin.sourceSetFreeCompilerArgsPropertyName(sourceSet.name) + val sourceSetFreeCompilerArgsPropertyName = "kotlin.mpp.freeCompilerArgsForSourceSet.${sourceSet.name}" if (has(sourceSetFreeCompilerArgsPropertyName)) { get(sourceSetFreeCompilerArgsPropertyName) } else null