[#1630] Rearrange Gradle tasks and their dependencies

build.gradle

@@ -57,8 +57,32 @@ wrapper {
     gradleVersion = '6.9.2'
 }
 
+def installFrontend = tasks.register('installFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
+    workingDir 'frontend/'
+    args = ['install']
+}
+
+def buildFrontend = tasks.register('buildFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
+    dependsOn installFrontend
+    workingDir 'frontend/'
+    args = ['run', 'devbuild']
+}
+
+def zipReport = tasks.register('zipReport', Zip) {
+    dependsOn buildFrontend
+    from 'frontend/build/'
+    archiveBaseName = 'templateZip'
+    destinationDirectory = file('src/main/resources')
+}
+
+def compileJava = tasks.compileJava
+def classes = tasks.classes
+
+tasks.run.dependsOn(zipReport);
+
 run {
     //the second arguments indicates the default value associated with the property.
+    tasks.compileJava.mustRunAfter(zipReport)
     args System.getProperty('args', '').split()
     systemProperty "version", getRepoSenseVersion()
 }
@@ -74,19 +98,6 @@ idea {
     }
 }
 
-jacoco {
-    toolVersion = "0.8.7"
-}
-
-jacocoTestReport {
-    reports {
-        html.enabled = true
-        xml.enabled true
-        csv.enabled false
-        html.destination file("${buildDir}/jacocoHtml")
-    }
-}
-
 test {
     environment("REPOSENSE_ENVIRONMENT", "TEST")
 
@@ -106,7 +117,10 @@ test {
     }
 }
 
+tasks.shadowJar.dependsOn(zipReport);
+
 shadowJar {
+    tasks.compileJava.mustRunAfter(zipReport)
     archiveFileName = 'RepoSense.jar'
     destinationDirectory = file("${buildDir}/jar/")
 
@@ -115,31 +129,12 @@ shadowJar {
     }
 }
 
-def installFrontend = tasks.register('installFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
-    workingDir 'frontend/'
-    args = ['install']
-}
-
-def buildFrontend = tasks.register('buildFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
-    dependsOn installFrontend
-    workingDir 'frontend/'
-    args = ['run', 'devbuild']
-}
-
 tasks.register('lintFrontend', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
     dependsOn installFrontend
     workingDir 'frontend/'
     args = ['run', 'lint']
 }
 
-def zipReport = tasks.register('zipReport', Zip) {
-    dependsOn buildFrontend
-    from 'frontend/build/'
-    archiveBaseName = 'templateZip'
-    destinationDirectory = file('src/main/resources')
-}
-
-def compileJava = tasks.compileJava
 def checkstyleMain = tasks.checkstyleMain
 def checkstyleTest = tasks.checkstyleTest
 def checkstyleSystemtest = tasks.checkstyleSystemtest
@@ -150,12 +145,7 @@ tasks.register('checkstyleAll', Checkstyle) {
     tasks.checkstyleSystemtest.mustRunAfter('checkstyleTest')
 }
 
-tasks.shadowJar.dependsOn(zipReport);
-tasks.compileJava.dependsOn(zipReport);
-tasks.run.dependsOn(compileJava);
-
 tasks.register('systemtest', Test) {
-    dependsOn zipReport
     testClassesDirs = sourceSets.systemtest.output.classesDirs
     classpath = sourceSets.systemtest.runtimeClasspath
     environment("REPOSENSE_ENVIRONMENT", "TEST")
@@ -176,10 +166,9 @@ tasks.register('systemtest', Test) {
     }
 }
 
-def classes = tasks.classes
-
-def startServerInBackground = tasks.register('startServerInBackground', com.github.psxpaul.task.JavaExecFork) {
-    dependsOn classes
+def serveTestReportInBackground = tasks.register('serveTestReportInBackground', com.github.psxpaul.task.JavaExecFork) {
+    dependsOn zipReport, compileJava, classes
+    tasks.compileJava.mustRunAfter(zipReport)
     main = mainClassName
     classpath = sourceSets.main.runtimeClasspath
     args = ['--config', './frontend/cypress/config', '--since', 'd1', '--view']
@@ -194,16 +183,16 @@ def installCypress = tasks.register('installCypress', com.liferay.gradle.plugins
 }
 
 tasks.register('cypress', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
-    dependsOn zipReport, installCypress, startServerInBackground
-    tasks.startServerInBackground.mustRunAfter(installCypress)
+    dependsOn installCypress, serveTestReportInBackground
+    tasks.serveTestReportInBackground.mustRunAfter(installCypress)
 
     workingDir = file('frontend/cypress/')
     args = ["run-script", "debug"]
 }
 
 tasks.register('frontendTest', com.liferay.gradle.plugins.node.tasks.ExecutePackageManagerTask) {
-    dependsOn zipReport, installCypress, startServerInBackground
-    tasks.startServerInBackground.mustRunAfter(installCypress)
+    dependsOn installCypress, serveTestReportInBackground
+    tasks.serveTestReportInBackground.mustRunAfter(installCypress)
 
     workingDir = file('frontend/cypress/')
     args = ["run-script", "tests"]
@@ -218,6 +207,21 @@ tasks.withType(Copy) {
     includeEmptyDirs = true
 }
 
+jacoco {
+    toolVersion = "0.8.7"
+}
+
+jacocoTestReport {
+    reports {
+        html.enabled = true
+        xml.enabled true
+        csv.enabled false
+        html.destination file("${buildDir}/jacocoHtml")
+    }
+
+    executionData systemtest, frontendTest
+}
+
 tasks.register('coverage', JacocoReport)
 
 coverage.configure {
@@ -291,7 +295,4 @@ void deleteReposAddressDirectory() {
     reposDirectory.deleteDir()
 }
 
-jacocoTestReport.executionData(systemtest)
-jacocoTestReport.executionData(frontendTest)
-
 defaultTasks 'clean', 'build', 'systemtest', 'frontendTest', 'coverage'