Skip to content

Commit

Permalink
🔖 Bump and release modules: [components, core, release]
Browse files Browse the repository at this point in the history
🔖 Bump components and release modules to version 11.24.3
🔖 Bump core module to version 11.9.0

[Components Module]
- Theming Package
🐛 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 <[email protected]>
  • Loading branch information
palexdev committed May 29, 2024
1 parent 664c862 commit 5b00ad9
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions modules/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/components/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -318,7 +315,7 @@ private Path resolveImport(Theme theme, String line) {
.split(" ");
String path = split[1];
Map<String, Path> deployed = Deployer.instance().getDeployed(theme);
return deployed.get(path);
return Optional.of(deployed).map(m -> m.get(path)).orElse(null);
}

/**
Expand All @@ -329,7 +326,7 @@ private Path resolveImport(Theme theme, String line) {
private Path resolveResource(Theme theme, String url) {
String name = getResourceName(url);
Map<String, Path> deployed = Deployer.instance().getDeployed(theme);
return deployed.get(name);
return Optional.of(deployed).map(m -> m.get(name)).orElse(null);
}

/**
Expand Down
10 changes: 10 additions & 0 deletions modules/release/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/release/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5b00ad9

Please sign in to comment.