Migrate to kotlinx.team.node from mooworks

Author: orangy

README.md

@@ -20,35 +20,15 @@ If you are using it for Kotlin Multiplatform, enable metadata in `settings.gradl
 enableFeaturePreview('GRADLE_METADATA')
 ```
 
-In `build.gradle` apply plugin:
-
-```groovy
-plugins {
-    id 'org.jetbrains.gradle.benchmarks.plugin' version '0.1.7'
-}
-```
-
 For Kotlin/JS code, add Node plugin as well:
 
 ```groovy
 plugins {
-    id 'com.moowork.node' version '1.2.0'
+    id 'kotlinx.team.node' 
 }
 
 node {
     version = "$node_version"
-    npmVersion = "$npm_version"
-    download = true
-    nodeModulesDir = file(buildDir)
-}
-
-// Workaround the problem with Node downloading
-repositories.whenObjectAdded {
-    if (it instanceof IvyArtifactRepository) {
-        metadataSources {
-            artifact()
-        }
-    }
 }
 ```
 

build.gradle

@@ -2,13 +2,13 @@ buildscript {
     repositories {
         jcenter()
         gradlePluginPortal()
-        //maven { url "../kotlin-libraries-infra/build/maven" }
+//        maven { url "../kotlin-libraries-infra/build/maven" }
         maven { url "https://dl.bintray.com/orangy/maven" }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-25"
+        classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-26"
     }
 }
 

examples/build.gradle

@@ -8,7 +8,11 @@ subprojects {
             url = "$rootProject.buildDir/maven"
         }
 
+        mavenLocal()
         mavenCentral()
-        maven { url 'https://dl.bintray.com/orangy/maven' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+        maven { url "https://dl.bintray.com/orangy/maven" }
+//        maven { url "$rootProject.projectDir/../kotlin-libraries-infra/build/maven" }
     }
 }

examples/kotlin-kts/build.gradle.kts

@@ -11,12 +11,6 @@ plugins {
     id("org.jetbrains.gradle.benchmarks.plugin") version "0.1.7" 
 }
 
-repositories {
-    mavenCentral()
-    maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
-    maven { setUrl("https://dl.bintray.com/kotlin/kotlin-dev") }
-}
-
 sourceSets.all {
     java.srcDir("$name/src")
     resources.srcDir("$name/resources")

examples/kotlin-multiplatform/build.gradle

@@ -1,46 +1,30 @@
 import org.jetbrains.kotlin.konan.target.HostManager
 
+buildscript {
+    repositories {
+//        maven { url "$rootProject.projectDir/../kotlin-libraries-infra/build/maven" }
+    }
+}
+
 plugins {
     id 'org.jetbrains.kotlin.multiplatform' 
     id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.20"
-    id 'com.moowork.node' version '1.2.0'
     id 'org.jetbrains.gradle.benchmarks.plugin' version "0.1.7"
-}
-
-node {
-    version = "$node_version"
-    npmVersion = "$npm_version"
-    download = true
-
-    workDir = new File(rootProject.projectDir, ".gradle/nodejs")
-    npmWorkDir = new File(rootProject.projectDir, ".gradle/npm")
-    nodeModulesDir = file(buildDir)
-}
-
-// Workaround the problem with Node downloading
-repositories.all {
-    if (it instanceof IvyArtifactRepository) {
-        metadataSources {
-            artifact()
-        }
-    }
+    id 'kotlinx.team.node' 
 }
 
 project.ext.hostManager = new HostManager()
 apply from: rootProject.file("gradle/utility.gradle")
 
+node {
+    version = '10.15.1'
+}
+
 // how to apply plugin to a specific source set?
 allOpen {
     annotation("org.openjdk.jmh.annotations.State")
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
-}
-
 kotlin {
     jvm {
         compilations.all {

examples/kotlin/build.gradle

@@ -17,7 +17,6 @@ sourceSets {
     benchmarks
 }
 
-
 // Propagate dependencies from main sourceSet
 // You can add "+ sourceSets.test.output" to include test output as well
 dependencies {

plugin/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://dl.bintray.com/orangy/maven" }
     }
     dependencies {
-        classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-23"
+        classpath "kotlinx.team:kotlinx.team.infra:0.1.0-dev-26"
     }
 
 }
@@ -39,6 +39,8 @@ repositories {
     gradlePluginPortal()
     maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+//    maven { url "../../kotlin-libraries-infra/build/maven" }
+    maven { url "https://dl.bintray.com/orangy/maven" }
 }
 
 gradlePlugin {
@@ -75,8 +77,9 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-compiler'
     }
 
+    compileOnly "kotlinx.team:kotlinx.team.infra:0.1.0-dev-26"
+
     compileOnly group: 'org.jetbrains.kotlin.multiplatform', name: 'org.jetbrains.kotlin.multiplatform.gradle.plugin', version: kotlin_version
-    compileOnly group: 'com.moowork.node', name: 'com.moowork.node.gradle.plugin', version: '1.2.0'
     compileOnly "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" // used in worker
 
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"

plugin/main/src/org/jetbrains/gradle/benchmarks/BenchmarksPlugin.kt

@@ -1,5 +1,6 @@
 package org.jetbrains.gradle.benchmarks
 
+import kotlinx.team.infra.node.*
 import org.gradle.api.*
 import org.gradle.util.*
 import org.jetbrains.kotlin.gradle.plugin.*
@@ -28,6 +29,11 @@ class BenchmarksPlugin : Plugin<Project> {
     }
 
     override fun apply(project: Project) = project.run {
+        if (!plugins.hasPlugin(NodePlugin::class.java)) {
+            logger.info("Enabling node plugin in $this")
+            pluginManager.apply(NodePlugin::class.java)
+        }
+
         if (GradleVersion.current() < GradleVersion.version("4.10")) {
             logger.error("JetBrains Gradle Benchmarks plugin requires Gradle version 4.10 or higher")
             return // TODO: Do we need to fail build at this point or just ignore benchmarks?

plugin/main/src/org/jetbrains/gradle/benchmarks/JsNodeTasks.kt

@@ -1,29 +1,25 @@
 package org.jetbrains.gradle.benchmarks
 
-import com.moowork.gradle.node.*
-import com.moowork.gradle.node.npm.*
-import com.moowork.gradle.node.task.*
+import kotlinx.team.infra.node.*
 import org.gradle.api.*
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 
 fun Project.createJsBenchmarkInstallTask() {
-    val node = project.extensions.getByType(NodeExtension::class.java)
-    task<NpmTask>("npmInstallBenchmarkJs") {
+    task<NpmInstallTask>("npmInstallBenchmarkJs") {
         group = "node"
         description = "Install benchmark.js to local node_modules"
-        setArgs(listOf("install", "--prefer-offline", "benchmark", "-s"))
-        setWorkingDir(node.nodeModulesDir) // For some reason configured node_modules dir is not picked up
+        packages.add("benchmark")
+        dependsOn(NodeSetupTask.NAME)
     }
 }
 
-
 fun Project.createJsBenchmarkExecTask(
     config: BenchmarkConfiguration,
     compilation: KotlinJsCompilation
 ) {
-    val node = project.extensions.getByType(NodeExtension::class.java)
-    val nodeModulesDir = node.nodeModulesDir.resolve("node_modules")
+    val node = NodeExtension[this]
+    val nodeModulesDir = node.node_modules
     task<NodeTask>(
         "${config.name}${BenchmarksPlugin.BENCHMARK_EXEC_SUFFIX}",
         depends = BenchmarksPlugin.RUN_BENCHMARKS_TASKNAME
@@ -35,13 +31,13 @@ fun Project.createJsBenchmarkExecTask(
         val reportsDir = benchmarkReportsDir(config)
         val reportFile = reportsDir.resolve("${config.name}.json")
 
-        setScript(nodeModulesDir.resolve(compilation.compileKotlinTask.outputFile.name))
-        addArgs(reportFile.toString(), config.iterations(), config.iterationTime()) // TODO: configure!
-        setWorkingDir(nodeModulesDir)
+        script = nodeModulesDir.resolve(compilation.compileKotlinTask.outputFile.name).absolutePath
+        arguments(reportFile.toString(), config.iterations().toString(), config.iterationTime().toString()) // TODO: configure!
+        //setWorkingDir(nodeModulesDir)
         dependsOn("${config.name}${BenchmarksPlugin.BENCHMARK_DEPENDENCIES_SUFFIX}")
         doFirst {
             val ideaActive = (extensions.extraProperties.get("idea.internal.test") as? String)?.toBoolean() ?: false
-            addArgs(if (ideaActive) "xml" else "text")
+            arguments(if (ideaActive) "xml" else "text")
             reportsDir.mkdirs()
             logger.lifecycle("Running benchmarks for ${config.name}")
             logger.info("    I:${config.iterations()} T:${config.iterationTime()}")
@@ -54,7 +50,7 @@ fun Project.createJsBenchmarkDependenciesTask(
     compilation: KotlinJsCompilation
 ) {
     val node = project.extensions.getByType(NodeExtension::class.java)
-    val nodeModulesDir = node.nodeModulesDir.resolve("node_modules")
+    val nodeModulesDir = node.node_modules
     val deployTask = task<Copy>("${config.name}${BenchmarksPlugin.BENCHMARK_DEPENDENCIES_SUFFIX}") {
         group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP
         description = "Copy dependencies of benchmark for '${config.name}'"

runtime/build.gradle

@@ -19,6 +19,7 @@ repositories {
     mavenCentral()
     maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+    maven { url "https://dl.bintray.com/orangy/maven" }
 }
 
 kotlin {

settings.gradle

@@ -18,8 +18,10 @@ includeBuild("plugin") {
     }
 }
 
+include "runtime"
+
+include "examples"
+include "examples:kotlin-multiplatform"
 include "examples:java"
 include "examples:kotlin"
-include "examples:kotlin-multiplatform"
 include "examples:kotlin-kts"
-include "runtime"