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

[Gradle][Minor] KotlinSourceSetProcessor: Simplify .javaSourceSet

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-24 11:31:23 +02:00
committed by Space Team
parent 8fe0c88ab1
commit f097137d61
1 changed files with 10 additions and 13 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/KotlinSourceSetProcessor.kt
+10 -13
View File
@@ -15,12 +15,12 @@ import org.gradle.api.tasks.TaskProvider
import org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessor import org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessor
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider
import org.jetbrains.kotlin.gradle.tasks.configuration.AbstractKotlinCompileConfig import org.jetbrains.kotlin.gradle.tasks.configuration.AbstractKotlinCompileConfig
import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.tasks.registerTask
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import java.util.concurrent.Callable import java.util.concurrent.Callable
internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>( internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
@@ -36,19 +36,16 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
override val kotlinTask: TaskProvider<out T> = prepareKotlinCompileTask() override val kotlinTask: TaskProvider<out T> = prepareKotlinCompileTask()
protected val javaSourceSet: SourceSet? protected val javaSourceSet: SourceSet?
get() { get() = when (val compilation = compilationProjection.safeAs<KotlinCompilationProjection.TCS>()?.origin) {
if (compilationProjection !is KotlinCompilationProjection.TCS) return null is KotlinWithJavaCompilation<*, *> -> compilation.javaSourceSet
val compilation = compilationProjection.origin is KotlinJvmCompilation -> if (compilation.target.withJavaEnabled) {
val target = compilationProjection.origin.target project.gradle.variantImplementationFactory<JavaSourceSetsAccessor.JavaSourceSetsAccessorVariantFactory>()
.getInstance(project)
return (compilation as? KotlinWithJavaCompilation<*, *>)?.javaSourceSet .sourceSets
?: if (target is KotlinJvmTarget && target.withJavaEnabled && compilation is KotlinJvmCompilation) .maybeCreate(compilation.name)
project.gradle.variantImplementationFactory<JavaSourceSetsAccessor.JavaSourceSetsAccessorVariantFactory>() } else null
.getInstance(project)
.sourceSets
.maybeCreate(compilation.name)
else null
else -> null
} }
private fun prepareKotlinCompileTask(): TaskProvider<out T> = private fun prepareKotlinCompileTask(): TaskProvider<out T> =