[Gradle][Minor] Move KotlinCompilationImplFactories out of constructors

^KT-54312 Verification Pending

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilationFactory.kt

@@ -8,13 +8,18 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationFriendPathsResolver
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationSourceSetsContainer
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinMultiplatformCommonCompilerOptionsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.DefaultKotlinCompilationDependencyConfigurationsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
+import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinMultiplatformCommonCompilerOptionsFactory
 
 class KotlinCommonCompilationFactory internal constructor(
     override val target: KotlinOnlyTarget<*>,
-    private val defaultSourceSet: KotlinSourceSet,
+    private val defaultSourceSet: KotlinSourceSet
+) : KotlinCompilationFactory<KotlinCommonCompilation> {
+
+    override val itemClass: Class<KotlinCommonCompilation>
+        get() = KotlinCommonCompilation::class.java
+
     private val compilationFactory: KotlinCompilationImplFactory =
         KotlinCompilationImplFactory(
             compilationDependencyConfigurationsFactory = DefaultKotlinCompilationDependencyConfigurationsFactory.WithoutRuntime,
@@ -31,9 +36,6 @@ class KotlinCommonCompilationFactory internal constructor(
             */
             compilationSourceSetsContainerFactory = { _, _ -> KotlinCompilationSourceSetsContainer(defaultSourceSet) }
         )
-) : KotlinCompilationFactory<KotlinCommonCompilation> {
-    override val itemClass: Class<KotlinCommonCompilation>
-        get() = KotlinCommonCompilation::class.java
 
     override fun create(name: String): KotlinCommonCompilation = target.project.objects.newInstance(
         itemClass, compilationFactory.create(target, name)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationFactory.kt

@@ -7,20 +7,21 @@
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JsCompilationSourceSetsContainerFactory
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJsCompilerOptionsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JsKotlinCompilationDependencyConfigurationsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
+import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJsCompilerOptionsFactory
 
 class KotlinJsCompilationFactory internal constructor(
-    override val target: KotlinOnlyTarget<KotlinJsCompilation>,
+    override val target: KotlinOnlyTarget<KotlinJsCompilation>
+) : KotlinCompilationFactory<KotlinJsCompilation> {
+    override val itemClass: Class<KotlinJsCompilation>
+        get() = KotlinJsCompilation::class.java
+
     private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory(
         compilerOptionsFactory = KotlinJsCompilerOptionsFactory,
         compilationSourceSetsContainerFactory = JsCompilationSourceSetsContainerFactory,
         compilationDependencyConfigurationsFactory = JsKotlinCompilationDependencyConfigurationsFactory
     )
-) : KotlinCompilationFactory<KotlinJsCompilation> {
-    override val itemClass: Class<KotlinJsCompilation>
-        get() = KotlinJsCompilation::class.java
 
     override fun create(name: String): KotlinJsCompilation = target.project.objects.newInstance(
         itemClass, compilationImplFactory.create(target, name)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt

@@ -7,21 +7,22 @@ package org.jetbrains.kotlin.gradle.targets.js.ir
 
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCompilationFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJsCompilerOptionsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JsIrCompilationSourceSetsContainerFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JsKotlinCompilationDependencyConfigurationsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
+import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJsCompilerOptionsFactory
 
 class KotlinJsIrCompilationFactory internal constructor(
-    override val target: KotlinOnlyTarget<KotlinJsIrCompilation>,
+    override val target: KotlinOnlyTarget<KotlinJsIrCompilation>
+) : KotlinCompilationFactory<KotlinJsIrCompilation> {
+    override val itemClass: Class<KotlinJsIrCompilation>
+        get() = KotlinJsIrCompilation::class.java
+
     private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory(
         compilerOptionsFactory = KotlinJsCompilerOptionsFactory,
         compilationSourceSetsContainerFactory = JsIrCompilationSourceSetsContainerFactory,
         compilationDependencyConfigurationsFactory = JsKotlinCompilationDependencyConfigurationsFactory
     )
-) : KotlinCompilationFactory<KotlinJsIrCompilation> {
-    override val itemClass: Class<KotlinJsIrCompilation>
-        get() = KotlinJsIrCompilation::class.java
 
     override fun create(name: String): KotlinJsIrCompilation = target.project.objects.newInstance(
         itemClass, compilationImplFactory.create(target, name)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt

@@ -7,15 +7,20 @@
 package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import com.android.build.gradle.api.BaseVariant
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinAndroidCompilationAssociator
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationFriendPathsResolver
+import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinAndroidCompilationAssociator
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.AndroidCompilationSourceSetsContainerFactory
-import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJvmCompilerOptionsFactory
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
+import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJvmCompilerOptionsFactory
 
 class KotlinJvmAndroidCompilationFactory internal constructor(
     override val target: KotlinAndroidTarget,
-    private val variant: BaseVariant,
+    private val variant: BaseVariant
+) : KotlinCompilationFactory<KotlinJvmAndroidCompilation> {
+
+    override val itemClass: Class<KotlinJvmAndroidCompilation>
+        get() = KotlinJvmAndroidCompilation::class.java
+
     private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory(
         compilerOptionsFactory = KotlinJvmCompilerOptionsFactory,
         compilationFriendPathsResolver = DefaultKotlinCompilationFriendPathsResolver(
@@ -27,10 +32,6 @@ class KotlinJvmAndroidCompilationFactory internal constructor(
         compilationAssociator = KotlinAndroidCompilationAssociator,
         compilationSourceSetsContainerFactory = AndroidCompilationSourceSetsContainerFactory(target, variant)
     )
-) : KotlinCompilationFactory<KotlinJvmAndroidCompilation> {
-
-    override val itemClass: Class<KotlinJvmAndroidCompilation>
-        get() = KotlinJvmAndroidCompilation::class.java
 
     override fun create(name: String): KotlinJvmAndroidCompilation {
         return project.objects.newInstance(itemClass, compilationImplFactory.create(target, name), variant)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt

@@ -14,7 +14,12 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeKotl
 import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeKotlinCompilationTaskNamesContainerFactory
 
 open class KotlinNativeCompilationFactory internal constructor(
-    override val target: KotlinNativeTarget,
+    override val target: KotlinNativeTarget
+) : KotlinCompilationFactory<KotlinNativeCompilation> {
+
+    override val itemClass: Class<KotlinNativeCompilation>
+        get() = KotlinNativeCompilation::class.java
+
     private val compilationImplFactory: KotlinCompilationImplFactory =
         KotlinCompilationImplFactory(
             compilationTaskNamesContainerFactory = NativeKotlinCompilationTaskNamesContainerFactory,
@@ -25,10 +30,6 @@ open class KotlinNativeCompilationFactory internal constructor(
                 DefaultKotlinCompilationSourceSetInclusion.NativeAddSourcesToCompileTask
             ),
         )
-) : KotlinCompilationFactory<KotlinNativeCompilation> {
-
-    override val itemClass: Class<KotlinNativeCompilation>
-        get() = KotlinNativeCompilation::class.java
 
     override fun create(name: String): KotlinNativeCompilation {
         return target.project.objects.newInstance(

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt

@@ -19,7 +19,12 @@ import org.jetbrains.kotlin.konan.target.KonanTarget
 open class KotlinSharedNativeCompilationFactory internal constructor(
     override val target: KotlinMetadataTarget,
     private val konanTargets: Set<KonanTarget>,
-    private val defaultSourceSet: KotlinSourceSet,
+    private val defaultSourceSet: KotlinSourceSet
+) : KotlinCompilationFactory<KotlinSharedNativeCompilation> {
+
+    override val itemClass: Class<KotlinSharedNativeCompilation>
+        get() = KotlinSharedNativeCompilation::class.java
+
     private val compilationImplFactory: KotlinCompilationImplFactory =
         KotlinCompilationImplFactory(
             compilationDependencyConfigurationsFactory = DefaultKotlinCompilationDependencyConfigurationsFactory.WithoutRuntime,
@@ -43,10 +48,6 @@ open class KotlinSharedNativeCompilationFactory internal constructor(
              */
             compilationSourceSetsContainerFactory = { _, _ -> KotlinCompilationSourceSetsContainer(defaultSourceSet) }
         )
-) : KotlinCompilationFactory<KotlinSharedNativeCompilation> {
-
-    override val itemClass: Class<KotlinSharedNativeCompilation>
-        get() = KotlinSharedNativeCompilation::class.java
 
     @Suppress("DEPRECATION")
     override fun create(name: String): KotlinSharedNativeCompilation {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt

@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.gradle.tasks.configuration
 
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo
 import org.jetbrains.kotlin.gradle.targets.js.ir.*
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.utils.klibModuleName