From 7fae9a1b738029c342878cb7ac456dc6f5ce22f5 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Sun, 11 Sep 2022 19:45:44 +0200 Subject: [PATCH] [Gradle][MPP] Remove AbstractKotlinTargetConfigurator.createDefaultSourceSets ^KT-52726 Verification Pending --- .../gradle/plugin/KotlinTargetConfigurator.kt | 17 +++++------------ .../pm20/GradleKpmAwareTargetConfigurator.kt | 2 +- .../targets/js/KotlinJsTargetConfigurator.kt | 9 ++------- .../js/ir/KotlinJsIrTargetConfigurator.kt | 2 +- .../targets/jvm/KotlinJvmTargetConfigurator.kt | 2 +- .../KotlinMetadataTargetConfigurator.kt | 5 +---- .../native/KotlinNativeTargetConfigurator.kt | 3 --- 7 files changed, 11 insertions(+), 29 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index 7090fae44e7..067d0aa0ac2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -64,7 +64,6 @@ interface KotlinTargetConfigurator { } abstract class AbstractKotlinTargetConfigurator( - internal val createDefaultSourceSets: Boolean, internal val createTestCompilation: Boolean ) : KotlinTargetConfigurator { @@ -99,9 +98,7 @@ abstract class AbstractKotlinTargetConfigurator override fun configureSourceSet(target: KotlinTargetType) { target.compilations.all { compilation -> - if (createDefaultSourceSets) { - compilation.source(compilation.defaultSourceSet) // also adds dependencies, requires the configurations for target and source set to exist at this point - } + compilation.source(compilation.defaultSourceSet) // also adds dependencies, requires the configurations for target and source set to exist at this point } } @@ -142,9 +139,9 @@ abstract class AbstractKotlinTargetConfigurator it.group = LifecycleBasePlugin.BUILD_GROUP it.description = "Assembles outputs for compilation '${compilation.name}' of target '${compilation.target.name}'" it.inputs.files({ - // the task may not be registered at this point, reference it lazily - compilation.compileKotlinTaskProvider.map { it.outputs.files } - }) + // the task may not be registered at this point, reference it lazily + compilation.compileKotlinTaskProvider.map { it.outputs.files } + }) if (compilation is KotlinJvmCompilation && compilation.target.withJavaEnabled) { it.inputs.files({ compilation.compileJavaTaskProvider?.map { it.outputs.files } }) @@ -382,12 +379,8 @@ internal val KotlinTarget.testTaskName: String get() = lowerCamelCaseName(targetName, AbstractKotlinTargetConfigurator.testTaskNameSuffix) abstract class KotlinOnlyTargetConfigurator, KotlinTargetType : KotlinOnlyTarget>( - createDefaultSourceSets: Boolean, createTestCompilation: Boolean -) : AbstractKotlinTargetConfigurator( - createDefaultSourceSets, - createTestCompilation -) { +) : AbstractKotlinTargetConfigurator(createTestCompilation) { open val archiveType: String = ArtifactTypeDefinition.JAR_TYPE internal abstract fun buildCompilationProcessor(compilation: KotlinCompilationType): KotlinCompilationProcessor<*> diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmAwareTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmAwareTargetConfigurator.kt index 97e6b731bc7..773646ca8ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmAwareTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmAwareTargetConfigurator.kt @@ -13,7 +13,7 @@ import java.util.concurrent.Callable internal open class GradleKpmAwareTargetConfigurator( private val legacyModelTargetConfigurator: AbstractKotlinTargetConfigurator, -) : AbstractKotlinTargetConfigurator(true, legacyModelTargetConfigurator.createDefaultSourceSets), +) : AbstractKotlinTargetConfigurator(true), KotlinTargetConfigurator by legacyModelTargetConfigurator { // NB: this override enforces calls to other overridden functions; without it, the delegate would call its own ones override fun configureTarget(target: T) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt index e414ce97504..d52bbc1eac9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt @@ -9,7 +9,6 @@ import org.gradle.api.DefaultTask import org.gradle.api.Task import org.gradle.api.attributes.Usage import org.gradle.language.base.plugins.LifecycleBasePlugin -import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages @@ -21,7 +20,7 @@ import org.jetbrains.kotlin.gradle.testing.testTaskName import java.util.concurrent.Callable open class KotlinJsTargetConfigurator : - KotlinOnlyTargetConfigurator(true, true), + KotlinOnlyTargetConfigurator(true), KotlinTargetWithTestsConfigurator { override val testRunClass: Class get() = KotlinJsReportAggregatingTestRun::class.java @@ -64,11 +63,7 @@ open class KotlinJsTargetConfigurator : target.compilations.all { compilation -> defineConfigurationsForCompilation(compilation) - if (createDefaultSourceSets) { - project.kotlinExtension.sourceSets.maybeCreate(compilation.defaultSourceSetName).also { sourceSet -> - compilation.source(sourceSet) // also adds dependencies, requires the configurations for target and source set to exist at this point - } - } + compilation.source(compilation.defaultSourceSet) configureResourceProcessing(compilation, project.files(Callable { compilation.allKotlinSourceSets.map { it.resources } })) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index b5000ca089e..f388b0e345b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.gradle.utils.klibModuleName import java.io.File open class KotlinJsIrTargetConfigurator() : - KotlinOnlyTargetConfigurator(true, true), + KotlinOnlyTargetConfigurator(true), KotlinTargetWithTestsConfigurator { override val testRunClass: Class get() = KotlinJsReportAggregatingTestRun::class.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt index 12a869b6c2d..c560f0e63c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTargetConfigurator.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.testing.internal.kotlinTestRegistry import org.jetbrains.kotlin.gradle.testing.testTaskName open class KotlinJvmTargetConfigurator : - KotlinOnlyTargetConfigurator(true, true), + KotlinOnlyTargetConfigurator(true), KotlinTargetWithTestsConfigurator { override fun configurePlatformSpecificModel(target: KotlinJvmTarget) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt index 92cb493373d..4e90d1720b5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt @@ -54,10 +54,7 @@ internal val Project.isCompatibilityMetadataVariantEnabled: Boolean get() = PropertiesProvider(this).enableCompatibilityMetadataVariant == true class KotlinMetadataTargetConfigurator : - KotlinOnlyTargetConfigurator, KotlinMetadataTarget>( - createDefaultSourceSets = false, - createTestCompilation = false - ) { + KotlinOnlyTargetConfigurator, KotlinMetadataTarget>(createTestCompilation = false) { companion object { internal const val ALL_METADATA_JAR_NAME = "allMetadataJar" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index c25391f187e..882b7aae100 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -29,9 +29,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPI import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.KOTLIN_NATIVE_IGNORE_INCORRECT_DEPENDENCIES import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.apple.registerEmbedAndSignAppleFrameworkTask -import org.jetbrains.kotlin.gradle.plugin.mpp.isMain import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmAwareTargetConfigurator import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled import org.jetbrains.kotlin.gradle.targets.native.* import org.jetbrains.kotlin.gradle.targets.native.internal.commonizeCInteropTask @@ -49,7 +47,6 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import java.io.File open class KotlinNativeTargetConfigurator : AbstractKotlinTargetConfigurator( - createDefaultSourceSets = true, createTestCompilation = true ) {