Skip to content

Update Gradle to v9.6.0 #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjohannes merged 2 commits into from
Jun 19, 2026
Merged

Update Gradle to v9.6.0 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
300b3d7
Update Gradle to v9.6.0
renovate[bot] Jun 19, 2026
d6536f1
No longer use deprecated 'getProject().project()' method
jjohannes Jun 19, 2026
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Java Module Dependencies Gradle Plugin - Changelog

## Version 1.12.2
* [#319](https://github.com/gradlex-org/java-module-dependencies/pull/319) Address Gradle 9.6.0 deprecations
* Update module name mappings [#313](https://github.com/gradlex-org/java-module-dependencies/issues/313)/[#316](https://github.com/gradlex-org/java-module-dependencies/issues/316)

## Version 1.12.1
* Update module name mappings [#285](https://github.com/gradlex-org/java-module-dependencies/issues/285)/[#286](https://github.com/gradlex-org/java-module-dependencies/issues/286)

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
package org.gradlex.javamodule.dependencies;

import static java.util.Collections.singletonMap;
import static java.util.Optional.empty;
import static org.gradlex.javamodule.dependencies.internal.utils.DependencyDeclarationsUtil.copyVersionConstraint;
import static org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo.Directive.REQUIRES_RUNTIME;
Expand Down Expand Up @@ -261,8 +262,8 @@ private Provider<Dependency> createPrecise(String moduleName) {

if (localModule != null) {
// local project
ProjectDependency projectDependency = (ProjectDependency)
getDependencies().create(getProject().project(localModule.getProjectPath()));
ProjectDependency projectDependency = (ProjectDependency) getDependencies()
.create(getDependencies().project(singletonMap("path", localModule.getProjectPath())));
projectDependency.because(moduleName);
if (localModule.getCapability() != null) {
projectDependency.capabilities(c -> c.requireCapabilities(localModule.getCapability()));
Expand Down Expand Up @@ -302,15 +303,15 @@ private Provider<Dependency> createWithGuessing(String moduleName, SourceSet sou
.max(Comparator.comparingInt(String::length));

if (perfectMatch.isPresent()) {
Dependency projectDependency =
getDependencies().create(getProject().project(parentPath + ":" + perfectMatch.get()));
Dependency projectDependency = getDependencies()
.create(getDependencies().project(singletonMap("path", parentPath + ":" + perfectMatch.get())));
projectDependency.because(moduleName);
return projectDependency;
} else if (existingProjectName.isPresent()) {
// no exact match -> add capability to point at Module in other source set
String projectName = existingProjectName.get();
ProjectDependency projectDependency = (ProjectDependency)
getDependencies().create(getProject().project(parentPath + ":" + projectName));
ProjectDependency projectDependency = (ProjectDependency) getDependencies()
.create(getDependencies().project(singletonMap("path", parentPath + ":" + projectName)));
String capabilityName = projectName
+ moduleNameSuffix.substring(projectName.length()).replace(".", "-");
projectDependency.capabilities(
Expand Down Expand Up @@ -515,10 +516,7 @@ public Configuration versionsFromConsistentResolution(Collection<String> version
private Dependency createDependency(String project) {
boolean isProjectInBuild = project.startsWith(":");
return getDependencies()
.create(
isProjectInBuild
? getDependencies().project(Collections.singletonMap("path", project))
: project);
.create(isProjectInBuild ? getDependencies().project(singletonMap("path", project)) : project);
}

/**
Expand Down
Loading