azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle][Minor] Move implementations of KotlinCompilationTaskNamesContainer into single source

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-14 15:58:16 +02:00
committed by Space Team
parent 5db60e3ebd
commit 0a9c1ee877
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmWithJavaCompilationTaskNamesContainerFactory.kt
-17
View File
@@ -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)
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/DefaultKotlinCompilationTaskNamesContainerFactory.kt → libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationTaskNamesContainerFactories.kt
+18
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory 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.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationTaskNamesContainer import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationTaskNamesContainer
@@ -19,3 +20,20 @@ internal object DefaultKotlinCompilationTaskNamesContainerFactory :
compileAllTaskName = lowerCamelCaseName(target.disambiguationClassifier, compilationName, "classes") 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"))
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeKotlinCompilationTaskNamesContainerFactory.kt
-17
View File
@@ -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"))
}