Skip to content

armgit / core

Public Imported from GitHub
0

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

Gradle build order fixes

Rich Turnerb2165c9f604f
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradle
index 18f1ce16e..f91460271 100644
--- a/ui/component/core/build.gradle
+++ b/ui/component/core/build.gradle
@@ -6,4 +6,6 @@ task clean() {
task build() {
dependsOn npmBuild
-}
\ No newline at end of file
+}
+
+npmBuild.dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")
\ No newline at end of file
diff --git a/ui/component/or-map/build.gradle b/ui/component/or-map/build.gradle
index 012bdf2b6..c54bae5ce 100644
--- a/ui/component/or-map/build.gradle
+++ b/ui/component/or-map/build.gradle
@@ -8,4 +8,4 @@ task build() {
dependsOn npmBuild
}
-npmBuild.dependsOn(resolveTask(":ui:component:rest:build"))
\ No newline at end of file
+npmBuild.dependsOn resolveTask(":ui:component:rest:build")
\ No newline at end of file
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index a4b248cc4..33a2af46a 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -12,7 +12,6 @@ buildscript {
}
dependencies {
- compile resolveProject(":model")
compile 'cz.habarta.typescript-generator:typescript-generator-core:2.9.456'
}
@@ -54,4 +53,6 @@ clean {
}
}
-build.dependsOn generateTypeScript, npmBuild
\ No newline at end of file
+build.dependsOn npmBuild
+
+npmBuild.dependsOn resolveTask(":ui:component:model:build"), generateTypeScript
\ No newline at end of file