From 485ab3e582d9398e8e5cacd87059984cf4d9b54f Mon Sep 17 00:00:00 2001 From: palexdev Date: Wed, 29 May 2024 13:25:45 +0200 Subject: [PATCH] :bookmark: Bump and release modules: [components, release] :bookmark: Bump components and release modules to version 11.24.4 Signed-off-by: palexdev --- gradle.properties | 2 +- modules/components/CHANGELOG.md | 6 ++++++ modules/components/gradle.properties | 2 +- .../palexdev/mfxcomponents/theming/UserAgentBuilder.java | 4 ++-- modules/release/CHANGELOG.md | 4 ++++ modules/release/gradle.properties | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index efe37898..ac1cc56b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ jdk=11 testJdk=17 # Modules -mfx=11.24.3 +mfx=11.24.4 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 7ab149fb..2a30093b 100644 --- a/modules/components/CHANGELOG.md +++ b/modules/components/CHANGELOG.md @@ -16,6 +16,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). [//]: ##[Unreleased] +## [11.24.4] - 29-05-2024 + +### Fixed + +- Fixed mistake of previous release + ## [11.24.3] - 29-05-2024 ### Fixed diff --git a/modules/components/gradle.properties b/modules/components/gradle.properties index f8f6ee18..5c50fbec 100644 --- a/modules/components/gradle.properties +++ b/modules/components/gradle.properties @@ -3,7 +3,7 @@ # Maven # #--------------------------------------# POM_ARTIFACT_ID=mfxcomponents -VERSION_NAME=11.24.3 +VERSION_NAME=11.24.4 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 378ecfa3..88a0d6ef 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 @@ -315,7 +315,7 @@ private Path resolveImport(Theme theme, String line) { .split(" "); String path = split[1]; Map deployed = Deployer.instance().getDeployed(theme); - return Optional.of(deployed).map(m -> m.get(path)).orElse(null); + return Optional.ofNullable(deployed).map(m -> m.get(path)).orElse(null); } /** @@ -326,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 Optional.of(deployed).map(m -> m.get(name)).orElse(null); + return Optional.ofNullable(deployed).map(m -> m.get(name)).orElse(null); } /** diff --git a/modules/release/CHANGELOG.md b/modules/release/CHANGELOG.md index 26454494..905dd0b8 100644 --- a/modules/release/CHANGELOG.md +++ b/modules/release/CHANGELOG.md @@ -16,6 +16,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). [//]: ##[Unreleased] +## [11.24.4] - 29-05-2024 + +- Bump components and release modules to version 11.24.4 + ## [11.24.3] - 29-05-2024 - Bump components and release modules to version 11.24.3 diff --git a/modules/release/gradle.properties b/modules/release/gradle.properties index 3ccb0d97..854083fc 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.3 +VERSION_NAME=11.24.4 POM_NAME=materialfx-all POM_DESCRIPTION=Material Design/Modern components for JavaFX, now packed as a single Jar