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

[Build] Update gradle-node-plugin to 3.2.1

Browse Source 
#KT-44611 In Progress
This commit is contained in:
Alexander Likhachev
2022-04-11 15:31:35 +03:00
parent e42bed07fa
commit 899964ba30
8 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/verification-metadata.xml
+6 -10
View File
@@ -1601,16 +1601,11 @@
<sha256 value="93aaeceb6fd0763389105195e4c81d6a2728221adad121d070abe392c6352b62" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.node-gradle.node" name="com.github.node-gradle.node.gradle.plugin" version="2.2.0">
<artifact name="com.github.node-gradle.node.gradle.plugin-2.2.0.pom">
<md5 value="18b1c99dedfc78a911c8b6527f126ba1" origin="Generated by Gradle"/>
<sha256 value="527d7508a0db5e8a70a504a9c7a5b1cce1666816c98889bd82145f37f3299f75" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.node-gradle.node" name="com.github.node-gradle.node.gradle.plugin" version="3.0.1">
<artifact name="com.github.node-gradle.node.gradle.plugin-3.0.1.pom">
<md5 value="3bf4c5aae083a8e8689224f472883e49" origin="Generated by Gradle"/>
<sha256 value="29923580482a176ec69b10f2157515d70c18efbf9d8fbfda8979e8754d43cd5f" origin="Generated by Gradle"/>
<component group="com.github.node-gradle" name="gradle-node-plugin" version="3.2.1">
<artifact name="gradle-node-plugin-3.2.1.jar">
<md5 value="e411ec6b32e8f8bddd1104c396d24f31" origin="https://plugins.gradle.org/m2/com/github/node-gradle/gradle-node-plugin/3.2.1/"/>
<sha1 value="c0e6aaed687f2b0ba5f3d3b5571d8abff0aa8c09" origin="https://plugins.gradle.org/m2/com/github/node-gradle/gradle-node-plugin/3.2.1/"/>
<sha256 value="f171cbafa1dd95ab936f528fde31bc94652611d98945efe3598a20053834a5c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google" name="google" version="1">
@@ -6561,6 +6556,7 @@
</component>
<component group="org.jetbrains.kotlin" name="kotlin-build-gradle-plugin" version="0.0.38">
<artifact name="kotlin-build-gradle-plugin-0.0.38.jar">
<md5 value="751f1aeb1b7d0ef6891f8e386be02521" origin="Generated by Gradle"/>
<sha256 value="29e43c419a021cbe87432ec8f67f0640096009cdc3f7efe5e7e25e9003b27205" origin="Generated by Gradle"/>
</artifact>
</component>
js/js.tests/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.ideaExt.idea
plugins {
kotlin("jvm")
id("jps-compatible")
id("com.github.node-gradle.node") version "3.0.1"
id("com.github.node-gradle.node") version "3.2.1"
id("de.undercouch.download")
}
js/npm/build.gradle.kts
+1 -1
View File
@@ -1,7 +1,7 @@
import com.github.gradle.node.npm.task.NpmTask
plugins {
id("com.github.node-gradle.node") version "3.0.1"
id("com.github.node-gradle.node") version "3.2.1"
base
}
libraries/kotlin.test/js-ir/it/build.gradle.kts
+14 -12
View File
@@ -1,4 +1,4 @@
import com.moowork.gradle.node.npm.NpmTask
import com.github.gradle.node.npm.task.NpmTask
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrLink
@@ -6,14 +6,14 @@ import java.io.FileOutputStream
plugins {
kotlin("js")
id("com.github.node-gradle.node") version "2.2.0"
id("com.github.node-gradle.node") version "3.2.1"
}
description = "Kotlin-test integration tests for JS IR"
node {
version = "16.13.0"
download = true
version.set("16.13.0")
download.set(true)
}
val jsMainSources by task<Sync> {
@@ -75,28 +75,30 @@ val populateNodeModules = tasks.register<Copy>("populateNodeModules") {
fun createFrameworkTest(name: String): TaskProvider<NpmTask> {
return tasks.register("test$name", NpmTask::class.java) {
dependsOn(compileTestDevelopmentExecutableKotlinJs, populateNodeModules, "npmInstall")
val testName = name
val lowerName = name.toLowerCase()
val tcOutput = "$buildDir/tc-${lowerName}.log"
val tcOutput = project.file("$buildDir/tc-${lowerName}.log")
val stdOutput = "$buildDir/test-${lowerName}.log"
val errOutput = "$buildDir/test-${lowerName}.err.log"
val exitCodeFile = project.file("$buildDir/test-${lowerName}.exit-code")
// inputs.files(sourceSets.test.output)
inputs.dir("${buildDir}/node_modules")
outputs.files(tcOutput, stdOutput, errOutput)
outputs.files(tcOutput, stdOutput, errOutput, exitCodeFile)
setArgs(listOf("run", "test-$lowerName"))
args.set(listOf("run", "test-$lowerName"))
// args("run")
// args("test-$lowerName")
group = "verification"
setExecOverrides(closureOf<ExecSpec> {
execOverrides {
isIgnoreExitValue = true
standardOutput = FileOutputStream(stdOutput)
errorOutput = FileOutputStream(errOutput)
})
}
doLast {
println(file(tcOutput).readText())
if (result.exitValue != 0/* && !rootProject.ignoreTestFailures*/) {
throw GradleException("$name integration test failed")
println(tcOutput.readText())
if (exitCodeFile.readText() != "0" /* && !rootProject.ignoreTestFailures*/) {
throw GradleException("$testName integration test failed")
}
}
libraries/kotlin.test/js/it/build.gradle
+11 -9
View File
@@ -2,8 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
plugins {
// TODO: update gradle-node-plugin to support configuration cache
id "com.github.node-gradle.node" version "2.2.0"
id "com.github.node-gradle.node" version "3.2.1"
}
description = 'Kotlin-test integration tests for JS'
@@ -59,13 +58,15 @@ node {
def createFrameworkTest(def name) {
return tasks.register("test$name", NpmTask) {
dependsOn(compileTestKotlin2Js, populateNodeModules, npmInstall)
def testName = name
def lowerName = name.toLowerCase()
def tcOutput = "$buildDir/tc-${lowerName}.log"
def tcOutput = project.file("$buildDir/tc-${lowerName}.log")
def stdOutput = "$buildDir/test-${lowerName}.log"
def errOutput = "$buildDir/test-${lowerName}.err.log"
def exitCodeFile = project.file("$buildDir/test-${lowerName}.exit-code")
inputs.files(sourceSets.test.output)
inputs.dir("${buildDir}/node_modules")
outputs.files(tcOutput, stdOutput, errOutput)
outputs.files(tcOutput, stdOutput, errOutput, exitCodeFile)
args = ['run', "test-$lowerName"]
group = 'verification'
@@ -74,12 +75,13 @@ def createFrameworkTest(def name) {
it.standardOutput = new FileOutputStream(stdOutput)
it.errorOutput = new FileOutputStream(errOutput)
}
doLast {
println file(tcOutput).text
if (result.exitValue != 0 && !rootProject.ignoreTestFailures) {
throw new GradleException("$name integration test failed")
}
def ignoreTestFailures = rootProject.ignoreTestFailures
doLast {
println tcOutput.text
if (exitCodeFile.text != "0" && !ignoreTestFailures) {
throw new GradleException("$testName integration test failed")
}
}
}
}
libraries/kotlin.test/js/it/js/test-result-checker.js
+1
View File
@@ -70,6 +70,7 @@ Tester.prototype.printResult = function () {
}
fs.writeFileSync('build/tc-' + this._frameworkName + '.log', message);
fs.writeFileSync('build/test-' + this._frameworkName + '.exit-code', this.exitCode().toString());
};
Tester.prototype.exitCode = function () {
libraries/tools/kotlin-test-js-runner/build.gradle.kts
+1 -1
View File
@@ -4,7 +4,7 @@ description = "Simple Kotlin/JS tests runner with TeamCity reporter"
plugins {
id("base")
id("com.github.node-gradle.node") version "3.0.1"
id("com.github.node-gradle.node") version "3.2.1"
}
publish()
plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+3 -3
View File
@@ -7,13 +7,13 @@ description = "Atomicfu Compiler Plugin"
plugins {
kotlin("jvm")
id("jps-compatible")
id("com.github.node-gradle.node") version "2.2.0"
id("com.github.node-gradle.node") version "3.2.1"
id("de.undercouch.download")
}
node {
download = true
version = "10.16.2"
download.set(true)
version.set("10.16.2")
}
val antLauncherJar by configurations.creating