Skip to content

armgit / core

Public Imported from GitHub
0

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

UI updates: gradle build config

Rich Turnerbbb53d6754f6
diff --git a/ui/build.gradle b/ui/build.gradle
index 21fb84d7a..c9fe4f0ac 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,4 +1,16 @@
afterEvaluate {
+
+ // Ensure main repo ui installDist tasks are performed before the custom projects
+ if (isCustomProject() && parent == rootProject) {
+ def customUi = findProject(':ui')
+ if (customUi != null) {
+ customUi.getTasksByName('installDist', true).forEach {
+ it.mustRunAfter(project(":openremote:ui").getTasksByName('installDist', true))
+ }
+ }
+ }
+
+ // Add dependencies on model and rest typescript generation
it.getTasksByName('prepareUi', true).forEach {
it.dependsOn resolveTask(":ui:component:model:generateTypeScript"), resolveTask(":ui:component:rest:generateTypeScript")
}