From bbf933ce70815d97f4e29431ea5da1794e45009d Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 8 Feb 2024 22:04:59 +0100 Subject: [PATCH] [Gradle] Fix warnings in YarnWorkspaces ^KT-56904 In Progress --- .../kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt index 7edba137471..0b6708cb66c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnWorkspaces.kt @@ -23,7 +23,7 @@ class YarnWorkspaces : YarnBasics() { override fun prepareRootProject( nodeJs: NodeJsEnvironment, - yarn: YarnEnvironment, + packageManagerEnvironment: YarnEnvironment, rootProjectName: String, rootProjectVersion: String, subProjects: Collection, @@ -33,7 +33,7 @@ class YarnWorkspaces : YarnBasics() { rootProjectName, rootProjectVersion, subProjects, - yarn.yarnResolutions + packageManagerEnvironment.yarnResolutions .associate { it.path to it.toVersionString() }, ) } @@ -60,7 +60,7 @@ class YarnWorkspaces : YarnBasics() { services: ServiceRegistry, logger: Logger, nodeJs: NodeJsEnvironment, - yarn: YarnEnvironment, + packageManagerEnvironment: YarnEnvironment, npmProjects: Collection, cliArgs: List ) { @@ -70,7 +70,7 @@ class YarnWorkspaces : YarnBasics() { services, logger, nodeJs, - yarn, + packageManagerEnvironment, nodeJsWorldDir, NpmApiExecution.resolveOperationDescription("yarn"), cliArgs