Skip to content

Commit dba20b9

Browse files
sellmairSpace Team
authored and
Space Team
committed
[Gradle][Minor] KotlinNativeLink: Rename exportLibrariesResolvedGraph to exportLibrariesResolvedConfiguration
KT-49933
1 parent afec974 commit dba20b9

File tree

1 file changed

+6
-6
lines changed
  • libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ constructor(
160160
val processTests: Boolean get() = binary is TestExecutable
161161

162162
@get:Classpath
163-
val exportLibraries: FileCollection get() = exportLibrariesResolvedGraph?.files ?: objectFactory.fileCollection()
163+
val exportLibraries: FileCollection get() = exportLibrariesResolvedConfiguration?.files ?: objectFactory.fileCollection()
164164

165-
private val exportLibrariesResolvedGraph = if (binary is AbstractNativeLibrary) {
165+
private val exportLibrariesResolvedConfiguration = if (binary is AbstractNativeLibrary) {
166166
LazyResolvedConfiguration(project.configurations.getByName(binary.exportConfigurationName))
167167
} else {
168168
null
@@ -209,14 +209,14 @@ constructor(
209209
) = Unit
210210

211211
private fun validatedExportedLibraries() {
212-
if (exportLibrariesResolvedGraph == null) return
212+
if (exportLibrariesResolvedConfiguration == null) return
213213

214214
val failed = mutableSetOf<ResolvedDependencyResult>()
215-
exportLibrariesResolvedGraph
215+
exportLibrariesResolvedConfiguration
216216
.allDependencies
217217
.filterIsInstance<ResolvedDependencyResult>()
218218
.forEach {
219-
val dependencyFiles = exportLibrariesResolvedGraph.getArtifacts(it).map { it.file }.filterKlibsPassedToCompiler()
219+
val dependencyFiles = exportLibrariesResolvedConfiguration.getArtifacts(it).map { it.file }.filterKlibsPassedToCompiler()
220220
if (!apiFiles.files.containsAll(dependencyFiles)) {
221221
failed.add(it)
222222
}
@@ -226,7 +226,7 @@ constructor(
226226
val failedDependenciesList = failed.joinToString(separator = "\n") {
227227
val componentId = it.selected.id
228228
when (componentId) {
229-
is ModuleComponentIdentifier -> "|Files: ${exportLibrariesResolvedGraph.getArtifacts(it).map { it.file }}"
229+
is ModuleComponentIdentifier -> "|Files: ${exportLibrariesResolvedConfiguration.getArtifacts(it).map { it.file }}"
230230
is ProjectComponentIdentifier -> "|Project ${componentId.projectPath}"
231231
else -> "|${componentId.displayName}"
232232
}

0 commit comments

Comments
 (0)