From 6c6200a9c516d7a11bc37a9c0602ad5bcc94ca3d Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 4 Aug 2023 16:05:49 +0200 Subject: [PATCH] [Gradle][Minor] Deprecate 'KotlinCompilation.associateWith' property... ... in favor of associateCompilations and allAssociateCompilations ^KT-60937 Verification Pending --- .../api/kotlin-gradle-plugin-api.api | 5 +++++ .../kotlin/gradle/plugin/KotlinCompilation.kt | 19 ++++++++++++++++++- .../plugin/mpp/GradleProjectModuleBuilder.kt | 2 +- .../plugin/mpp/InternalKotlinCompilation.kt | 4 ++-- .../KotlinCompilationFriendPathsResolver.kt | 5 ++--- .../compilationImpl/KotlinCompilationImpl.kt | 3 --- .../gradle/plugin/mpp/kotlinCompilations.kt | 3 --- .../sources/SourceSetsVisibilityInference.kt | 7 ++----- .../internal/CInteropCommonizerDependent.kt | 5 ++--- .../CInteropPropagatedDependencies.kt | 2 +- .../tasks/KotlinNativePerformanceTask.kt | 2 +- .../AbstractKotlinCompileConfig.kt | 3 +-- .../unitTests/ExternalKotlinTargetApiTests.kt | 2 +- 13 files changed, 36 insertions(+), 26 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index 8d7e6937275..e3cbad74c32 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -707,8 +707,10 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinCompila public abstract fun attributes (Lorg/gradle/api/Action;)V public abstract fun defaultSourceSet (Lkotlin/jvm/functions/Function1;)V public abstract fun defaultSourceSet (Lorg/gradle/api/Action;)V + public abstract fun getAllAssociatedCompilations ()Ljava/util/Set; public abstract fun getAllKotlinSourceSets ()Ljava/util/Set; public abstract fun getAssociateWith ()Ljava/util/List; + public abstract fun getAssociatedCompilations ()Ljava/util/Set; public abstract fun getCompilationName ()Ljava/lang/String; public abstract fun getCompileAllTaskName ()Ljava/lang/String; public abstract fun getCompileDependencyConfigurationName ()Ljava/lang/String; @@ -744,6 +746,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/KotlinCompilation$DefaultI public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;Lkotlin/jvm/functions/Function1;)V public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;Lorg/gradle/api/Action;)V public static fun defaultSourceSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;Lorg/gradle/api/Action;)V + public static fun getAssociateWith (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;)Ljava/util/List; public static fun getDefaultSourceSetName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;)Ljava/lang/String; public static fun getDisambiguatedName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;)Ljava/lang/String; public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilation;)Ljava/lang/String; @@ -774,6 +777,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnabl public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;Lkotlin/jvm/functions/Function1;)V public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;Lorg/gradle/api/Action;)V public static fun defaultSourceSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;Lorg/gradle/api/Action;)V + public static fun getAssociateWith (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;)Ljava/util/List; public static fun getDefaultSourceSetName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;)Ljava/lang/String; public static fun getDisambiguatedName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;)Ljava/lang/String; public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationToRunnableFiles;)Ljava/lang/String; @@ -790,6 +794,7 @@ public final class org/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResou public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;Lkotlin/jvm/functions/Function1;)V public static fun attributes (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;Lorg/gradle/api/Action;)V public static fun defaultSourceSet (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;Lorg/gradle/api/Action;)V + public static fun getAssociateWith (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;)Ljava/util/List; public static fun getDefaultSourceSetName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;)Ljava/lang/String; public static fun getDisambiguatedName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;)Ljava/lang/String; public static fun getName (Lorg/jetbrains/kotlin/gradle/plugin/KotlinCompilationWithResources;)Ljava/lang/String; diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt index d0840da8f70..9fa77da023b 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt @@ -14,6 +14,7 @@ import org.gradle.api.attributes.HasAttributes import org.gradle.api.file.FileCollection import org.gradle.api.file.SourceDirectorySet import org.gradle.api.tasks.TaskProvider +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptionsDeprecated import org.jetbrains.kotlin.gradle.dsl.KotlinCompileDeprecated import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask @@ -136,7 +137,23 @@ interface KotlinCompilation : Named, fun associateWith(other: KotlinCompilation<*>) - val associateWith: List> + @Deprecated("Use 'associatedCompilations' instead", ReplaceWith("associatedCompilations.toList()")) + val associateWith: List> get() = associatedCompilations.toList() + + /** + * All compilations previously associated using [associateWith] + * + * e.g. 'test' compilations will return 'setOf(main)' by default + * @since 1.9.20 + */ + val associatedCompilations: Set> + + /** + * Full transitive closure of [associatedCompilations] + * @since 1.9.20 + */ + @ExperimentalKotlinGradlePluginApi + val allAssociatedCompilations: Set> override fun getName(): String = compilationName diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt index a45c4e1b7ae..ef644018758 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GradleProjectModuleBuilder.kt @@ -208,7 +208,7 @@ class GradleProjectModuleBuilder(private val addInferredSourceSetVisibilityAsExp targets.flatMap { it.compilations }.forEach { compilation -> val variant = fragmentByName(compilation.defaultSourceSetName) - compilation.associateWith.forEach { associate -> + compilation.associatedCompilations.forEach { associate -> val associateVariant = fragmentByName(associate.defaultSourceSetName) variant.declaredModuleDependencies.add(KpmModuleDependency(associateVariant.containingModule.moduleIdentifier)) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt index e2035d86938..abc2a7e708e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinCompilation.kt @@ -21,8 +21,8 @@ internal interface InternalKotlinCompilation : Kotl override val kotlinSourceSets: ObservableSet override val allKotlinSourceSets: ObservableSet - val associatedCompilations: ObservableSet> - val allAssociatedCompilations: ObservableSet> + override val associatedCompilations: ObservableSet> + override val allAssociatedCompilations: ObservableSet> val configurations: KotlinCompilationConfigurationsContainer val friendPaths: Iterable diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationFriendPathsResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationFriendPathsResolver.kt index 46c499ddde9..ffc76b20697 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationFriendPathsResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationFriendPathsResolver.kt @@ -10,7 +10,6 @@ import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.bundling.AbstractArchiveTask import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.sources.getVisibleSourceSetsFromAssociateCompilations -import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTool import org.jetbrains.kotlin.gradle.utils.filesProvider @@ -25,7 +24,7 @@ internal class DefaultKotlinCompilationFriendPathsResolver( override fun resolveFriendPaths(compilation: InternalKotlinCompilation<*>): Iterable { return mutableListOf().apply { - compilation.associateWithClosure.forEach { + compilation.allAssociatedCompilations.forEach { add(it.output.classesDirs) // Adding classes that could be produced to non-default destination for JVM target // Check KotlinSourceSetProcessor for details @@ -69,7 +68,7 @@ internal class DefaultKotlinCompilationFriendPathsResolver( } private fun resolveFriendArtifactsTask(compilation: InternalKotlinCompilation<*>): TaskProvider? { - if (compilation.associateWithClosure.none { it.isMain() }) return null + if (compilation.allAssociatedCompilations.none { it.isMain() }) return null val archiveTasks = compilation.project.tasks.withType(AbstractArchiveTask::class.java) if (compilation.target.artifactsTaskName !in archiveTasks.names) return null return archiveTasks.named(compilation.target.artifactsTaskName) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt index 10bf4392a6d..89ee56d4e7f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationImpl.kt @@ -194,9 +194,6 @@ internal class KotlinCompilationImpl constructor( override val allAssociatedCompilations: ObservableSet> get() = allAssociatedCompilationsImpl - override val associateWith: List> - get() = associatedCompilationsImpl.toList() - override fun associateWith(other: KotlinCompilation<*>) { require(other.target == target) { "Only associations between compilations of a single target are supported" } if (!associatedCompilationsImpl.add(other)) return diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt index 11e6601fadc..5d7f785a37d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt @@ -71,9 +71,6 @@ internal fun addSourcesToKotlinCompileTask( } } -internal val KotlinCompilation<*>.associateWithClosure: Iterable> - get() = this.closure { it.associateWith } - internal fun KotlinCompilation<*>.disambiguateName(simpleName: String): String { return lowerCamelCaseName( target.disambiguationClassifier, diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetsVisibilityInference.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetsVisibilityInference.kt index dc363d41913..dde8da65938 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetsVisibilityInference.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetsVisibilityInference.kt @@ -6,14 +6,11 @@ package org.jetbrains.kotlin.gradle.plugin.sources import org.gradle.api.GradleException -import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithClosure fun getSourceSetsFromAssociatedCompilations(fromCompilation: KotlinCompilation<*>): Map, Set> = - fromCompilation.associateWithClosure.associate { it to it.allKotlinSourceSets } + fromCompilation.allAssociatedCompilations.associate { it to it.allKotlinSourceSets } fun getVisibleSourceSetsFromAssociateCompilations( sourceSet: KotlinSourceSet @@ -93,7 +90,7 @@ class UnsatisfiedSourceSetVisibilityException( else "\n" ) - compilation.associateWith.forEach { appendCompilationRecursively(it, depth + 1) } + compilation.associatedCompilations.toList().forEach { appendCompilationRecursively(it, depth + 1) } if (!isAssociatedCompilation) { val missingRequiredSourceSets = requiredButNotVisible.filter { missingSourceSet -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerDependent.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerDependent.kt index d3a14d2a085..6ca899631a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerDependent.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerDependent.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.commonizer.SharedCommonizerTarget import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation -import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithClosure import org.jetbrains.kotlin.gradle.plugin.sources.internal import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier.Scope import org.jetbrains.kotlin.tooling.core.UnsafeApi @@ -58,7 +57,7 @@ internal fun CInteropCommonizerDependent.Factory.from( This relationship should not be declared, but we try to be lenient towards it here. */ val filteredCompilations = compilations.filter { compilation -> - compilation.associateWithClosure.none { associateCompilation -> associateCompilation in compilations } + compilation.allAssociatedCompilations.none { associatedCompilation -> associatedCompilation in compilations } }.ifEmpty { return null }.toSet() val scopes: Set = filteredCompilations @@ -92,7 +91,7 @@ internal suspend fun CInteropCommonizerDependent.Factory.fromAssociateCompilatio target = sourceSet.commonizerTarget.await() as? SharedCommonizerTarget ?: return null, compilations = sourceSet.internal.compilations .filterIsInstance() - .flatMap { compilation -> compilation.associateWithClosure } + .flatMap { compilation -> compilation.allAssociatedCompilations } .filterIsInstance() .toSet() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropPropagatedDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropPropagatedDependencies.kt index 964534a423a..0a0b7b652b2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropPropagatedDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropPropagatedDependencies.kt @@ -76,7 +76,7 @@ internal fun Project.getPlatformCinteropDependenciesOrEmpty( /* Participating in multiple compilations? -> can't propagate -> should be commonized */ val compilation = compilations.singleOrNull() as? KotlinNativeCompilation ?: return@files emptySet() - (compilation.associateWith + compilation) + (compilation.associatedCompilations + compilation) .filterIsInstance() .filter(compilationFilter) .map { relevantCompilation -> getAllCInteropOutputFiles(relevantCompilation) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt index 411577704e4..944ce8dcf92 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativePerformanceTask.kt @@ -45,7 +45,7 @@ open class NativePerformanceReport : DefaultTask() { // Get compile task and associated with it other compile tasks. private fun getAllExecutedTasks(compilation: KotlinCompilation<*>): List { val tasks = mutableListOf(compilation.compileKotlinTask as Task) - compilation.associateWith.forEach { + compilation.associatedCompilations.toList().forEach { tasks += getAllExecutedTasks(it) } return tasks diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt index 596849af912..576d44e8bb8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPro import org.jetbrains.kotlin.gradle.plugin.internal.BuildIdService import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget -import org.jetbrains.kotlin.gradle.plugin.mpp.associateWithClosure import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.report.BuildMetricsService import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile @@ -127,7 +126,7 @@ internal abstract class AbstractKotlinCompileConfig task.friendSourceSets - .value(providers.provider { compilation.associateWithClosure.map { it.name } }) + .value(providers.provider { compilation.allAssociatedCompilations.map { it.name } }) .disallowChanges() task.pluginClasspath.from( compilation.internal.configurations.pluginConfiguration diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ExternalKotlinTargetApiTests.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ExternalKotlinTargetApiTests.kt index df33162b562..bbf988daa78 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ExternalKotlinTargetApiTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ExternalKotlinTargetApiTests.kt @@ -107,7 +107,7 @@ class ExternalKotlinTargetApiTests { } auxCompilation.associateWith(mainCompilation) - assertEquals(setOf(mainCompilation), auxCompilation.associateWith.toSet()) + assertEquals(setOf(mainCompilation), auxCompilation.associatedCompilations.toSet()) } @Test