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
Gradle updates (minor)
Rich Turner6d6b70ec6a78
diff --git a/build.gradle b/build.gradleindex 5471e4fa4..9e2046995 100644--- a/build.gradle+++ b/build.gradle@@ -1,3 +1,5 @@+import static org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS+import static org.apache.tools.ant.taskdefs.condition.Os.isFamilyallprojects {apply from: "${findProject(":openremote") != null ? project(":openremote").projectDir : rootDir}/project.gradle"@@ -7,12 +9,31 @@ allprojects {// Each file must be explicitly added to .gitignore otherwise git commit will fail// When using encryption the the GFE_PASSWORD environment variable must be set or the build will fail// use ./gradlew encryptFiles to encrypt files-//apply plugin: "com.cherryperry.gradle-file-encrypt"//gradleFileEncrypt {// // files to encrypt-// plainFiles.from("deployment/mySensitiveFile")+// plainFiles.from("deployment/manager/fcm.json")// // (optional) setup file mapping to store all encrypted files in one place for example// //mapping = [ 'deployment/mySensitiveFile' : 'secrets/mySensitiveFile' ]// // Use custom password provider as standard env mechanism doesn't seem to work-// passwordProvider = { return "$System.env.GFE_PASSWORD".toCharArray() }+// passwordProvider = {+// def password = System.env.GFE_PASSWORD+// if (!password) {+// throw new IllegalStateException("GFE_PASSWORD environment variable must be set!")+// }+// return password.toCharArray()+// }+//}+//task checkFilesGitIgnoredNew(type: Exec) {+// // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does+// def args = []+// if (isFamily(FAMILY_WINDOWS)) {+// args.add("cmd")+// args.add("/c")+// }+// args.add("git")+// args.add("check-ignore")+// args.add("-q")+// args.addAll(project.getProperties().get("gradleFileEncrypt").plainFiles)+//+// commandLine args//}diff --git a/project.gradle b/project.gradleindex f73814580..f97f03464 100644--- a/project.gradle+++ b/project.gradle@@ -24,7 +24,7 @@ if (project == rootProject) {echo "***** Running gradle encryption plugin checkFilesGitIgnored task ******"-./gradlew checkFilesGitIgnored+./gradlew checkFilesGitIgnoredNewstatus=\$?diff --git a/settings.gradle b/settings.gradleindex d3ae27efb..7a5e6ea2c 100644--- a/settings.gradle+++ b/settings.gradle@@ -1,6 +1,6 @@pluginManagement {plugins {- id "com.cherryperry.gradle-file-encrypt" version "2.0.0"+ id "com.cherryperry.gradle-file-encrypt" version "2.0.1"id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3"}}