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

[Gradle][Minor] Fix naming of KotlinCompilationAssociator impls

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-27 08:57:32 +02:00
committed by Space Team
parent 331294c747
commit f109b11746
6 changed files with 18 additions and 17 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/KotlinCompilationDependencyAssociation.kt → libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationAssociator.kt
+3 -4
View File
@@ -51,7 +51,7 @@ internal object DefaultKotlinCompilationAssociator : KotlinCompilationAssociator
}
}
internal object NativeKotlinCompilationAssociator : KotlinCompilationAssociator {
internal object KotlinNativeCompilationAssociator : KotlinCompilationAssociator {
override fun associate(target: KotlinTarget, first: InternalKotlinCompilation<*>, second: InternalKotlinCompilation<*>) {
first.compileDependencyFiles +=
@@ -63,7 +63,7 @@ internal object NativeKotlinCompilationAssociator : KotlinCompilationAssociator
}
}
internal object JvmKotlinCompilationAssociator : KotlinCompilationAssociator {
internal object KotlinJvmCompilationAssociator : KotlinCompilationAssociator {
override fun associate(target: KotlinTarget, first: InternalKotlinCompilation<*>, second: InternalKotlinCompilation<*>) {
/* Main to Test association handled already by java plugin */
if (target is KotlinJvmTarget && target.withJavaEnabled && first.isMain() && second.isTest()) {
@@ -81,7 +81,7 @@ internal object JvmKotlinCompilationAssociator : KotlinCompilationAssociator {
* We now explicitly add associate compilation dependencies to the Kotlin test compilation configurations (test classpaths).
* This helps, because the Android test classpath configurations extend from the Kotlin test compilations' directly.
*/
internal object AndroidKotlinCompilationAssociator : KotlinCompilationAssociator {
internal object KotlinAndroidCompilationAssociator : KotlinCompilationAssociator {
override fun associate(target: KotlinTarget, first: InternalKotlinCompilation<*>, second: InternalKotlinCompilation<*>) {
first.compileDependencyConfigurationName.addAllDependenciesFromOtherConfigurations(
target.project,
@@ -90,7 +90,6 @@ internal object AndroidKotlinCompilationAssociator : KotlinCompilationAssociator
second.compileOnlyConfigurationName
)
}
}
/**
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmAndroidCompilationFactory.kt
+2 -2
View File
@@ -7,7 +7,7 @@
package org.jetbrains.kotlin.gradle.plugin.mpp
import com.android.build.gradle.api.BaseVariant
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.AndroidKotlinCompilationAssociator
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.factory.AndroidCompilationSourceSetsContainerFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJvmCompilerOptionsFactory
@@ -24,7 +24,7 @@ class KotlinJvmAndroidCompilationFactory internal constructor(
DefaultKotlinCompilationFriendPathsResolver.AdditionalAndroidFriendArtifactResolver
)
),
compilationAssociator = AndroidKotlinCompilationAssociator,
compilationAssociator = KotlinAndroidCompilationAssociator,
compilationSourceSetsContainerFactory = AndroidCompilationSourceSetsContainerFactory(target, variant)
)
) : KotlinCompilationFactory<KotlinJvmAndroidCompilation> {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmCompilationFactory.kt
+7 -5
View File
@@ -8,19 +8,21 @@ 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.KotlinJvmCompilerOptionsFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinJvmCompilerOptionsFactory
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
import org.jetbrains.kotlin.gradle.utils.*
open class KotlinJvmCompilationFactory internal constructor(
override val target: KotlinJvmTarget,
override val target: KotlinJvmTarget
) : KotlinCompilationFactory<KotlinJvmCompilation> {
private val compilationImplFactory: KotlinCompilationImplFactory =
KotlinCompilationImplFactory(
compilerOptionsFactory = KotlinJvmCompilerOptionsFactory,
compilationAssociator = JvmKotlinCompilationAssociator
),
) : KotlinCompilationFactory<KotlinJvmCompilation> {
compilationAssociator = KotlinJvmCompilationAssociator
)
override val itemClass: Class<KotlinJvmCompilation>
get() = KotlinJvmCompilation::class.java
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaCompilationFactory.kt
+2 -2
View File
@@ -9,7 +9,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.plugin.HasCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.JvmKotlinCompilationAssociator
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinJvmCompilationAssociator
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JvmWithJavaCompilationDependencyConfigurationsFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.JvmWithJavaCompilationTaskNamesContainerFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
@@ -34,7 +34,7 @@ class KotlinWithJavaCompilationFactory<KotlinOptionsType : KotlinCommonOptions,
val kotlinOptions = kotlinOptionsFactory(compilerOptions.options)
KotlinCompilationImplFactory.KotlinCompilerOptionsFactory.Options(compilerOptions, kotlinOptions)
},
compilationAssociator = JvmKotlinCompilationAssociator,
compilationAssociator = KotlinJvmCompilationAssociator,
compilationOutputFactory = { _, compilationName ->
KotlinWithJavaCompilationOutput(target.javaSourceSets.maybeCreate(compilationName))
},
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilationFactory.kt
+2 -2
View File
@@ -7,7 +7,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.KotlinNativeCompilationAssociator
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinNativeCompilerOptionsFactory
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.NativeKotlinCompilationDependencyConfigurationsFactory
@@ -20,7 +20,7 @@ open class KotlinNativeCompilationFactory internal constructor(
compilationTaskNamesContainerFactory = NativeKotlinCompilationTaskNamesContainerFactory,
compilationDependencyConfigurationsFactory = NativeKotlinCompilationDependencyConfigurationsFactory,
compilerOptionsFactory = KotlinNativeCompilerOptionsFactory,
compilationAssociator = NativeKotlinCompilationAssociator,
compilationAssociator = KotlinNativeCompilationAssociator,
compilationSourceSetInclusion = DefaultKotlinCompilationSourceSetInclusion(
DefaultKotlinCompilationSourceSetInclusion.NativeAddSourcesToCompileTask
),
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinSharedNativeCompilationFactory.kt
+2 -2
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationFriendPathsResolver
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.DefaultKotlinCompilationSourceSetInclusion
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinCompilationSourceSetsContainer
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.NativeKotlinCompilationAssociator
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.KotlinNativeCompilationAssociator
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.KotlinNativeCompilerOptionsFactory
@@ -24,7 +24,7 @@ open class KotlinSharedNativeCompilationFactory internal constructor(
KotlinCompilationImplFactory(
compilationDependencyConfigurationsFactory = DefaultKotlinCompilationDependencyConfigurationsFactory.WithoutRuntime,
compilerOptionsFactory = KotlinNativeCompilerOptionsFactory,
compilationAssociator = NativeKotlinCompilationAssociator,
compilationAssociator = KotlinNativeCompilationAssociator,
compilationSourceSetInclusion = DefaultKotlinCompilationSourceSetInclusion(
DefaultKotlinCompilationSourceSetInclusion.NativeAddSourcesToCompileTask