Apply release management

.github/workflows/ci_cd.yml

@@ -5,7 +5,7 @@ on:
   # Push excluding tags and workflow changes
   push:
     branches:
-        - '**'
+      - '**'
     tags-ignore:
       - '*.*'
     paths-ignore:
@@ -15,7 +15,7 @@ on:
 
   # When a release is published
   release:
-    types: [published]    
+    types: [published]
 
   # Manual trigger
   workflow_dispatch:

agent/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":agent")
     api project(":model")
+    api "io.openremote:openremote-agent:$openremoteVersion"
 }
 
-task installDist {
+tasks.register('installDist') {
     dependsOn jar
 }

build.gradle

@@ -1,9 +1,6 @@
-
 allprojects {
-    // Apply common project setup but exclude submodule, it has its own build.gradle
-    if (!path.startsWith(":openremote")) {
-        apply from: "${project(":openremote").projectDir}/project.gradle"
-    }
+    // Apply common project setup
+    apply from: "${project.rootDir}/project.gradle"
 }
 
 // Uncomment the following to configure files to be encrypted/decrypted
@@ -26,7 +23,7 @@ allprojects {
 //        return password.toCharArray()
 //    }
 //}
-//task checkFilesGitIgnoredNew(type: Exec) {
+//tasks.register('checkFilesGitIgnoredNew', Exec) {
 //    // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
 //    def args = []
 //    if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
@@ -35,6 +32,7 @@ allprojects {
 //    }
 //    args.add("git")
 //    args.add("check-ignore")
+//    args.add("-q")
 //    args.addAll(project.getProperties().get("gradleFileEncrypt").plainFiles)
 //
 //    commandLine args

deployment/build.gradle

@@ -4,9 +4,12 @@ dependencies {
     api project(":setup")
 }
 
-task license {
+tasks.register('license') {
     doLast {
-        def toConcatenate = files("${project(":openremote").projectDir}/LICENSE.txt", "${rootDir}/LICENSE.txt")
+        def licenseFiles = new ArrayList<>()
+        licenseFiles.add("${rootDir}/LICENSE.txt")
+
+        def toConcatenate = files(licenseFiles.toArray())
         def outputFileName = "${buildDir}/image/manager/app/LICENSE.txt"
         def output = new File(outputFileName)
         if (output.exists()) {
@@ -19,8 +22,9 @@ task license {
     }
 }
 
-task installDist(type: Copy) {
-    dependsOn (parent.getTasksByName('installDist', true).findAll {
+tasks.register('installDist', Copy) {
+    duplicatesStrategy DuplicatesStrategy.EXCLUDE
+    dependsOn(parent.getTasksByName('installDist', true).findAll {
         // Don't create circular dependency or depend on built in openremote submodule apps
         it.project != project && !it.project.path.startsWith(":openremote:ui:app")
     })

gradle.properties

@@ -1,3 +1,9 @@
+org.gradle.parallel=true
+
 projectName = custom-project
 projectVersion = 1.0-SNAPSHOT
+
+openremoteVersion = 1.2.0-SNAPSHOT
+
+jacksonVersion = 2.16.0
 typescriptGeneratorVersion = 3.2.1263

manager/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":container")
-    api resolveProject(":manager")
     api project(":agent")
     api project(":model")
+    api "io.openremote:openremote-container:$openremoteVersion"
+    api "io.openremote:openremote-manager:$openremoteVersion"
 }
 
-task installDist {
+tasks.register('installDist') {
     dependsOn jar
 }

model/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: "java-library"
 
 dependencies {
-    api resolveProject(":model")
+    api "io.openremote:openremote-model:$openremoteVersion"
 }
 
-task installDist {
+tasks.register('installDist') {
     dependsOn jar
 }

package.json

@@ -2,12 +2,11 @@
   "packageManager": "[email protected]",
   "private": true,
   "workspaces": [
-    "openremote",
     "ui/app/*",
     "ui/component/*",
     "ui/demo/*"
   ],
   "devDependencies": {
-    "lerna": "^4.0.0"
+    "@openremote/util": "^1.2.0-snapshot"
   }
 }