From e99117cf624a6933ea1698edc37fa7e004c1b4d2 Mon Sep 17 00:00:00 2001 From: Rich Turner <7072278+richturner@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:18:58 +0000 Subject: [PATCH] Updated to latest openremote submodule --- gradle.properties | 1 + openremote | 2 +- settings.gradle | 16 +++++----------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 38f2dc8cd..807cf3146 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ projectName = custom-project projectVersion = 1.0-SNAPSHOT +typescriptGeneratorVersion = 3.2.1263 diff --git a/openremote b/openremote index dae58f0d4..47a7201a1 160000 --- a/openremote +++ b/openremote @@ -1 +1 @@ -Subproject commit dae58f0d40b306528146d5fd26ac3750bb416c78 +Subproject commit 47a7201a182f449e5e5b639ced930c9953878330 diff --git a/settings.gradle b/settings.gradle index fef6c4234..bb4a3977b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,7 @@ -pluginManagement { - plugins { - id "com.cherryperry.gradle-file-encrypt" version "2.0.0" - id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3" - } -} - plugins { - id "com.cherryperry.gradle-file-encrypt" apply false - id "org.jetbrains.gradle.plugin.idea-ext" apply false + id "com.cherryperry.gradle-file-encrypt" version "2.0.3" apply false + id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3" apply false + id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false } rootProject.name = "$projectName" @@ -17,5 +11,5 @@ fileTree(dir: rootDir, include: "**/build.gradle", excludes: ["**/node_modules/* .filter { it.parent != rootDir } .filter { !file("${it.parent}/.buildignore").exists() } .each { - include it.parent.replace(rootDir.canonicalPath, "").replace("\\", ":").replace("/", ":") -} + include it.parent.replace(rootDir.canonicalPath, "").replace("\\", ":").replace("/", ":") + }