From 36b1b73626694fd0babd5f5c644f08f5b6e5050d Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 24 Apr 2024 17:31:48 +0000 Subject: [PATCH] Build fixes --- app/build.gradle | 4 ++-- build.gradle | 6 +++++- dist/licenses/slf4j.properties | 2 +- settings.gradle | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 123edacd7..9a7b3dc82 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,8 +54,8 @@ dependencies { api group: 'org.kordamp.ikonli', name: 'ikonli-javafx', version: "12.2.0" api group: 'org.kordamp.ikonli', name: 'ikonli-material-pack', version: "12.2.0" api group: 'org.kordamp.ikonli', name: 'ikonli-feather-pack', version: "12.2.0" - api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.12' - api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.12' + api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13' + api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.13' api 'io.xpipe:modulefs:0.1.5' api 'net.synedra:validatorfx:0.4.2' api ('io.github.mkpaz:atlantafx-base:2.0.1') { diff --git a/build.gradle b/build.gradle index 546fb42ce..84597c5ad 100644 --- a/build.gradle +++ b/build.gradle @@ -161,9 +161,13 @@ def testTasks = [ project(':base').getTasksByName('localTest', true), project(':jdbc').getTasksByName('localTest', true), project(':proc').getTasksByName('localTest', true), - project(':cli').getTasksByName('remoteTest', true), ] + +if (file("cli").exists()) { + testTasks += [project(':cli').getTasksByName('remoteTest', true)] +} + tasks.register('testReport', TestReport) { getDestinationDirectory().set(file("$rootProject.buildDir/reports/all")) getTestResults().from(testTasks.stream().filter {!it.isEmpty()}.map { diff --git a/dist/licenses/slf4j.properties b/dist/licenses/slf4j.properties index 0d3e4642e..cecb18920 100644 --- a/dist/licenses/slf4j.properties +++ b/dist/licenses/slf4j.properties @@ -1,4 +1,4 @@ name=SLF4J -version=2.0.12 +version=2.0.13 license=MIT License link=https://www.slf4j.org/ \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index ec9dd5efa..8f46a615a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,5 +19,7 @@ for (def ext : file("ext").list()) { } include 'app' -include 'cli' +if (file("cli").exists()) { + include 'cli' +} include 'dist'