Skip to content

armgit / core

Public Imported from GitHub
0

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

project.gradle updates

Rich Turner9926e7d1f091
diff --git a/project.gradle b/project.gradle
index 79dc438db..fb8e8e661 100644
--- a/project.gradle
+++ b/project.gradle
@@ -80,7 +80,7 @@ ext.nodeModuleLocal = {
}
task npmInstall(overwrite: true, type: NpmTask, dependsOn: 'npmSetup') {
- inputs.file('package.json')
+ inputs.files('package.json')
outputs.upToDateWhen { file('node_modules').exists() }
npmCommand = ['install']
@@ -148,8 +148,12 @@ plugins.withType(JavaPlugin).whenPluginAdded {
// Helper functions for project/task resolution when the main
// repo is checked out as a git submodule and therefore a subproject
+def isCustomProject() {
+ findProject(":openremote") != null
+}
+
def resolvePath(String path) {
- findProject(":openremote") != null ? ":openremote" + path : path
+ isCustomProject() ? ":openremote" + path : path
}
def resolveProject(String path) {
@@ -164,4 +168,5 @@ ext {
resolvePath = this.&resolvePath
resolveProject = this.&resolveProject
resolveTask = this.&resolveTask
+ isCustomProject = this.&isCustomProject
}
\ No newline at end of file