From ff9643b70e2808bd6fceee5746c330109d8043da Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 2 Aug 2021 14:21:08 +0200 Subject: [PATCH] [Gradle] CInteropCommonizerTask: Refine local variable names ^KT-47775 ^KT-47053 --- .../targets/native/internal/CInteropCommonizerTask.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt index 98dfd6fdb5b..9303a9bdcd7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerTask.kt @@ -99,14 +99,14 @@ internal open class CInteropCommonizerTask : AbstractCInteropCommonizerTask() { @Nested internal fun getAllInteropsGroups(): Set { val dependents = getAllDependents() - val allScopes = dependents.map { it.scopes }.toSet() - val rootScopes = allScopes.filter { scopes -> - allScopes.none { otherScopes -> otherScopes != scopes && otherScopes.containsAll(scopes) } + val allScopeSets = dependents.map { it.scopes }.toSet() + val rootScopeSets = allScopeSets.filter { scopeSet -> + allScopeSets.none { otherScopeSet -> otherScopeSet != scopeSet && otherScopeSet.containsAll(scopeSet) } } - return rootScopes.map { scopes -> + return rootScopeSets.map { scopeSet -> val dependentsForScopes = dependents.filter { dependent -> - scopes.containsAll(dependent.scopes) + scopeSet.containsAll(dependent.scopes) } CInteropCommonizerGroup(