Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Enable Gradle configuration caching by default (#2959)

Wouter Born042a2736352c
diff --git a/build.gradle b/build.gradle
index f2a8bb368..4cfa9839a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,26 +101,43 @@ tasks.named('unitTestReport').configure {
}
}
-def getBackendProjects = {
- subprojects.findAll { !it.path.startsWith(':ui') && it.pluginManager.hasPlugin('java') }
+def backendProjects = subprojects.findAll {
+ !it.path.startsWith(':ui') && it.pluginManager.hasPlugin('java')
}
-def getActiveTestTasks = {
- getBackendProjects().collectMany { it.tasks.withType(Test) }.findAll { it.name == 'test' }
+def backendTestTasks = backendProjects.collectMany { backendProject ->
+ backendProject.tasks.withType(Test).matching { it.name == 'test' }.toList()
+}
+
+def backendTestTaskPaths = backendTestTasks.collect { it.path }
+
+def jacocoExecutionDataFiles = backendTestTasks.collect { testTask ->
+ testTask.extensions.findByType(JacocoTaskExtension)?.destinationFile
+}.findAll { it != null }
+
+def backendSourceDirs = backendProjects.collectMany {
+ it.sourceSets.main.allJava.srcDirs
+}
+
+def backendClassDirs = backendProjects.collectMany {
+ it.sourceSets.main.output.classesDirs.files
}
tasks.register('checkCoverageDataExists') {
group = 'reporting'
- mustRunAfter(getBackendProjects().collect { "${it.path}:test" })
+
+ mustRunAfter(backendTestTaskPaths)
+
+ inputs.files(jacocoExecutionDataFiles).optional()
+
doLast {
- def testTasks = getActiveTestTasks()
- def allJacocoResultsExist = testTasks.every {
- it.extensions.findByType(JacocoTaskExtension)?.destinationFile?.exists()
+ def missingJacocoResults = jacocoExecutionDataFiles.findAll {
+ !it.exists()
}
- // Check if any of the configured execution data files exist on disk
- if (!allJacocoResultsExist) {
+
+ if (!missingJacocoResults.empty) {
println "Please run the following tasks to be able to generate a report."
- println "Required tasks: ${testTasks.collect { it.path }.join(', ')}"
+ println "Required tasks: ${backendTestTaskPaths.join(', ')}"
println "Run: gradle test -x npmTest checkCoverageDataExists"
throw new StopExecutionException()
}
@@ -132,29 +149,21 @@ tasks.register('checkCoverageDataExists') {
tasks.register('combinedCoverageReport', JacocoReport) {
group = 'reporting'
description = 'Generates a unified coverage report for all Unit and Integration tests'
- dependsOn('checkCoverageDataExists')
- mustRunAfter(getBackendProjects().collect { "${it.path}:test" })
+
+ dependsOn tasks.named('checkCoverageDataExists')
+ mustRunAfter(backendTestTaskPaths)
reports {
xml.required = true
html.required = true
}
- executionData.setFrom(project.provider {
- getActiveTestTasks().collect {
- it.extensions.findByType(JacocoTaskExtension)?.destinationFile
- }.findAll { it != null && it.exists() }
- })
+ executionData.setFrom(jacocoExecutionDataFiles)
- sourceDirectories.setFrom(project.provider {
- getBackendProjects().collectMany { it.sourceSets.main.allJava.srcDirs }
- })
+ sourceDirectories.setFrom(backendSourceDirs)
- classDirectories.setFrom(project.provider {
- def dirs = getBackendProjects().collectMany { it.sourceSets.main.output.classesDirs.files }
- files(dirs).asFileTree.matching {
- include 'org/openremote/**'
- }
+ classDirectories.setFrom(files(backendClassDirs).asFileTree.matching {
+ include 'org/openremote/**'
})
doLast {
@@ -289,28 +298,7 @@ subprojects {
info.exceptionFormat = debug.exceptionFormat
}
- addTestListener(new TestListener() {
- @Override
- void beforeSuite(TestDescriptor suite) {}
-
- @Override
- void afterSuite(TestDescriptor desc, TestResult result) {
- if (!desc.parent) { // will match the outermost suite
- def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
- def startItem = '| ', endItem = ' |'
- def repeatLength = startItem.length() + output.length() + endItem.length()
- println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
- }
- }
-
- @Override
- void beforeTest(TestDescriptor desc) {}
-
- @Override
- void afterTest(TestDescriptor desc, TestResult result) {
- logger.lifecycle "${desc.className} > ${desc.name} took: ${(result.endTime - result.startTime)}ms"
- }
- })
+ addTestListener(new TestSummaryListener())
}
afterEvaluate { proj ->
diff --git a/buildSrc/src/main/groovy/TestSummaryListener.groovy b/buildSrc/src/main/groovy/TestSummaryListener.groovy
new file mode 100644
index 000000000..caf5a383e
--- /dev/null
+++ b/buildSrc/src/main/groovy/TestSummaryListener.groovy
@@ -0,0 +1,32 @@
+import org.gradle.api.tasks.testing.TestDescriptor
+import org.gradle.api.tasks.testing.TestListener
+import org.gradle.api.tasks.testing.TestResult
+
+class TestSummaryListener implements TestListener, Serializable {
+
+ @Override
+ void beforeSuite(TestDescriptor suite) {}
+
+ @Override
+ void afterSuite(TestDescriptor desc, TestResult result) {
+ if (desc.parent == null) {
+ def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
+ def startItem = '| '
+ def endItem = ' |'
+ def repeatLength = startItem.length() + output.length() + endItem.length()
+
+ println '\n' +
+ ('-' * repeatLength) + '\n' +
+ startItem + output + endItem + '\n' +
+ ('-' * repeatLength)
+ }
+ }
+
+ @Override
+ void beforeTest(TestDescriptor desc) {}
+
+ @Override
+ void afterTest(TestDescriptor desc, TestResult result) {
+ println "${desc.className} > ${desc.name} took: ${(result.endTime - result.startTime)}ms"
+ }
+}
diff --git a/deployment/build.gradle b/deployment/build.gradle
index 4d54c2b23..a6faa1253 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -9,14 +9,9 @@ dependencies {
managerRuntime project(':manager')
}
-tasks.register('license') {
- doLast {
- def sourceFile = file("${rootDir}/LICENSE.txt")
- def outputFile = layout.buildDirectory.file("image/manager/app/LICENSE.txt").get().asFile
-
- outputFile.parentFile.mkdirs()
- outputFile.text = sourceFile.text
- }
+tasks.register('license', Copy) {
+ from(rootProject.layout.projectDirectory.file("LICENSE.txt"))
+ into(layout.buildDirectory.dir("image/manager/app"))
}
tasks.register('installDist', Copy) {
diff --git a/extension/demo-setup/build.gradle b/extension/demo-setup/build.gradle
index d4c06ed52..f5548e2db 100644
--- a/extension/demo-setup/build.gradle
+++ b/extension/demo-setup/build.gradle
@@ -80,9 +80,12 @@ signing {
}
}
+def setupJar = providers.gradleProperty("SETUP_JAR")
+def installDemoSetup = setupJar.map { it == "demo" }.orElse(true)
+
tasks.register('installDist', Copy) {
dependsOn resolveTask(":manager:installDist")
- onlyIf { !project.hasProperty("SETUP_JAR") || project.getProperties().get("SETUP_JAR") == "demo" }
- from jar.archiveFile
+ onlyIf { installDemoSetup.get() }
+ from tasks.named('jar', Jar).flatMap { it.archiveFile }
into project(":manager").layout.buildDirectory.dir("install/manager/deployment/manager/extensions")
}
diff --git a/gradle.properties b/gradle.properties
index d6ff948ca..cfdfd373a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
+org.gradle.configuration-cache=true
org.gradle.jvmargs=-Xmx3g
org.gradle.parallel=true
diff --git a/settings.gradle b/settings.gradle
index f53147800..6ba74a13a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,9 +26,26 @@ plugins {
rootProject.name = "openremote"
// Include sub-projects dynamically, every directory with a build.gradle (and no .buildignore)
-fileTree(dir: rootDir, include: "**/build.gradle", excludes: ["**/node_modules/**", "**/generic_app/**"])
- .filter { it.parent != rootDir }
- .filter { !file("${it.parent}/.buildignore").exists() }
+fileTree(
+ dir: rootDir,
+ include: "**/build.gradle",
+ excludes: [
+ ".git/**",
+ "**/.git/**",
+ ".gradle/**",
+ "**/.gradle/**",
+ "**/build/**",
+ "**/node_modules/**",
+ "**/generic_app/**",
+ "**/dist/**",
+ "**/lib/**"
+ ]
+)
+ .filter { it.parentFile != rootDir }
+ .filter { !new File(it.parentFile, ".buildignore").exists() }
.each {
- include it.parent.replace(rootDir.canonicalPath, "").replace("\\", ":").replace("/", ":")
-}
+ include it.parentFile.canonicalPath
+ .replace(rootDir.canonicalPath, "")
+ .replace("\\", ":")
+ .replace("/", ":")
+ }
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradle
index 98a874d60..cfc4f85fd 100644
--- a/ui/component/core/build.gradle
+++ b/ui/component/core/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('prepareUi') {
diff --git a/ui/component/or-app/build.gradle b/ui/component/or-app/build.gradle
index 3fdd5fa7f..8bd6539c3 100644
--- a/ui/component/or-app/build.gradle
+++ b/ui/component/or-app/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-asset-tree/build.gradle b/ui/component/or-asset-tree/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-asset-tree/build.gradle
+++ b/ui/component/or-asset-tree/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-asset-viewer/build.gradle b/ui/component/or-asset-viewer/build.gradle
index f8311156f..f44cd8cb6 100644
--- a/ui/component/or-asset-viewer/build.gradle
+++ b/ui/component/or-asset-viewer/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-attribute-barchart/build.gradle b/ui/component/or-attribute-barchart/build.gradle
index 197c18524..5f8b67fda 100644
--- a/ui/component/or-attribute-barchart/build.gradle
+++ b/ui/component/or-attribute-barchart/build.gradle
@@ -1,8 +1,6 @@
-tasks.register("clean") {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-attribute-card/build.gradle b/ui/component/or-attribute-card/build.gradle
index 3fdd5fa7f..8bd6539c3 100644
--- a/ui/component/or-attribute-card/build.gradle
+++ b/ui/component/or-attribute-card/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-attribute-history/build.gradle b/ui/component/or-attribute-history/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-attribute-history/build.gradle
+++ b/ui/component/or-attribute-history/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-attribute-input/build.gradle b/ui/component/or-attribute-input/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-attribute-input/build.gradle
+++ b/ui/component/or-attribute-input/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-attribute-picker/build.gradle b/ui/component/or-attribute-picker/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-attribute-picker/build.gradle
+++ b/ui/component/or-attribute-picker/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-chart/build.gradle b/ui/component/or-chart/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-chart/build.gradle
+++ b/ui/component/or-chart/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-components/build.gradle b/ui/component/or-components/build.gradle
index f8311156f..f44cd8cb6 100644
--- a/ui/component/or-components/build.gradle
+++ b/ui/component/or-components/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-dashboard-builder/build.gradle b/ui/component/or-dashboard-builder/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-dashboard-builder/build.gradle
+++ b/ui/component/or-dashboard-builder/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-gauge/build.gradle b/ui/component/or-gauge/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-gauge/build.gradle
+++ b/ui/component/or-gauge/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-icon/build.gradle b/ui/component/or-icon/build.gradle
index 5988415b3..17e07dc43 100644
--- a/ui/component/or-icon/build.gradle
+++ b/ui/component/or-icon/build.gradle
@@ -6,11 +6,9 @@ tasks.register('copyMdiFont', Exec) {
commandLine npmCommand("npm"), "run", "copyMdiFont"
}
-tasks.register('clean') {
- doLast {
- delete layout.buildDirectory
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.buildDirectory
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-json-forms/build.gradle b/ui/component/or-json-forms/build.gradle
index f8311156f..f44cd8cb6 100644
--- a/ui/component/or-json-forms/build.gradle
+++ b/ui/component/or-json-forms/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-log-viewer/build.gradle b/ui/component/or-log-viewer/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-log-viewer/build.gradle
+++ b/ui/component/or-log-viewer/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-map/build.gradle b/ui/component/or-map/build.gradle
index 3dd0264cd..1f2c121dc 100644
--- a/ui/component/or-map/build.gradle
+++ b/ui/component/or-map/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-mwc-components/build.gradle b/ui/component/or-mwc-components/build.gradle
index f8311156f..f44cd8cb6 100644
--- a/ui/component/or-mwc-components/build.gradle
+++ b/ui/component/or-mwc-components/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-rive-renderer/build.gradle b/ui/component/or-rive-renderer/build.gradle
index 9a12902bb..d24127a41 100644
--- a/ui/component/or-rive-renderer/build.gradle
+++ b/ui/component/or-rive-renderer/build.gradle
@@ -1,9 +1,7 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- delete "tsconfig.tsbuildinfo"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
+ delete layout.projectDirectory.file('tsconfig.tsbuildinfo')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-rules/build.gradle b/ui/component/or-rules/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-rules/build.gradle
+++ b/ui/component/or-rules/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-scheduler/build.gradle b/ui/component/or-scheduler/build.gradle
index 37a26b95a..0cc980e7a 100644
--- a/ui/component/or-scheduler/build.gradle
+++ b/ui/component/or-scheduler/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-services/build.gradle b/ui/component/or-services/build.gradle
index 74d93e628..ef718c60d 100644
--- a/ui/component/or-services/build.gradle
+++ b/ui/component/or-services/build.gradle
@@ -1,8 +1,6 @@
-tasks.register("clean") {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-translate/build.gradle b/ui/component/or-translate/build.gradle
index f8311156f..f44cd8cb6 100644
--- a/ui/component/or-translate/build.gradle
+++ b/ui/component/or-translate/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-tree-menu/build.gradle b/ui/component/or-tree-menu/build.gradle
index 70755d448..09a840d61 100644
--- a/ui/component/or-tree-menu/build.gradle
+++ b/ui/component/or-tree-menu/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/or-vaadin-components/build.gradle b/ui/component/or-vaadin-components/build.gradle
index 9a12902bb..d24127a41 100644
--- a/ui/component/or-vaadin-components/build.gradle
+++ b/ui/component/or-vaadin-components/build.gradle
@@ -1,9 +1,7 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- delete "tsconfig.tsbuildinfo"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
+ delete layout.projectDirectory.file('tsconfig.tsbuildinfo')
}
tasks.register('npmAnalyze', Exec) {
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index bcf076f02..2069a27cb 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -39,13 +39,9 @@ def generateTypeScriptTask = tasks.named("generateTypeScript") {
dependsOn resolveTask(":ui:component:model:generateTypeScript")
}
-clean {
- doLast {
- def dir = new File("${projectDir}/dist")
- dir.deleteDir()
- def libs = new File("${projectDir}/lib")
- libs.deleteDir()
- }
+tasks.named('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('npmBuild', Exec) {
diff --git a/ui/component/theme/build.gradle b/ui/component/theme/build.gradle
index 98a874d60..cfc4f85fd 100644
--- a/ui/component/theme/build.gradle
+++ b/ui/component/theme/build.gradle
@@ -1,8 +1,6 @@
-tasks.register('clean') {
- doLast {
- delete "dist"
- delete "lib"
- }
+tasks.register('clean', Delete) {
+ delete layout.projectDirectory.dir('dist')
+ delete layout.projectDirectory.dir('lib')
}
tasks.register('prepareUi') {
diff --git a/ui/test/build.gradle b/ui/test/build.gradle
index 7dcfbd4f7..f2e04c016 100644
--- a/ui/test/build.gradle
+++ b/ui/test/build.gradle
@@ -7,9 +7,11 @@ tasks.register("installBrowsers", Exec) {
commandLine npmCommand("npx"), "playwright", "install", "chromium"
}
+def yarnInstallRequested = gradle.startParameter.taskNames.any {
+ it == "yarnInstall" || it == ":yarnInstall" || it.endsWith(":yarnInstall")
+}
+
tasks.register('installTestDeps', Exec) {
- onlyIf {
- !gradle.taskGraph.hasTask(":yarnInstall")
- }
+ onlyIf { !yarnInstallRequested }
commandLine npmCommand("yarn"), "workspaces", "focus", "@openremote/test", "@openremote/model", "@openremote/rest", "@openremote/core"
}