From 5b00ad9e1e6c8a50f5381a62090c41aadf16781a Mon Sep 17 00:00:00 2001 From: palexdev Date: Wed, 29 May 2024 12:57:14 +0200 Subject: [PATCH] :bookmark: Bump and release modules: [components, core, release] :bookmark: Bump components and release modules to version 11.24.3 :bookmark: Bump core module to version 11.9.0 [Components Module] - Theming Package :bug: Fixed exception caused by the UserAgentBuilder when both deploy and resolveAssets options are active but the theme has nothing to deploy Signed-off-by: palexdev --- gradle.properties | 2 +- modules/components/CHANGELOG.md | 13 +++++++++++++ modules/components/gradle.properties | 2 +- .../mfxcomponents/theming/UserAgentBuilder.java | 9 +++------ modules/release/CHANGELOG.md | 10 ++++++++++ modules/release/gradle.properties | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8e592483..efe37898 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ jdk=11 testJdk=17 # Modules -mfx=11.24.2 +mfx=11.24.3 mfxcore=11.9.0 mfxeffects=11.3.1 mfxlocalization=11.1.0 diff --git a/modules/components/CHANGELOG.md b/modules/components/CHANGELOG.md index 34433a38..7ab149fb 100644 --- a/modules/components/CHANGELOG.md +++ b/modules/components/CHANGELOG.md @@ -16,6 +16,19 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). [//]: ##[Unreleased] +## [11.24.3] - 29-05-2024 + +### Fixed + +- Fixed exception caused by the UserAgentBuilder when both deploy and resolveAssets options are active but the theme + has nothing to deploy + +## [11.24.2] - 22-01-2024 + +### Fixed + +- Fixed bug in selectable components' behavior triggering fire() twice and thus causing any action to be performed twice + ## [11.24.1] - 19-10-2023 ### Changed diff --git a/modules/components/gradle.properties b/modules/components/gradle.properties index 7638ea68..f8f6ee18 100644 --- a/modules/components/gradle.properties +++ b/modules/components/gradle.properties @@ -3,7 +3,7 @@ # Maven # #--------------------------------------# POM_ARTIFACT_ID=mfxcomponents -VERSION_NAME=11.24.2 +VERSION_NAME=11.24.3 POM_NAME=mfxcomponents POM_DESCRIPTION=Material Design/Modern components for JavaFX diff --git a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/theming/UserAgentBuilder.java b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/theming/UserAgentBuilder.java index 94f4dfbc..378ecfa3 100644 --- a/modules/components/src/main/java/io/github/palexdev/mfxcomponents/theming/UserAgentBuilder.java +++ b/modules/components/src/main/java/io/github/palexdev/mfxcomponents/theming/UserAgentBuilder.java @@ -31,10 +31,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * The best way to style a JavaFX application is to use {@link Application#setUserAgentStylesheet(String)} because the @@ -318,7 +315,7 @@ private Path resolveImport(Theme theme, String line) { .split(" "); String path = split[1]; Map deployed = Deployer.instance().getDeployed(theme); - return deployed.get(path); + return Optional.of(deployed).map(m -> m.get(path)).orElse(null); } /** @@ -329,7 +326,7 @@ private Path resolveImport(Theme theme, String line) { private Path resolveResource(Theme theme, String url) { String name = getResourceName(url); Map deployed = Deployer.instance().getDeployed(theme); - return deployed.get(name); + return Optional.of(deployed).map(m -> m.get(name)).orElse(null); } /** diff --git a/modules/release/CHANGELOG.md b/modules/release/CHANGELOG.md index 0de250cb..26454494 100644 --- a/modules/release/CHANGELOG.md +++ b/modules/release/CHANGELOG.md @@ -16,6 +16,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). [//]: ##[Unreleased] +## [11.24.3] - 29-05-2024 + +- Bump components and release modules to version 11.24.3 +- Bump core module to version 11.9.0 + +## [11.24.2] - 22-01-2024 + +- Bump components and release modules to version 11.24.2 +- Bump core module to version 11.8.1 + ## [11.24.1] - 19-10-2023 - Bump components and release modules to version 11.24.1 diff --git a/modules/release/gradle.properties b/modules/release/gradle.properties index 5cb20e8d..3ccb0d97 100644 --- a/modules/release/gradle.properties +++ b/modules/release/gradle.properties @@ -3,7 +3,7 @@ # Maven # #--------------------------------------# POM_ARTIFACT_ID=materialfx-all -VERSION_NAME=11.24.2 +VERSION_NAME=11.24.3 POM_NAME=materialfx-all POM_DESCRIPTION=Material Design/Modern components for JavaFX, now packed as a single Jar