100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fix gradle build for custom projects (#1237)
Rich Turner47a7201a182f
diff --git a/model-util/build.gradle b/model-util/build.gradleindex 9482e2f26..97a389cb1 100644--- a/model-util/build.gradle+++ b/model-util/build.gradle@@ -2,6 +2,7 @@ plugins {id 'java'id "maven-publish"id "signing"+ id 'cz.habarta.typescript-generator'}repositories {@@ -9,8 +10,8 @@ repositories {}dependencies {- implementation findProject(":model")- implementation findProject(":agent")+ implementation resolveProject(":model")+ implementation resolveProject(":agent")implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"}diff --git a/project.gradle b/project.gradleindex 012917422..feca9d698 100644--- a/project.gradle+++ b/project.gradle@@ -1,7 +1,11 @@// Common configuration applied to all projects-import java.nio.file.*-import java.nio.file.attribute.*-import java.util.Set++import org.jetbrains.gradle.ext.JUnit++import java.nio.file.Files+import java.nio.file.Paths+import java.nio.file.attribute.PosixFileAttributes+import java.nio.file.attribute.PosixFilePermissionimport java.util.stream.Collectorsimport java.util.stream.StreamSupport@@ -279,7 +283,7 @@ def createTSGeneratorConfigForModel(String outputFileName, Project...customProje}return config}-def createTSGeneratorConfigForClient(String outputFileName, Project...customProjectsToScan) {+def createTSGeneratorConfigForClient(String outputFileName, File modelInfoJson, Project...customProjectsToScan) {def config = createTSGeneratorConfig(true, outputFileName, customProjectsToScan) <<{extensions = [@@ -303,7 +307,7 @@ def createTSGeneratorConfigForClient(String outputFileName, Project...customProjcz.habarta.typescript.generator.ModuleDependency.module("@openremote/model","Model",- new File("$buildDir/typescript-generator-info.json"),+ modelInfoJson,(String) null,(String) null)diff --git a/settings.gradle b/settings.gradleindex 0b8768826..f1f3ced4d 100644--- a/settings.gradle+++ b/settings.gradle@@ -1,15 +1,8 @@-pluginManagement {- plugins {- id "com.cherryperry.gradle-file-encrypt" version "2.0.3"- id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3"- id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion"- }-}plugins {- id "com.cherryperry.gradle-file-encrypt" apply false- id "org.jetbrains.gradle.plugin.idea-ext" apply false- id "cz.habarta.typescript-generator" apply false+ id "com.cherryperry.gradle-file-encrypt" version "2.0.3" apply false+ id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3" apply false+ id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false}rootProject.name = "openremote"diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex c991d5b50..512495a36 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -14,7 +14,18 @@ plugins {}dependencies {- compileOnly findProject(":model-util")+ if (isCustomProject()) {+ // TODO: Remove this as shouldn't build custom project code into this package+ def customModel = findProject(":model")+ if (customModel != null) {+ implementation customModel+ }+ def customAgent = findProject(":agent")+ if (customAgent != null) {+ implementation customAgent+ }+ }+ compileOnly resolveProject(":model-util")implementation resolveProject(":model")implementation resolveProject(":agent")implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 6367c2a41..d0a180783 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -14,20 +14,24 @@ plugins {}dependencies {- compileOnly findProject(":model-util")+ // TODO: Remove this as shouldn't build custom project code into this package+ def customModel = findProject(":model")+ if (customModel != null) {+ implementation customModel+ }+ compileOnly resolveProject(":model-util")implementation resolveProject(":model")- implementation resolveProject(":agent")implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"}-project.task(Collections.singletonMap(Task.TASK_TYPE, cz.habarta.typescript.generator.gradle.GenerateTask), "generateTypescriptModelInfo")-generateTypescriptModelInfo createTSGeneratorConfigForModel("$buildDir/model.ts")+//project.task(Collections.singletonMap(Task.TASK_TYPE, cz.habarta.typescript.generator.gradle.GenerateTask), "generateTypescriptModelInfo")+//generateTypescriptModelInfo createTSGeneratorConfigForModel("$buildDir/model.ts")-generateTypeScript createTSGeneratorConfigForClient("src/restclient.ts")-generateTypeScript.dependsOn generateTypescriptModelInfo+generateTypeScript createTSGeneratorConfigForClient("src/restclient.ts", new File("${resolveProject(":ui:component:model").projectDir}/src/typescript-generator-info.json"))+generateTypeScript.dependsOn resolveTask(":ui:component:model:generateTypeScript")clean {doLast {