From 2a431992870e2e3e208256e4fa9873c0145a2e2e Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 6 Dec 2021 10:04:06 +0100 Subject: [PATCH] [Gradle][KPM] Split fragment specific configurations from KotlinDependencyConfigurations --- .../pm20/KotlinDependencyConfigurations.kt | 33 -------------- .../KotlinFragmentDependencyConfigurations.kt | 43 +++++++++++++++++++ .../plugin/mpp/pm20/KotlinGradleFragment.kt | 2 +- .../mpp/pm20/KotlinCommonFragmentFactory.kt | 4 +- ...KotlinFragmentConfigurationInstantiator.kt | 2 +- ...ragmentDependencyConfigurationsFactory.kt} | 10 ++--- .../plugin/mpp/pm20/KotlinGradleFragment.kt | 4 +- .../plugin/mpp/pm20/KotlinJvmVariant.kt | 2 +- .../mpp/pm20/KotlinJvmVariantFactory.kt | 4 +- .../plugin/mpp/pm20/KotlinNativeVariant.kt | 16 +++---- .../mpp/pm20/KotlinNativeVariantFactory.kt | 4 +- .../plugin/mpp/pm20/abstractVariants.kt | 7 ++- .../pm20/configuration/KotlinApiElements.kt | 2 +- .../KotlinCompileDependencies.kt | 2 +- .../KotlinHostSpecificMetadataElements.kt | 2 +- .../KotlinRuntimeDependencies.kt | 2 +- .../configuration/KotlinRuntimeElements.kt | 2 +- 17 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/{KotlinDependencyConfigurationsFactory.kt => KotlinFragmentDependencyConfigurationsFactory.kt} (86%) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt index b70fd11f01e..100dc20ad08 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt @@ -12,37 +12,4 @@ interface KotlinDependencyConfigurations { val implementationConfiguration: Configuration val compileOnlyConfiguration: Configuration val runtimeOnlyConfiguration: Configuration - - /** This configuration includes the dependencies from the refines-parents */ - val transitiveApiConfiguration: Configuration - - /** This configuration includes the dependencies from the refines-parents */ - val transitiveImplementationConfiguration: Configuration - - private class Impl( - override val apiConfiguration: Configuration, - override val implementationConfiguration: Configuration, - override val compileOnlyConfiguration: Configuration, - override val runtimeOnlyConfiguration: Configuration, - override val transitiveApiConfiguration:Configuration, - override val transitiveImplementationConfiguration: Configuration - ) : KotlinDependencyConfigurations - - companion object { - fun create( - apiConfiguration: Configuration, - implementationConfiguration: Configuration, - compileOnlyConfiguration: Configuration, - runtimeOnlyConfiguration: Configuration, - transitiveApiConfiguration: Configuration, - transitiveImplementationConfiguration: Configuration - ): KotlinDependencyConfigurations = Impl( - apiConfiguration = apiConfiguration, - implementationConfiguration = implementationConfiguration, - compileOnlyConfiguration = compileOnlyConfiguration, - runtimeOnlyConfiguration = runtimeOnlyConfiguration, - transitiveApiConfiguration = transitiveApiConfiguration, - transitiveImplementationConfiguration = transitiveImplementationConfiguration - ) - } } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt new file mode 100644 index 00000000000..e2c14b8a90d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt @@ -0,0 +1,43 @@ +/* + * Copyright 2010-2021 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.pm20 + +import org.gradle.api.artifacts.Configuration + +interface KotlinFragmentDependencyConfigurations : KotlinDependencyConfigurations { + /** This configuration includes the dependencies from the refines-parents */ + val transitiveApiConfiguration: Configuration + + /** This configuration includes the dependencies from the refines-parents */ + val transitiveImplementationConfiguration: Configuration + + private class Impl( + override val apiConfiguration: Configuration, + override val implementationConfiguration: Configuration, + override val compileOnlyConfiguration: Configuration, + override val runtimeOnlyConfiguration: Configuration, + override val transitiveApiConfiguration: Configuration, + override val transitiveImplementationConfiguration: Configuration + ) : KotlinFragmentDependencyConfigurations + + companion object { + fun create( + apiConfiguration: Configuration, + implementationConfiguration: Configuration, + compileOnlyConfiguration: Configuration, + runtimeOnlyConfiguration: Configuration, + transitiveApiConfiguration: Configuration, + transitiveImplementationConfiguration: Configuration + ): KotlinFragmentDependencyConfigurations = Impl( + apiConfiguration = apiConfiguration, + implementationConfiguration = implementationConfiguration, + compileOnlyConfiguration = compileOnlyConfiguration, + runtimeOnlyConfiguration = runtimeOnlyConfiguration, + transitiveApiConfiguration = transitiveApiConfiguration, + transitiveImplementationConfiguration = transitiveImplementationConfiguration + ) + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt index 5b95a9c1a3c..b49518eb138 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder import org.jetbrains.kotlin.project.model.KotlinModuleFragment import org.jetbrains.kotlin.project.model.refinesClosure -interface KotlinGradleFragment : KotlinModuleFragment, HasKotlinDependencies, KotlinDependencyConfigurations, Named { +interface KotlinGradleFragment : KotlinModuleFragment, HasKotlinDependencies, KotlinFragmentDependencyConfigurations, Named { override val kotlinSourceRoots: SourceDirectorySet override val containingModule: KotlinGradleModule diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCommonFragmentFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCommonFragmentFactory.kt index ab4eaf36ef1..d1e557e17f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCommonFragmentFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCommonFragmentFactory.kt @@ -24,8 +24,8 @@ fun KotlinCommonFragmentFactory( class KotlinCommonFragmentInstantiator( private val module: KotlinGradleModule, - private val dependencyConfigurationsFactory: KotlinDependencyConfigurationsFactory = - DefaultKotlinDependencyConfigurationsFactory + private val dependencyConfigurationsFactory: KotlinFragmentDependencyConfigurationsFactory = + DefaultKotlinFragmentDependencyConfigurationsFactory ) : KotlinGradleFragmentFactory.FragmentInstantiator { override fun create(name: String): KotlinGradleFragmentInternal { val names = FragmentNameDisambiguation(module, name) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationInstantiator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationInstantiator.kt index b822f9ee9f2..65805a1942c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationInstantiator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentConfigurationInstantiator.kt @@ -12,6 +12,6 @@ interface KotlinFragmentConfigurationInstantiator { fun create( module: KotlinGradleModule, names: FragmentNameDisambiguation, - dependencies: KotlinDependencyConfigurations + dependencies: KotlinFragmentDependencyConfigurations ): Configuration } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurationsFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurationsFactory.kt similarity index 86% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurationsFactory.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurationsFactory.kt index 7a31f3915d4..c5714e5cd01 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurationsFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurationsFactory.kt @@ -7,13 +7,13 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.FragmentNameDisambiguation -interface KotlinDependencyConfigurationsFactory { - fun create(module: KotlinGradleModule, names: FragmentNameDisambiguation): KotlinDependencyConfigurations +interface KotlinFragmentDependencyConfigurationsFactory { + fun create(module: KotlinGradleModule, names: FragmentNameDisambiguation): KotlinFragmentDependencyConfigurations } -object DefaultKotlinDependencyConfigurationsFactory : KotlinDependencyConfigurationsFactory { +object DefaultKotlinFragmentDependencyConfigurationsFactory : KotlinFragmentDependencyConfigurationsFactory { - override fun create(module: KotlinGradleModule, names: FragmentNameDisambiguation): KotlinDependencyConfigurations { + override fun create(module: KotlinGradleModule, names: FragmentNameDisambiguation): KotlinFragmentDependencyConfigurations { val configurations = module.project.configurations val apiConfiguration = configurations.maybeCreate(names.disambiguateName("api")) val implementationConfiguration = configurations.maybeCreate(names.disambiguateName("implementation")) @@ -37,7 +37,7 @@ object DefaultKotlinDependencyConfigurationsFactory : KotlinDependencyConfigurat transitiveApiConfiguration.extendsFrom(apiConfiguration) transitiveImplementationConfiguration.extendsFrom(implementationConfiguration) - return KotlinDependencyConfigurations.create( + return KotlinFragmentDependencyConfigurations.create( apiConfiguration = apiConfiguration, implementationConfiguration = implementationConfiguration, compileOnlyConfiguration = compileOnlyConfiguration, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt index 6270546dab3..4f2e8938c19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt @@ -28,8 +28,8 @@ import javax.inject.Inject open class KotlinGradleFragmentInternal @Inject constructor( final override val containingModule: KotlinGradleModule, final override val fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations -) : KotlinGradleFragment, KotlinDependencyConfigurations by dependencyConfigurations { + dependencyConfigurations: KotlinFragmentDependencyConfigurations +) : KotlinGradleFragment, KotlinFragmentDependencyConfigurations by dependencyConfigurations { final override fun getName(): String = fragmentName diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt index b6c0135a5b3..6eb904ea1df 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariant.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.filterModuleName open class KotlinJvmVariant( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependenciesConfiguration: Configuration, apiElementsConfiguration: Configuration, runtimeDependenciesConfiguration: Configuration, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariantFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariantFactory.kt index 29cc444eb4c..ba71184e180 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariantFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinJvmVariantFactory.kt @@ -26,8 +26,8 @@ fun KotlinJvmVariantFactory( class KotlinJvmVariantInstantiator( private val module: KotlinGradleModule, - private val dependenciesConfigurationFactory: KotlinDependencyConfigurationsFactory = - DefaultKotlinDependencyConfigurationsFactory, + private val dependenciesConfigurationFactory: KotlinFragmentDependencyConfigurationsFactory = + DefaultKotlinFragmentDependencyConfigurationsFactory, private val compileDependenciesConfigurationInstantiator: KotlinCompileDependenciesConfigurationInstantiator = DefaultKotlinCompileDependenciesConfigurationInstantiator, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariant.kt index ab5ef5fd5a0..fb02bf49d65 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariant.kt @@ -18,7 +18,7 @@ abstract class KotlinNativeVariantInternal( containingModule: KotlinGradleModule, fragmentName: String, val konanTarget: KonanTarget, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, final override val hostSpecificMetadataElementsConfiguration: Configuration? @@ -50,7 +50,7 @@ class KotlinNativeVariantConstructor( private val constructor: ( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -59,7 +59,7 @@ class KotlinNativeVariantConstructor( operator fun invoke( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -76,7 +76,7 @@ class KotlinNativeVariantConstructor( open class KotlinLinuxX64Variant @Inject constructor( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -99,7 +99,7 @@ open class KotlinLinuxX64Variant @Inject constructor( open class KotlinMacosX64Variant @Inject constructor( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -121,7 +121,7 @@ open class KotlinMacosX64Variant @Inject constructor( open class KotlinMacosArm64Variant @Inject constructor( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -144,7 +144,7 @@ open class KotlinMacosArm64Variant @Inject constructor( open class KotlinIosX64Variant @Inject constructor( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? @@ -167,7 +167,7 @@ open class KotlinIosX64Variant @Inject constructor( open class KotlinIosArm64Variant @Inject constructor( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, hostSpecificMetadataElementsConfiguration: Configuration? diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariantFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariantFactory.kt index 7bb353aa389..cb00f2d3179 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariantFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinNativeVariantFactory.kt @@ -23,8 +23,8 @@ class KotlinNativeVariantInstantiator( private val kotlinNativeVariantConstructor: KotlinNativeVariantConstructor, - private val dependenciesConfigurationFactory: KotlinDependencyConfigurationsFactory = - DefaultKotlinDependencyConfigurationsFactory, + private val dependenciesConfigurationFactory: KotlinFragmentDependencyConfigurationsFactory = + DefaultKotlinFragmentDependencyConfigurationsFactory, private val compileDependenciesConfigurationInstantiator: KotlinCompileDependenciesConfigurationInstantiator = DefaultKotlinCompileDependenciesConfigurationInstantiator, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt index ce8048ab192..1effd9b1472 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 -import org.gradle.api.NamedDomainObjectProvider import org.gradle.api.artifacts.Configuration import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection @@ -24,7 +23,7 @@ import org.jetbrains.kotlin.project.model.KotlinPlatformTypeAttribute abstract class KotlinGradleVariantInternal( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, final override val compileDependenciesConfiguration: Configuration, final override val apiElementsConfiguration: Configuration ) : KotlinGradleFragmentInternal( @@ -79,7 +78,7 @@ internal val KotlinGradleVariant.defaultSourceArtifactTaskName: String abstract class KotlinGradleVariantWithRuntimeInternal( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, final override val runtimeDependenciesConfiguration: Configuration, @@ -104,7 +103,7 @@ private fun defaultModuleSuffix(module: KotlinGradleModule, variantName: String) abstract class KotlinGradlePublishedVariantWithRuntime( containingModule: KotlinGradleModule, fragmentName: String, - dependencyConfigurations: KotlinDependencyConfigurations, + dependencyConfigurations: KotlinFragmentDependencyConfigurations, compileDependencyConfiguration: Configuration, apiElementsConfiguration: Configuration, runtimeDependencyConfiguration: Configuration, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinApiElements.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinApiElements.kt index ef30f152b6e..769e93d1be3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinApiElements.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinApiElements.kt @@ -17,7 +17,7 @@ object DefaultKotlinApiElementsConfigurationInstantiator : KotlinApiElementsConf override fun create( module: KotlinGradleModule, names: FragmentNameDisambiguation, - dependencies: KotlinDependencyConfigurations + dependencies: KotlinFragmentDependencyConfigurations ): Configuration { return module.project.configurations.maybeCreate(names.disambiguateName("apiElements")).apply { isCanBeResolved = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinCompileDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinCompileDependencies.kt index a7f91a645f6..a166e94a044 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinCompileDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinCompileDependencies.kt @@ -17,7 +17,7 @@ object DefaultKotlinCompileDependenciesConfigurationInstantiator : KotlinCompile override fun create( module: KotlinGradleModule, names: FragmentNameDisambiguation, - dependencies: KotlinDependencyConfigurations + dependencies: KotlinFragmentDependencyConfigurations ): Configuration { return module.project.configurations.maybeCreate(names.disambiguateName("compileDependencies")).apply { isCanBeConsumed = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinHostSpecificMetadataElements.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinHostSpecificMetadataElements.kt index 5ce3788c6fb..fa02d3a49ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinHostSpecificMetadataElements.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinHostSpecificMetadataElements.kt @@ -23,7 +23,7 @@ fun DefaultKotlinHostSpecificMetadataElementsConfigurationInstantiator( private object DefaultKotlinHostSpecificMetadataElementsConfigurationInstantiator : KotlinHostSpecificMetadataElementsConfigurationInstantiator { override fun create( - module: KotlinGradleModule, names: FragmentNameDisambiguation, dependencies: KotlinDependencyConfigurations + module: KotlinGradleModule, names: FragmentNameDisambiguation, dependencies: KotlinFragmentDependencyConfigurations ): Configuration { return module.project.configurations.maybeCreate(names.disambiguateName("hostSpecificMetadataElements")).apply { isCanBeResolved = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeDependencies.kt index b15bbaadf57..36f46b8a899 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeDependencies.kt @@ -16,7 +16,7 @@ object DefaultKotlinRuntimeDependenciesConfigurationInstantiator : KotlinRuntime override fun create( module: KotlinGradleModule, names: FragmentNameDisambiguation, - dependencies: KotlinDependencyConfigurations + dependencies: KotlinFragmentDependencyConfigurations ): Configuration { return module.project.configurations.maybeCreate(names.disambiguateName("runtimeDependencies")).apply { isCanBeConsumed = false diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeElements.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeElements.kt index 4dd49fb5abb..0a289a88868 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeElements.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/configuration/KotlinRuntimeElements.kt @@ -18,7 +18,7 @@ object DefaultKotlinRuntimeElementsConfigurationInstantiator : KotlinRuntimeElem override fun create( module: KotlinGradleModule, names: FragmentNameDisambiguation, - dependencies: KotlinDependencyConfigurations + dependencies: KotlinFragmentDependencyConfigurations ): Configuration { return module.project.configurations.maybeCreate(names.disambiguateName("runtimeElements")).apply { isCanBeResolved = false