Set openremoteVersion and use resolveDependency

openremote · Dec 20, 2023 · 67791c1 · 67791c1
1 parent a3ab258
commit 67791c1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/agent/build.gradle b/agent/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":agent")
+    api resolveDependency(":agent")
     api project(":model")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 projectName = custom-project
 projectVersion = 1.0-SNAPSHOT
+openremoteVersion = 0.2.0-SNAPSHOT
diff --git a/manager/build.gradle b/manager/build.gradle
@@ -1,7 +1,8 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":container")
+    api resolveDependency(":container")
+    //api resolveDependency(":manager")
     api resolveProject(":manager")
     api project(":agent")
     api project(":model")

diff --git a/model/build.gradle b/model/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":model")
+    api resolveDependency(":model")
 }
 
 task installDist {

diff --git a/openremote b/openremote
diff --git a/test/build.gradle b/test/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     api project(":manager")
     api project(":model")
     api project(":agent")
-    testImplementation(testFixtures(resolveProject(":test")))
+    testImplementation(testFixtures(resolveDependency(":test")))
 }
 
 tasks.withType(Test) {
+9 −14		.ci_cd/aws/cloudformation-create-ec2.yml
+1 −1		.github/workflows/ci_cd.yml
+1 −0		.github/workflows/provision-host.yml
+14 −2		manager/build.gradle
+4 −2		manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
+1 −1		manager/src/main/resources/version.properties
+5 −2		manager/src/web/shared/locales/en/or.json
+5 −2		manager/src/web/shared/locales/nl/or.json
+2 −2		model/src/main/java/org/openremote/model/dashboard/DashboardWidget.java
+1 −1		model/src/main/resources/ValidationMessages.properties
+8 −0		project.gradle
+0 −1		test/build.gradle
+145 −123		ui/component/or-asset-tree/src/index.ts
+63 −10		ui/component/or-chart/src/index.ts
+4 −0		ui/component/or-dashboard-builder/src/index.ts
+4 −2		ui/component/or-dashboard-builder/src/or-dashboard-browser.ts
+1 −1		ui/component/or-dashboard-builder/src/or-dashboard-preview.ts
+12 −1		ui/component/or-dashboard-builder/src/or-dashboard-widgetcontainer.ts
+15 −3		ui/component/or-dashboard-builder/src/or-dashboard-widgetsettings.ts
+145 −75		ui/component/or-dashboard-builder/src/panels/assettypes-panel.ts
+27 −18		ui/component/or-dashboard-builder/src/panels/attributes-panel.ts
+80 −0		ui/component/or-dashboard-builder/src/settings/attribute-input-settings.ts
+2 −2		ui/component/or-dashboard-builder/src/settings/chart-settings.ts
+8 −1		ui/component/or-dashboard-builder/src/settings/gauge-settings.ts
+1 −1		ui/component/or-dashboard-builder/src/settings/image-settings.ts
+8 −1		ui/component/or-dashboard-builder/src/settings/kpi-settings.ts
+57 −24		ui/component/or-dashboard-builder/src/settings/map-settings.ts
+93 −0		ui/component/or-dashboard-builder/src/settings/table-settings.ts
+34 −12		ui/component/or-dashboard-builder/src/util/or-asset-widget.ts
+5 −0		ui/component/or-dashboard-builder/src/util/or-widget.ts
+11 −0		ui/component/or-dashboard-builder/src/util/widget-settings.ts
+144 −0		ui/component/or-dashboard-builder/src/widgets/attribute-input-widget.ts
+6 −4		ui/component/or-dashboard-builder/src/widgets/kpi-widget.ts
+156 −0		ui/component/or-dashboard-builder/src/widgets/table-widget.ts
+13 −3		ui/component/or-mwc-components/src/or-mwc-input.ts
+54 −18		ui/component/or-mwc-components/src/or-mwc-table.ts