azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Actualize node and yarn version

Browse Source 
#KT-35599 fixed
This commit is contained in:
Ilya Goncharov
2019-12-20 14:28:15 +03:00
parent 24e3310393
commit 74889ef3ad
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
+1 -9
View File
@@ -1,19 +1,11 @@
package org.jetbrains.kotlin.gradle.targets.js.nodejs package org.jetbrains.kotlin.gradle.targets.js.nodejs
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.internal.isInIdeaSync
import org.jetbrains.kotlin.gradle.logging.kotlinInfo import org.jetbrains.kotlin.gradle.logging.kotlinInfo
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider 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.NpmVersions
import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinNpmResolutionManager 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.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.npm.tasks.KotlinNpmInstallTask
import org.jetbrains.kotlin.gradle.targets.js.yarn.Yarn import org.jetbrains.kotlin.gradle.targets.js.yarn.Yarn
import java.io.File import java.io.File
@@ -31,7 +23,7 @@ open class NodeJsRootExtension(val rootProject: Project) {
var download = true var download = true
var nodeDownloadBaseUrl = "https://nodejs.org/dist" var nodeDownloadBaseUrl = "https://nodejs.org/dist"
var nodeVersion = "10.15.3" var nodeVersion = "12.14.0"
var nodeCommand = "node" var nodeCommand = "node"
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt
+1 -1
View File
@@ -21,7 +21,7 @@ open class YarnRootExtension(val project: Project) {
var installationDir = gradleHome.resolve("yarn") var installationDir = gradleHome.resolve("yarn")
var downloadBaseUrl = "https://github.com/yarnpkg/yarn/releases/download" var downloadBaseUrl = "https://github.com/yarnpkg/yarn/releases/download"
var version = "1.15.2" var version = "1.21.1"
val yarnSetupTask: YarnSetupTask val yarnSetupTask: YarnSetupTask
get() = project.tasks.getByName(YarnSetupTask.NAME) as YarnSetupTask get() = project.tasks.getByName(YarnSetupTask.NAME) as YarnSetupTask