Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix deprecated gradle configurations (#2651)

Koen253e291a5df2
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradle
index acf26254b..98a874d60 100644
--- a/ui/component/core/build.gradle
+++ b/ui/component/core/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-app/build.gradle b/ui/component/or-app/build.gradle
index 1649f1cf7..3fdd5fa7f 100644
--- a/ui/component/or-app/build.gradle
+++ b/ui/component/or-app/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-asset-tree/build.gradle b/ui/component/or-asset-tree/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-asset-tree/build.gradle
+++ b/ui/component/or-asset-tree/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-asset-viewer/build.gradle b/ui/component/or-asset-viewer/build.gradle
index 558835f57..f8311156f 100644
--- a/ui/component/or-asset-viewer/build.gradle
+++ b/ui/component/or-asset-viewer/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-attribute-barchart/build.gradle b/ui/component/or-attribute-barchart/build.gradle
index 4fa35d3b5..197c18524 100644
--- a/ui/component/or-attribute-barchart/build.gradle
+++ b/ui/component/or-attribute-barchart/build.gradle
@@ -1,8 +1,7 @@
-buildDir = "dist"
-
-task clean() {
+tasks.register("clean") {
doLast {
delete "dist"
+ delete "lib"
}
}
@@ -12,10 +11,10 @@ tasks.register('npmAnalyze', Exec) {
commandLine npmCommand("yarn"), "run", "analyze"
}
-task prepareUi() {
+tasks.register("prepareUi") {
dependsOn clean, npmPrepare
}
-task publishUi() {
+tasks.register("publishUi") {
dependsOn clean, npmPublish
}
diff --git a/ui/component/or-attribute-card/build.gradle b/ui/component/or-attribute-card/build.gradle
index 1649f1cf7..3fdd5fa7f 100644
--- a/ui/component/or-attribute-card/build.gradle
+++ b/ui/component/or-attribute-card/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-attribute-history/build.gradle b/ui/component/or-attribute-history/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-attribute-history/build.gradle
+++ b/ui/component/or-attribute-history/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-attribute-input/build.gradle b/ui/component/or-attribute-input/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-attribute-input/build.gradle
+++ b/ui/component/or-attribute-input/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-attribute-picker/build.gradle b/ui/component/or-attribute-picker/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-attribute-picker/build.gradle
+++ b/ui/component/or-attribute-picker/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-chart/build.gradle b/ui/component/or-chart/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-chart/build.gradle
+++ b/ui/component/or-chart/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-components/build.gradle b/ui/component/or-components/build.gradle
index 558835f57..f8311156f 100644
--- a/ui/component/or-components/build.gradle
+++ b/ui/component/or-components/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-dashboard-builder/build.gradle b/ui/component/or-dashboard-builder/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-dashboard-builder/build.gradle
+++ b/ui/component/or-dashboard-builder/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-gauge/build.gradle b/ui/component/or-gauge/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-gauge/build.gradle
+++ b/ui/component/or-gauge/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-icon/build.gradle b/ui/component/or-icon/build.gradle
index 51247e334..5988415b3 100644
--- a/ui/component/or-icon/build.gradle
+++ b/ui/component/or-icon/build.gradle
@@ -1,4 +1,4 @@
-buildDir = "dist"
+layout.buildDirectory.set(layout.projectDirectory.dir("dist"))
tasks.register('copyMdiFont', Exec) {
dependsOn getYarnInstallTask()
@@ -8,7 +8,7 @@ tasks.register('copyMdiFont', Exec) {
tasks.register('clean') {
doLast {
- delete "dist"
+ delete layout.buildDirectory
delete "lib"
}
}
@@ -30,7 +30,7 @@ tasks.register('publishUi') {
tasks.register('installDist', Copy) {
dependsOn getYarnInstallTask(), copyMdiFont, npmAnalyze
resolveTask(":ui:app:shared:generateSources").dependsOn it
- from "${buildDir}/Material Design Icons"
+ from "${layout.buildDirectory.get()}/Material Design Icons"
into "${project(':ui:app:shared').projectDir}/fonts/Material Design Icons"
}
diff --git a/ui/component/or-log-viewer/build.gradle b/ui/component/or-log-viewer/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-log-viewer/build.gradle
+++ b/ui/component/or-log-viewer/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-mwc-components/build.gradle b/ui/component/or-mwc-components/build.gradle
index 558835f57..f8311156f 100644
--- a/ui/component/or-mwc-components/build.gradle
+++ b/ui/component/or-mwc-components/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-rules/build.gradle b/ui/component/or-rules/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-rules/build.gradle
+++ b/ui/component/or-rules/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-services/build.gradle b/ui/component/or-services/build.gradle
index a0f049471..74d93e628 100644
--- a/ui/component/or-services/build.gradle
+++ b/ui/component/or-services/build.gradle
@@ -1,6 +1,4 @@
-buildDir = "dist"
-
-task clean() {
+tasks.register("clean") {
doLast {
delete "dist"
delete "lib"
@@ -13,14 +11,14 @@ tasks.register('npmAnalyze', Exec) {
commandLine npmCommand("yarn"), "run", "analyze"
}
-task installDist() {
+tasks.register("installDist") {
dependsOn npmAnalyze
}
-task prepareUi() {
+tasks.register("prepareUi") {
dependsOn clean, npmAnalyze, npmPrepare
}
-task publishUi() {
+tasks.register("publishUi") {
dependsOn clean, npmPublish
}
diff --git a/ui/component/or-translate/build.gradle b/ui/component/or-translate/build.gradle
index 558835f57..f8311156f 100644
--- a/ui/component/or-translate/build.gradle
+++ b/ui/component/or-translate/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-tree-menu/build.gradle b/ui/component/or-tree-menu/build.gradle
index 715a0847b..70755d448 100644
--- a/ui/component/or-tree-menu/build.gradle
+++ b/ui/component/or-tree-menu/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/or-vaadin-components/build.gradle b/ui/component/or-vaadin-components/build.gradle
index 65d8b407d..9a12902bb 100644
--- a/ui/component/or-vaadin-components/build.gradle
+++ b/ui/component/or-vaadin-components/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"
diff --git a/ui/component/theme/build.gradle b/ui/component/theme/build.gradle
index acf26254b..98a874d60 100644
--- a/ui/component/theme/build.gradle
+++ b/ui/component/theme/build.gradle
@@ -1,5 +1,3 @@
-buildDir = "dist"
-
tasks.register('clean') {
doLast {
delete "dist"