From dba20b9d1d001535487820b82d07b6b003d05cb7 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 18 Jan 2023 11:29:25 +0100 Subject: [PATCH] [Gradle][Minor] KotlinNativeLink: Rename exportLibrariesResolvedGraph to exportLibrariesResolvedConfiguration KT-49933 --- .../gradle/targets/native/tasks/KotlinNativeLink.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt index 98abec52b94..29e87606109 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeLink.kt @@ -160,9 +160,9 @@ constructor( val processTests: Boolean get() = binary is TestExecutable @get:Classpath - val exportLibraries: FileCollection get() = exportLibrariesResolvedGraph?.files ?: objectFactory.fileCollection() + val exportLibraries: FileCollection get() = exportLibrariesResolvedConfiguration?.files ?: objectFactory.fileCollection() - private val exportLibrariesResolvedGraph = if (binary is AbstractNativeLibrary) { + private val exportLibrariesResolvedConfiguration = if (binary is AbstractNativeLibrary) { LazyResolvedConfiguration(project.configurations.getByName(binary.exportConfigurationName)) } else { null @@ -209,14 +209,14 @@ constructor( ) = Unit private fun validatedExportedLibraries() { - if (exportLibrariesResolvedGraph == null) return + if (exportLibrariesResolvedConfiguration == null) return val failed = mutableSetOf() - exportLibrariesResolvedGraph + exportLibrariesResolvedConfiguration .allDependencies .filterIsInstance() .forEach { - val dependencyFiles = exportLibrariesResolvedGraph.getArtifacts(it).map { it.file }.filterKlibsPassedToCompiler() + val dependencyFiles = exportLibrariesResolvedConfiguration.getArtifacts(it).map { it.file }.filterKlibsPassedToCompiler() if (!apiFiles.files.containsAll(dependencyFiles)) { failed.add(it) } @@ -226,7 +226,7 @@ constructor( val failedDependenciesList = failed.joinToString(separator = "\n") { val componentId = it.selected.id when (componentId) { - is ModuleComponentIdentifier -> "|Files: ${exportLibrariesResolvedGraph.getArtifacts(it).map { it.file }}" + is ModuleComponentIdentifier -> "|Files: ${exportLibrariesResolvedConfiguration.getArtifacts(it).map { it.file }}" is ProjectComponentIdentifier -> "|Project ${componentId.projectPath}" else -> "|${componentId.displayName}" }