From f097137d61dd6877f93f04c39ad2bba77efc5155 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Mon, 24 Oct 2022 11:31:23 +0200
Subject: [PATCH] [Gradle][Minor] KotlinSourceSetProcessor: Simplify
 .javaSourceSet

^KT-54312 Verification Pending
---
 .../gradle/plugin/KotlinSourceSetProcessor.kt | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt
index d59334bbbc4..e1f704b460a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt
@@ -15,12 +15,12 @@ import org.gradle.api.tasks.TaskProvider
 import org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessor
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
 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.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinTasksProvider
 import org.jetbrains.kotlin.gradle.tasks.configuration.AbstractKotlinCompileConfig
 import org.jetbrains.kotlin.gradle.tasks.registerTask
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import java.util.concurrent.Callable
 
 internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
@@ -36,19 +36,16 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
     override val kotlinTask: TaskProvider<out T> = prepareKotlinCompileTask()
 
     protected val javaSourceSet: SourceSet?
-        get() {
-            if (compilationProjection !is KotlinCompilationProjection.TCS) return null
-            val compilation = compilationProjection.origin
-            val target = compilationProjection.origin.target
-
-            return (compilation as? KotlinWithJavaCompilation<*, *>)?.javaSourceSet
-                ?: if (target is KotlinJvmTarget && target.withJavaEnabled && compilation is KotlinJvmCompilation)
-                    project.gradle.variantImplementationFactory<JavaSourceSetsAccessor.JavaSourceSetsAccessorVariantFactory>()
-                        .getInstance(project)
-                        .sourceSets
-                        .maybeCreate(compilation.name)
-                else null
+        get() = when (val compilation = compilationProjection.safeAs<KotlinCompilationProjection.TCS>()?.origin) {
+            is KotlinWithJavaCompilation<*, *> -> compilation.javaSourceSet
+            is KotlinJvmCompilation -> if (compilation.target.withJavaEnabled) {
+                project.gradle.variantImplementationFactory<JavaSourceSetsAccessor.JavaSourceSetsAccessorVariantFactory>()
+                    .getInstance(project)
+                    .sourceSets
+                    .maybeCreate(compilation.name)
+            } else null
 
+            else -> null
         }
 
     private fun prepareKotlinCompileTask(): TaskProvider<out T> =