#762 Gradle 6 + using GitHub Node Gradle plugin

build.gradle.kts

@@ -46,7 +46,7 @@ plugins {
     id("nebula.rpm") version "8.1.0"
     id("org.sonarqube") version "2.5"
     id("com.avast.gradle.docker-compose") version "0.9.5"
-    id("com.bmuschko.docker-remote-api") version "4.1.0"
+    id("com.bmuschko.docker-remote-api") version "6.4.0"
     id("org.springframework.boot") version Versions.springBootVersion apply false
     id("io.freefair.aggregate-javadoc") version "4.1.2"
     id("com.github.breadmoirai.github-release") version "2.2.11"
@@ -482,8 +482,8 @@ val dockerPrepareEnv by tasks.registering(Copy::class) {
 val dockerBuild by tasks.registering(DockerBuildImage::class) {
     dependsOn(dockerPrepareEnv)
     inputDir.set(file("docker"))
-    tags.add("nemerosa/ontrack:$version")
-    tags.add("nemerosa/ontrack:latest")
+    images.add("nemerosa/ontrack:$version")
+    images.add("nemerosa/ontrack:latest")
 }
 
 /**

buildSrc/build.gradle.kts

@@ -9,10 +9,10 @@ repositories {
 }
 
 dependencies {
-    compile(gradleApi())
-    compile(gradleKotlinDsl())
-    compile("gradle.plugin.com.liferay:gradle-plugins-node:5.1.1")
-    compile("net.nemerosa.ontrack:ontrack-dsl:3.40.0") {
+    implementation(gradleApi())
+    implementation(gradleKotlinDsl())
+    implementation("com.github.node-gradle:gradle-node-plugin:2.2.3")
+    implementation("net.nemerosa.ontrack:ontrack-dsl:3.40.0") {
         exclude(module = "groovy-all")
     }
 }

buildSrc/src/main/kotlin/net/nemerosa/ontrack/gradle/OntrackChangeLog.kt

@@ -2,6 +2,7 @@ package net.nemerosa.ontrack.gradle
 
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 open class OntrackChangeLog : AbstractOntrackTask() {
@@ -18,6 +19,7 @@ open class OntrackChangeLog : AbstractOntrackTask() {
     @Input
     var ontrackReleaseFilter: String = ""
 
+    @Internal
     var changeLog: String = ""
 
     @TaskAction

buildSrc/src/main/kotlin/net/nemerosa/ontrack/gradle/OntrackLastReleases.kt

@@ -2,6 +2,7 @@ package net.nemerosa.ontrack.gradle
 
 import net.nemerosa.ontrack.dsl.Build
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 open class OntrackLastReleases : AbstractOntrackTask() {
@@ -18,6 +19,7 @@ open class OntrackLastReleases : AbstractOntrackTask() {
     @Input
     var releasePattern: String = ".*"
 
+    @Internal
     var releases: List<Build> = emptyList()
 
     companion object {

buildSrc/src/main/kotlin/net/nemerosa/ontrack/gradle/extension/OntrackExtensionPlugin.kt

@@ -1,9 +1,9 @@
 package net.nemerosa.ontrack.gradle.extension
 
-import com.liferay.gradle.plugins.node.NodeExtension
-import com.liferay.gradle.plugins.node.NodePlugin
-import com.liferay.gradle.plugins.node.tasks.ExecuteNodeScriptTask
-import com.liferay.gradle.plugins.node.tasks.NpmInstallTask
+import com.moowork.gradle.node.NodeExtension
+import com.moowork.gradle.node.NodePlugin
+import com.moowork.gradle.node.npm.NpmInstallTask
+import com.moowork.gradle.node.task.NodeTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.jvm.tasks.Jar
@@ -26,9 +26,8 @@ class OntrackExtensionPlugin : Plugin<Project> {
 
         target.apply<NodePlugin>()
         target.configure<NodeExtension> {
-            isGlobal = true
-            setNodeVersion("8.10.0")
-            setNpmVersion("5.7.1")
+            version = "8.10.0"
+            npmVersion = "5.7.1"
             isDownload = true
         }
 
@@ -63,7 +62,6 @@ class OntrackExtensionPlugin : Plugin<Project> {
 
         target.tasks.named<NpmInstallTask>("npmInstall") {
             dependsOn(copyPackageJson)
-            setNodeModulesCacheDir("${target.rootDir}/.gradle/node_modules_cache")
             setWorkingDir(target.projectDir)
             inputs.file(target.file("package.json"))
             outputs.dir(target.file("node_modules"))
@@ -73,7 +71,7 @@ class OntrackExtensionPlugin : Plugin<Project> {
          * Gulp call
          */
 
-        val web by target.tasks.registering(ExecuteNodeScriptTask::class) {
+        val web by target.tasks.registering(NodeTask::class) {
             dependsOn(target.tasks.named("npmInstall"))
             dependsOn(copyGulpFile)
 
@@ -88,8 +86,8 @@ class OntrackExtensionPlugin : Plugin<Project> {
             }
 
             setWorkingDir(target.projectDir)
-            setScriptFile(target.file("node_modules/gulp/bin/gulp"))
-            args(
+            script = target.file("node_modules/gulp/bin/gulp")
+            addArgs(
                     "default",
                     "--extension", ontrack.id(project),
                     "--version", target.version,

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

ontrack-acceptance/build.gradle.kts

@@ -72,8 +72,8 @@ tasks.named("assemble") {
 val dockerBuild by tasks.registering(DockerBuildImage::class) {
     dependsOn(acceptanceDockerPrepareEnv)
     inputDir.set(file("src/main/docker"))
-    tags.add("nemerosa/ontrack-acceptance:$version")
-    tags.add("nemerosa/ontrack-acceptance:latest")
+    images.add("nemerosa/ontrack-acceptance:$version")
+    images.add("nemerosa/ontrack-acceptance:latest")
 }
 
 /**

ontrack-web/build.gradle.kts

@@ -1,47 +1,47 @@
-import com.liferay.gradle.plugins.node.NodeExtension
-import com.liferay.gradle.plugins.node.tasks.ExecuteNodeScriptTask
-import com.liferay.gradle.plugins.node.tasks.NpmInstallTask
+//import com.liferay.gradle.plugins.node.NodeExtension
+//import com.liferay.gradle.plugins.node.tasks.ExecuteNodeScriptTask
+//import com.liferay.gradle.plugins.node.tasks.NpmInstallTask
 
 plugins {
     base
-    id("com.liferay.node")
+//    id("com.liferay.node") version "6.0.1"
 }
 
 // Node environment
 
-configure<NodeExtension> {
-    isGlobal = true
-    setNodeVersion("8.10.0")
-    setNpmVersion("5.7.1")
-    isDownload = true
-}
+//configure<NodeExtension> {
+//    isGlobal = true
+//    setNodeVersion("8.10.0")
+//    setNpmVersion("5.7.1")
+//    isDownload = true
+//}
 
 // NPM cache
 
-tasks.named<NpmInstallTask>("npmInstall") {
-    setNodeModulesCacheDir("$rootDir/.gradle/node_modules_cache")
-    inputs.file("package.json")
-    outputs.dir("node_modules")
-}
+//tasks.named<NpmInstallTask>("npmInstall") {
+//    setNodeModulesCacheDir("$rootDir/.gradle/node_modules_cache")
+//    inputs.file("package.json")
+//    outputs.dir("node_modules")
+//}
 
 // Installing the Bower packages
 
-val bowerInstall by tasks.registering(ExecuteNodeScriptTask::class) {
-    dependsOn("npmInstall")
-    setScriptFile("node_modules/bower/bin/bower")
-    val bowerArgs = mutableListOf(
-            "--config.storage.cache=$rootDir/.gradle/bower/cache",
-            "--config.storage.packages=$rootDir/.gradle/bower/packages",
-            "--config.storage.registry=$rootDir/.gradle/bower/registry",
-            "install"
-    )
-    if (project.properties.containsKey("bowerOptions")) {
-        bowerArgs += project.properties["bowerOptions"].toString()
-    }
-    args(bowerArgs)
-    inputs.file("bower.json")
-    outputs.dir("vendor")
-}
+//val bowerInstall by tasks.registering(ExecuteNodeScriptTask::class) {
+//    dependsOn("npmInstall")
+//    setScriptFile("node_modules/bower/bin/bower")
+//    val bowerArgs = mutableListOf(
+//            "--config.storage.cache=$rootDir/.gradle/bower/cache",
+//            "--config.storage.packages=$rootDir/.gradle/bower/packages",
+//            "--config.storage.registry=$rootDir/.gradle/bower/registry",
+//            "install"
+//    )
+//    if (project.properties.containsKey("bowerOptions")) {
+//        bowerArgs += project.properties["bowerOptions"].toString()
+//    }
+//    args(bowerArgs)
+//    inputs.file("bower.json")
+//    outputs.dir("vendor")
+//}
 
 // Cleanup
 
@@ -51,28 +51,28 @@ tasks.named<Delete>("clean") {
 
 // Web packaging
 
-val dev by tasks.registering(ExecuteNodeScriptTask::class) {
-    dependsOn(bowerInstall)
-    setScriptFile("node_modules/gulp/bin/gulp")
-    args("dev")
-}
+//val dev by tasks.registering(ExecuteNodeScriptTask::class) {
+//    dependsOn(bowerInstall)
+//    setScriptFile("node_modules/gulp/bin/gulp")
+//    args("dev")
+//}
 
-val prod by tasks.registering(ExecuteNodeScriptTask::class) {
-    dependsOn(bowerInstall)
-    setScriptFile("node_modules/gulp/bin/gulp")
-    args("default", "--version", version)
-    inputs.dir("src")
-    inputs.file("bower.json")
-    inputs.file("package.json")
-    outputs.dir("build/web/prod")
-}
+//val prod by tasks.registering(ExecuteNodeScriptTask::class) {
+//    dependsOn(bowerInstall)
+//    setScriptFile("node_modules/gulp/bin/gulp")
+//    args("default", "--version", version)
+//    inputs.dir("src")
+//    inputs.file("bower.json")
+//    inputs.file("package.json")
+//    outputs.dir("build/web/prod")
+//}
 
-tasks.named<Task>("build") {
-    dependsOn(prod)
-}
+//tasks.named<Task>("build") {
+//    dependsOn(prod)
+//}
 
-val watch by tasks.registering(ExecuteNodeScriptTask::class) {
-    dependsOn(dev)
-    setScriptFile("node_modules/gulp/bin/gulp")
-    args("watch")
-}
+//val watch by tasks.registering(ExecuteNodeScriptTask::class) {
+//    dependsOn(dev)
+//    setScriptFile("node_modules/gulp/bin/gulp")
+//    args("watch")
+//}