Skip to content

armgit / core

Public Imported from GitHub
0

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

Minor UI and deployment gradle config updates (to fix build ordering issues)

Rich Turner8eec26fdf596
diff --git a/deployment/build.gradle b/deployment/build.gradle
index 0414012e3..530f24ca7 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -5,7 +5,7 @@ task clean() {
}
task installDist(type: Copy) {
- dependsOn(rootProject.getTasksByName('installDist', true).findAll {it.project != project && ((parent == rootProject) || (isCustomProject() && it.project.parent != rootProject))})
+ mustRunAfter (parent.getTasksByName('installDist', true).findAll {it.project != project})
from(projectDir) {
exclude "build.gradle", "Dockerfile", "build"
}
diff --git a/ui/build.gradle b/ui/build.gradle
index c9fe4f0ac..589be7f3c 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -6,6 +6,7 @@ afterEvaluate {
if (customUi != null) {
customUi.getTasksByName('installDist', true).forEach {
it.mustRunAfter(project(":openremote:ui").getTasksByName('installDist', true))
+ it.mustRunAfter(resolveTask(":deployment:installDist"))
}
}
}