Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Extra Java Module Info Gradle Plugin - Changelog

## Version 1.13.2
## Version 1.14
* [Fixed] [#179](https://github.com/gradlex-org/extra-java-module-info/issues/179) - Combine 'preserveExisting' and 'exports'
* [Fixed] [#219](https://github.com/gradlex-org/extra-java-module-info/issues/219) - Combine 'preserveExisting' and 'removePackage'
* [Fixed] [#223](https://github.com/gradlex-org/extra-java-module-info/issues/223) - Combine 'preserveExisting' and 'ignoreServiceProvider'
* [Fixed] [#227](https://github.com/gradlex-org/extra-java-module-info/issues/227) - Stable order for the mergeJar path input

## Version 1.13.1
* [Fixed] [#197](https://github.com/gradlex-org/extra-java-module-info/issues/197) - Slightly adjust Gradle API usage for better 9.0.0 compatibility
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,11 @@ val mainRuntimeClasspath = configurations.create("mainRuntimeClasspath") {
// depend on all subprojects to create a dependency graph with "everything"
dependencies { mainRuntimeClasspath(project(":app")) }

// If the mergeJar feature is used, also use the "global classpath" to discover jars-to-merge (optional)
configurations.getByName("javaModulesMergeJars") {
extendsFrom(configurations.getByName("mainRuntimeClasspath"))
}

// Use the global classpath for consisten resolution (optional)
configurations.runtimeClasspath {
shouldResolveConsistentlyWith(mainRuntimeClasspath)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ private static class IdExtractor implements Transformer<List<String>, Collection
@Override
public List<String> transform(Collection<ResolvedArtifactResult> artifacts) {
return artifacts.stream()
.sorted(Comparator.comparing(ResolvedArtifactResult::getFile))
.map(a -> {
ComponentIdentifier componentIdentifier = a.getId().getComponentIdentifier();
if (componentIdentifier instanceof ModuleComponentIdentifier) {
Expand All @@ -332,6 +333,7 @@ public FileExtractor(ProjectLayout projectLayout) {
public List<RegularFile> transform(Collection<ResolvedArtifactResult> artifacts) {
Directory projectDirectory = projectLayout.getProjectDirectory();
return artifacts.stream()
.sorted(Comparator.comparing(ResolvedArtifactResult::getFile))
.map(a -> projectDirectory.file(a.getFile().getAbsolutePath()))
.collect(Collectors.toList());
}
Expand Down
Loading