From 74889ef3ad813eb8097b57bd86b7b4b540ee10b8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 20 Dec 2019 14:28:15 +0300 Subject: [PATCH] [Gradle, JS] Actualize node and yarn version #KT-35599 fixed --- .../gradle/targets/js/nodejs/NodeJsRootExtension.kt | 10 +--------- .../kotlin/gradle/targets/js/yarn/YarnRootExtension.kt | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt index ada930b131e..af4404d32a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt @@ -1,19 +1,11 @@ package org.jetbrains.kotlin.gradle.targets.js.nodejs import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.internal.isInIdeaSync import org.jetbrains.kotlin.gradle.logging.kotlinInfo import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.NpmVersions import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinNpmResolutionManager import org.jetbrains.kotlin.gradle.targets.js.npm.NpmApi -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency -import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies -import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinCompilationNpmResolution -import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinRootNpmResolution -import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution -import org.jetbrains.kotlin.gradle.targets.js.npm.resolver.KotlinRootNpmResolver import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask import org.jetbrains.kotlin.gradle.targets.js.yarn.Yarn import java.io.File @@ -31,7 +23,7 @@ open class NodeJsRootExtension(val rootProject: Project) { var download = true var nodeDownloadBaseUrl = "https://nodejs.org/dist" - var nodeVersion = "10.15.3" + var nodeVersion = "12.14.0" var nodeCommand = "node" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt index 34e308c3af8..aa4da193ad1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt @@ -21,7 +21,7 @@ open class YarnRootExtension(val project: Project) { var installationDir = gradleHome.resolve("yarn") var downloadBaseUrl = "https://github.com/yarnpkg/yarn/releases/download" - var version = "1.15.2" + var version = "1.21.1" val yarnSetupTask: YarnSetupTask get() = project.tasks.getByName(YarnSetupTask.NAME) as YarnSetupTask