From 4ed56cff9fa545328e5a8c18edf37fd136d95d95 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Wed, 20 Mar 2019 00:27:23 +0100
Subject: [PATCH] gradle: fixed automatic npm build

---
 ...labsw.labswp_2019_sose_geocaching.test.iml |  2 +-
 build.gradle                                  | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml
index 7e2daa3..09e2156 100644
--- a/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml
+++ b/.idea/modules/de.hhn.labsw.labswp_2019_sose_geocaching.test.iml
@@ -26,8 +26,8 @@
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.springframework.boot:spring-boot-devtools:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: mysql:mysql-connector-java:8.0.15" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: mysql:mysql-connector-java:8.0.15" level="project" />
     <orderEntry type="library" name="Gradle: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Gradle: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
diff --git a/build.gradle b/build.gradle
index c9d9257..f75cae0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'org.springframework.boot' version '2.1.3.RELEASE'
     id 'java'
-    id "com.liferay.node" version "4.6.7"
+    id "com.moowork.node" version "1.3.1"
 }
 
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'idea'
-apply plugin: 'com.liferay.node'
+apply plugin: 'com.moowork.node'
 
 group = 'de.hhn.labsw'
 version = '0.0.1-SNAPSHOT'
@@ -24,19 +24,16 @@ dependencies {
 }
 
 node {
-    nodeVersion = '11.12.0'
+    version = '11.12.0'
     npmVersion = '6.9.0'
     download = true
 }
 
-import com.liferay.gradle.plugins.node.tasks.NpmInstallTask
-import com.liferay.gradle.plugins.node.tasks.NpmRunTask
-
-task nodeInstall(type: NpmInstallTask) {
-    workingDir 'frontend'
+tasks.withType(NpmTask) {
+    execOverrides {
+        it.workingDir = 'frontend'
+    }
 }
 
-task frontend(type: NpmRunTask) {
-    scriptName 'build'
-    workingDir 'frontend'
-}
+assemble.dependsOn npm_install
+assemble.dependsOn npm_run_build