From 5777f4859c9e2c3a460af32739afce88f1bda5df Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 27 Sep 2022 15:03:59 +0200 Subject: [PATCH] [Gradle][Minor] Move KotlinDependencyConfigurationsHolder into separate source file KT-54312 --- .../gradle/plugin/mpp/CompilationDetails.kt | 26 ------------- .../KotlinDependencyConfigurationsHolder.kt | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 26 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinDependencyConfigurationsHolder.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index bad2f1360cb..5ec81b63a75 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp -import org.gradle.api.Action -import org.gradle.api.Project import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* @@ -15,7 +13,6 @@ import org.jetbrains.kotlin.gradle.plugin.sources.* import org.jetbrains.kotlin.gradle.utils.* import org.jetbrains.kotlin.tooling.core.closure import java.util.* -import javax.inject.Inject interface CompilationDetails { val target: KotlinTarget @@ -53,26 +50,3 @@ internal val CompilationDetails<*>.associateCompilationsClosure: Iterable Unit): Unit = - DefaultKotlinDependencyHandler(this, project).run(configure) - - override fun dependencies(configure: Action) = - dependencies { configure.execute(this) } -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinDependencyConfigurationsHolder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinDependencyConfigurationsHolder.kt new file mode 100644 index 00000000000..ca208297d6f --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinDependencyConfigurationsHolder.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.plugin.mpp + +import org.gradle.api.Action +import org.gradle.api.Project +import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies +import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler +import org.jetbrains.kotlin.gradle.utils.* +import javax.inject.Inject + +internal abstract class KotlinDependencyConfigurationsHolder @Inject constructor( + val project: Project, + private val configurationNamesPrefix: String?, +) : HasKotlinDependencies { + + override val apiConfigurationName: String + get() = lowerCamelCaseName(configurationNamesPrefix, API) + + override val implementationConfigurationName: String + get() = lowerCamelCaseName(configurationNamesPrefix, IMPLEMENTATION) + + override val compileOnlyConfigurationName: String + get() = lowerCamelCaseName(configurationNamesPrefix, COMPILE_ONLY) + + override val runtimeOnlyConfigurationName: String + get() = lowerCamelCaseName(configurationNamesPrefix, RUNTIME_ONLY) + + override fun dependencies(configure: KotlinDependencyHandler.() -> Unit): Unit = + DefaultKotlinDependencyHandler(this, project).run(configure) + + override fun dependencies(configure: Action) = + dependencies { configure.execute(this) } +} \ No newline at end of file