From 5db60e3ebd3e4ded9ee385b2ac6fa9666fa51bc2 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 14 Oct 2022 15:55:12 +0200 Subject: [PATCH] [Gradle][Minor] Move implementations of KotlinCompilerOptionsFactory into single source ^KT-54312 Verification Pending --- .../mpp/KotlinCommonCompilationFactory.kt | 4 +- .../factory/CommonCompilerOptionsFactory.kt | 27 ------- .../factory/JsCompilerOptionsFactory.kt | 28 ------- .../factory/JvmCompilerOptionsFactory.kt | 25 ------- .../factory/KotlinCompilationImplFactory.kt | 4 +- .../factory/KotlinCompilerOptionsFactories.kt | 75 +++++++++++++++++++ .../factory/NativeCompilerOptionsFactory.kt | 23 ------ .../targets/js/KotlinJsCompilationFactory.kt | 4 +- .../js/ir/KotlinJsIrCompilationFactory.kt | 4 +- .../jvm/KotlinJvmAndroidCompilationFactory.kt | 4 +- .../jvm/KotlinJvmCompilationFactory.kt | 4 +- .../jvm/KotlinWithJavaCompilationFactory.kt | 2 +- .../native/KotlinNativeCompilationFactory.kt | 4 +- .../KotlinSharedNativeCompilationFactory.kt | 4 +- 14 files changed, 92 insertions(+), 120 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/CommonCompilerOptionsFactory.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JsCompilerOptionsFactory.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmCompilerOptionsFactory.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilerOptionsFactories.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeCompilerOptionsFactory.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilationFactory.kt index c080797d80b..50c72252732 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinCommonCompilationFactory.kt @@ -8,7 +8,7 @@ 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.CommonCompilerOptionsFactory +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 @@ -18,7 +18,7 @@ class KotlinCommonCompilationFactory internal constructor( private val compilationFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( compilationDependencyConfigurationsFactory = DefaultKotlinCompilationDependencyConfigurationsFactory.WithoutRuntime, - compilerOptionsFactory = CommonCompilerOptionsFactory, + compilerOptionsFactory = KotlinMultiplatformCommonCompilerOptionsFactory, compilationFriendPathsResolver = DefaultKotlinCompilationFriendPathsResolver( friendArtifactResolver = DefaultKotlinCompilationFriendPathsResolver.FriendArtifactResolver.composite( DefaultKotlinCompilationFriendPathsResolver.DefaultFriendArtifactResolver, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/CommonCompilerOptionsFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/CommonCompilerOptionsFactory.kt deleted file mode 100644 index ec2b9e913d1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/CommonCompilerOptionsFactory.kt +++ /dev/null @@ -1,27 +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.dsl.* -import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonCompilerOptionsDefault -import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget - -internal object CommonCompilerOptionsFactory : KotlinCompilationImplFactory.CompilerOptionsFactory { - override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.CompilerOptionsFactory.Options { - val compilerOptions = object : HasCompilerOptions { - override val options: KotlinMultiplatformCommonCompilerOptions = - target.project.objects.newInstance(KotlinMultiplatformCommonCompilerOptionsDefault::class.java) - } - - val kotlinOptions = object : KotlinCommonOptions { - override val options: KotlinCommonCompilerOptions - get() = compilerOptions.options - } - - return KotlinCompilationImplFactory.CompilerOptionsFactory.Options(compilerOptions, kotlinOptions) - } -} \ 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/JsCompilerOptionsFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JsCompilerOptionsFactory.kt deleted file mode 100644 index 435e0682102..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JsCompilerOptionsFactory.kt +++ /dev/null @@ -1,28 +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.dsl.KotlinJsCompilerOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompilerOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions -import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget - -internal object JsCompilerOptionsFactory : KotlinCompilationImplFactory.CompilerOptionsFactory { - override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.CompilerOptionsFactory.Options { - val compilerOptions = object : HasCompilerOptions { - override val options: KotlinJsCompilerOptions = - target.project.objects.newInstance(KotlinJsCompilerOptionsDefault::class.java) - } - - val kotlinOptions = object : KotlinJsOptions { - override val options: KotlinJsCompilerOptions - get() = compilerOptions.options - } - - return KotlinCompilationImplFactory.CompilerOptionsFactory.Options(compilerOptions, kotlinOptions) - } -} \ 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/JvmCompilerOptionsFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmCompilerOptionsFactory.kt deleted file mode 100644 index 722a5ea6975..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/JvmCompilerOptionsFactory.kt +++ /dev/null @@ -1,25 +0,0 @@ -package org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory - -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptionsDefault -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions -import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget - -internal object JvmCompilerOptionsFactory : KotlinCompilationImplFactory.CompilerOptionsFactory { - override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.CompilerOptionsFactory.Options { - val compilerOptions = object : HasCompilerOptions { - override val options: KotlinJvmCompilerOptions = - target.project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) - } - - val kotlinOptions = object : KotlinJvmOptions { - override val options: KotlinJvmCompilerOptions - get() = compilerOptions.options - } - - return KotlinCompilationImplFactory.CompilerOptionsFactory.Options(compilerOptions, kotlinOptions) - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationImplFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationImplFactory.kt index 4134baaee3f..ae9c464ef19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationImplFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilationImplFactory.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.decoratedInstance import org.jetbrains.kotlin.gradle.plugin.mpp.internal internal class KotlinCompilationImplFactory( - private val compilerOptionsFactory: CompilerOptionsFactory, + private val compilerOptionsFactory: KotlinCompilerOptionsFactory, private val compilationModuleFactory: CompilationModuleFactory = DefaultCompilationModuleFactory, @@ -75,7 +75,7 @@ internal class KotlinCompilationImplFactory( fun create(target: KotlinTarget, compilationName: String): KotlinCompilationOutput } - fun interface CompilerOptionsFactory { + fun interface KotlinCompilerOptionsFactory { data class Options(val compilerOptions: HasCompilerOptions<*>, val kotlinOptions: KotlinCommonOptions) fun create(target: KotlinTarget, compilationName: String): Options diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilerOptionsFactories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilerOptionsFactories.kt new file mode 100644 index 00000000000..bbf344fcbb9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/KotlinCompilerOptionsFactories.kt @@ -0,0 +1,75 @@ +/* + * 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.dsl.* +import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions +import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.targets.native.NativeCompilerOptions + +internal object KotlinMultiplatformCommonCompilerOptionsFactory : KotlinCompilationImplFactory.KotlinCompilerOptionsFactory { + override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options { + val compilerOptions = object : HasCompilerOptions { + override val options: KotlinMultiplatformCommonCompilerOptions = + target.project.objects.newInstance(KotlinMultiplatformCommonCompilerOptionsDefault::class.java) + } + + val kotlinOptions = object : KotlinCommonOptions { + override val options: KotlinCommonCompilerOptions + get() = compilerOptions.options + } + + return KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions) + } +} + +internal object KotlinNativeCompilerOptionsFactory : KotlinCompilationImplFactory.KotlinCompilerOptionsFactory { + + override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options { + val compilerOptions = NativeCompilerOptions(target.project) + + val kotlinOptions = object : KotlinCommonOptions { + override val options get() = compilerOptions.options + } + + return KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions) + } +} + + +internal object KotlinJsCompilerOptionsFactory : KotlinCompilationImplFactory.KotlinCompilerOptionsFactory { + override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options { + val compilerOptions = object : HasCompilerOptions { + override val options: KotlinJsCompilerOptions = + target.project.objects.newInstance(KotlinJsCompilerOptionsDefault::class.java) + } + + val kotlinOptions = object : KotlinJsOptions { + override val options: KotlinJsCompilerOptions + get() = compilerOptions.options + } + + return KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions) + } +} + +internal object KotlinJvmCompilerOptionsFactory : KotlinCompilationImplFactory.KotlinCompilerOptionsFactory { + override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options { + val compilerOptions = object : HasCompilerOptions { + override val options: KotlinJvmCompilerOptions = + target.project.objects.newInstance(KotlinJvmCompilerOptionsDefault::class.java) + } + + val kotlinOptions = object : KotlinJvmOptions { + override val options: KotlinJvmCompilerOptions + get() = compilerOptions.options + } + + return KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions) + } +} + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeCompilerOptionsFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeCompilerOptionsFactory.kt deleted file mode 100644 index de95ebbb52a..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/factory/NativeCompilerOptionsFactory.kt +++ /dev/null @@ -1,23 +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.dsl.KotlinCommonOptions -import org.jetbrains.kotlin.gradle.plugin.KotlinTarget -import org.jetbrains.kotlin.gradle.targets.native.NativeCompilerOptions - -internal object NativeCompilerOptionsFactory : KotlinCompilationImplFactory.CompilerOptionsFactory { - - override fun create(target: KotlinTarget, compilationName: String): KotlinCompilationImplFactory.CompilerOptionsFactory.Options { - val compilerOptions = NativeCompilerOptions(target.project) - - val kotlinOptions = object : KotlinCommonOptions { - override val options get() = compilerOptions.options - } - - return KotlinCompilationImplFactory.CompilerOptionsFactory.Options(compilerOptions, kotlinOptions) - } -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationFactory.kt index 770e31dd824..ab9906f0a78 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationFactory.kt @@ -7,14 +7,14 @@ 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.JsCompilerOptionsFactory +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 class KotlinJsCompilationFactory internal constructor( override val target: KotlinOnlyTarget, private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( - compilerOptionsFactory = JsCompilerOptionsFactory, + compilerOptionsFactory = KotlinJsCompilerOptionsFactory, compilationSourceSetsContainerFactory = JsCompilationSourceSetsContainerFactory, compilationDependencyConfigurationsFactory = JsKotlinCompilationDependencyConfigurationsFactory ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt index ca1691a85da..cea02540176 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrCompilationFactory.kt @@ -7,7 +7,7 @@ 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.JsCompilerOptionsFactory +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 @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinComp class KotlinJsIrCompilationFactory internal constructor( override val target: KotlinOnlyTarget, private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( - compilerOptionsFactory = JsCompilerOptionsFactory, + compilerOptionsFactory = KotlinJsCompilerOptionsFactory, compilationSourceSetsContainerFactory = JsIrCompilationSourceSetsContainerFactory, compilationDependencyConfigurationsFactory = JsKotlinCompilationDependencyConfigurationsFactory ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt index e75fc602975..6b3a54553da 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt @@ -10,14 +10,14 @@ import com.android.build.gradle.api.BaseVariant import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.AndroidKotlinCompilationAssociator import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationFriendPathsResolver import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.AndroidCompilationSourceSetsContainerFactory -import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JvmCompilerOptionsFactory +import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJvmCompilerOptionsFactory import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory class KotlinJvmAndroidCompilationFactory internal constructor( override val target: KotlinAndroidTarget, private val variant: BaseVariant, private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( - compilerOptionsFactory = JvmCompilerOptionsFactory, + compilerOptionsFactory = KotlinJvmCompilerOptionsFactory, compilationFriendPathsResolver = DefaultKotlinCompilationFriendPathsResolver( friendArtifactResolver = DefaultKotlinCompilationFriendPathsResolver.FriendArtifactResolver.composite( DefaultKotlinCompilationFriendPathsResolver.DefaultFriendArtifactResolver, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt index d5757936fba..5641e630a4d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.* -import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JvmCompilerOptionsFactory +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.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.utils.* @@ -17,7 +17,7 @@ open class KotlinJvmCompilationFactory internal constructor( override val target: KotlinJvmTarget, private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( - compilerOptionsFactory = JvmCompilerOptionsFactory, + compilerOptionsFactory = KotlinJvmCompilerOptionsFactory, compilationAssociator = JvmKotlinCompilationAssociator ), ) : KotlinCompilationFactory { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt index e83a2327eb4..a1b1b612aea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt @@ -32,7 +32,7 @@ class KotlinWithJavaCompilationFactory val compilerOptions = compilerOptionsFactory() val kotlinOptions = kotlinOptionsFactory(compilerOptions.options) - KotlinCompilationImplFactory.CompilerOptionsFactory.Options(compilerOptions, kotlinOptions) + KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions) }, compilationAssociator = JvmKotlinCompilationAssociator, compilationOutputFactory = { _, compilationName -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt index 057c9bfce51..a38ea0e1858 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt @@ -9,7 +9,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationSourceSetInclusion import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.NativeKotlinCompilationAssociator import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory -import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeCompilerOptionsFactory +import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinNativeCompilerOptionsFactory import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeKotlinCompilationDependencyConfigurationsFactory import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeKotlinCompilationTaskNamesContainerFactory @@ -19,7 +19,7 @@ open class KotlinNativeCompilationFactory internal constructor( KotlinCompilationImplFactory( compilationTaskNamesContainerFactory = NativeKotlinCompilationTaskNamesContainerFactory, compilationDependencyConfigurationsFactory = NativeKotlinCompilationDependencyConfigurationsFactory, - compilerOptionsFactory = NativeCompilerOptionsFactory, + compilerOptionsFactory = KotlinNativeCompilerOptionsFactory, compilationAssociator = NativeKotlinCompilationAssociator, compilationSourceSetInclusion = DefaultKotlinCompilationSourceSetInclusion( DefaultKotlinCompilationSourceSetInclusion.NativeAddSourcesToCompileTask diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt index 40cce918bb8..90dca80657d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationS import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.NativeKotlinCompilationAssociator 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.NativeCompilerOptionsFactory +import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinNativeCompilerOptionsFactory import org.jetbrains.kotlin.konan.target.KonanTarget open class KotlinSharedNativeCompilationFactory internal constructor( @@ -23,7 +23,7 @@ open class KotlinSharedNativeCompilationFactory internal constructor( private val compilationImplFactory: KotlinCompilationImplFactory = KotlinCompilationImplFactory( compilationDependencyConfigurationsFactory = DefaultKotlinCompilationDependencyConfigurationsFactory.WithoutRuntime, - compilerOptionsFactory = NativeCompilerOptionsFactory, + compilerOptionsFactory = KotlinNativeCompilerOptionsFactory, compilationAssociator = NativeKotlinCompilationAssociator, compilationSourceSetInclusion = DefaultKotlinCompilationSourceSetInclusion(