Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix Gradle deprecations (#3043)

Wouter Borneecabbef50c2
diff --git a/build.gradle b/build.gradle
index 30df78e3b..c9c623b53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -193,7 +193,7 @@ scmVersion {
allprojects {
apply from: "${findProject(':openremote') != null ? project(':openremote').projectDir : rootDir}/project.gradle"
- version = scmVersion.version
+ version = rootProject.scmVersion.version
}
// Uncomment the following to configure files to be encrypted/decrypted
@@ -236,7 +236,7 @@ tasks.register('checkFilesGitIgnoredNew', Exec) {
args.add('git')
args.add('check-ignore')
args.add('-q')
- args.addAll(project.getProperties().get('gradleFileEncrypt').plainFiles)
+ args.addAll(project.extensions.getByName('gradleFileEncrypt').plainFiles.files)
commandLine args
}
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index 2069a27cb..1d45bdfad 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -13,11 +13,6 @@ plugins {
}
dependencies {
- // TODO: Remove this as shouldn't build custom project code into this package
- def customModel = findProject(":model")
- if (customModel != null) {
- implementation customModel
- }
compileOnly project(":model-util")
implementation project(":model")
implementation libs.typescriptGeneratorCore