From 0a9c1ee87712faf33e83802c6945ed7e3db73ec5 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 14 Oct 2022 15:58:16 +0200 Subject: [PATCH] [Gradle][Minor] Move implementations of KotlinCompilationTaskNamesContainer into single source ^KT-54312 Verification Pending --- ...JavaCompilationTaskNamesContainerFactory.kt | 17 ----------------- ...nCompilationTaskNamesContainerFactories.kt} | 18 ++++++++++++++++++ ...tlinCompilationTaskNamesContainerFactory.kt | 17 ----------------- 3 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmWithJavaCompilationTaskNamesContainerFactory.kt rename libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/{DefaultKotlinCompilationTaskNamesContainerFactory.kt => KotlinCompilationTaskNamesContainerFactories.kt} (54%) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeKotlinCompilationTaskNamesContainerFactory.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmWithJavaCompilationTaskNamesContainerFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmWithJavaCompilationTaskNamesContainerFactory.kt deleted file mode 100644 index 265ff9a5ca0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmWithJavaCompilationTaskNamesContainerFactory.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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.compilationImpl.factory - -import org.gradle.api.tasks.SourceSet -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationTaskNamesContainer - -internal class JvmWithJavaCompilationTaskNamesContainerFactory(private val javaSourceSet: SourceSet) : - KotlinCompilationImplFactory.KotlinCompilationTaskNamesContainerFactory { - override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationTaskNamesContainer = - DefaultKotlinCompilationTaskNamesContainerFactory.create(target, compilationName) - .copy(compileAllTaskName = javaSourceSet.classesTaskName) -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/DefaultKotlinCompilationTaskNamesContainerFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationTaskNamesContainerFactories.kt similarity index 54% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/DefaultKotlinCompilationTaskNamesContainerFactory.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationTaskNamesContainerFactories.kt index 1ee7d10d3d6..6ef3cda2219 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/DefaultKotlinCompilationTaskNamesContainerFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationTaskNamesContainerFactories.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory +import org.gradle.api.tasks.SourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationTaskNamesContainer @@ -19,3 +20,20 @@ internal object DefaultKotlinCompilationTaskNamesContainerFactory : compileAllTaskName = lowerCamelCaseName(target.disambiguationClassifier, compilationName, "classes") ) } + + +internal class JvmWithJavaCompilationTaskNamesContainerFactory(private val javaSourceSet: SourceSet) : + KotlinCompilationImplFactory.KotlinCompilationTaskNamesContainerFactory { + override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationTaskNamesContainer = + DefaultKotlinCompilationTaskNamesContainerFactory.create(target, compilationName) + .copy(compileAllTaskName = javaSourceSet.classesTaskName) +} + + +internal object NativeKotlinCompilationTaskNamesContainerFactory : + KotlinCompilationImplFactory.KotlinCompilationTaskNamesContainerFactory { + override fun create(target: KotlinTarget, compilationName: String) = + DefaultKotlinCompilationTaskNamesContainerFactory.create(target, compilationName) + .copy(compileAllTaskName = lowerCamelCaseName(target.disambiguationClassifier, compilationName, "klibrary")) +} + diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeKotlinCompilationTaskNamesContainerFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeKotlinCompilationTaskNamesContainerFactory.kt deleted file mode 100644 index 0cd57292750..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeKotlinCompilationTaskNamesContainerFactory.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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.compilationImpl.factory - -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName - -internal object NativeKotlinCompilationTaskNamesContainerFactory : - KotlinCompilationImplFactory.KotlinCompilationTaskNamesContainerFactory { - override fun create(target: KotlinTarget, compilationName: String) = - DefaultKotlinCompilationTaskNamesContainerFactory.create(target, compilationName) - .copy(compileAllTaskName = lowerCamelCaseName(target.disambiguationClassifier, compilationName, "klibrary")) -} -