Skip to content

Commit 5ae6877

Browse files
Update Gradle to v9.6.0 (#319)
* Update Gradle to v9.6.0 * No longer use deprecated 'getProject().project()' method --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jendrik Johannes <jendrik@onepiece.software>
1 parent 745fd1e commit 5ae6877

5 files changed

Lines changed: 18 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Java Module Dependencies Gradle Plugin - Changelog
22

3+
## Version 1.12.2
4+
* [#319](https://github.com/gradlex-org/java-module-dependencies/pull/319) Address Gradle 9.6.0 deprecations
5+
* 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)
6+
37
## Version 1.12.1
48
* 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)
59

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
3+
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
55
networkTimeout=10000
66
retries=0
77
retryBackOffMs=500

gradlew

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package org.gradlex.javamodule.dependencies;
33

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

262263
if (localModule != null) {
263264
// local project
264-
ProjectDependency projectDependency = (ProjectDependency)
265-
getDependencies().create(getProject().project(localModule.getProjectPath()));
265+
ProjectDependency projectDependency = (ProjectDependency) getDependencies()
266+
.create(getDependencies().project(singletonMap("path", localModule.getProjectPath())));
266267
projectDependency.because(moduleName);
267268
if (localModule.getCapability() != null) {
268269
projectDependency.capabilities(c -> c.requireCapabilities(localModule.getCapability()));
@@ -302,15 +303,15 @@ private Provider<Dependency> createWithGuessing(String moduleName, SourceSet sou
302303
.max(Comparator.comparingInt(String::length));
303304

304305
if (perfectMatch.isPresent()) {
305-
Dependency projectDependency =
306-
getDependencies().create(getProject().project(parentPath + ":" + perfectMatch.get()));
306+
Dependency projectDependency = getDependencies()
307+
.create(getDependencies().project(singletonMap("path", parentPath + ":" + perfectMatch.get())));
307308
projectDependency.because(moduleName);
308309
return projectDependency;
309310
} else if (existingProjectName.isPresent()) {
310311
// no exact match -> add capability to point at Module in other source set
311312
String projectName = existingProjectName.get();
312-
ProjectDependency projectDependency = (ProjectDependency)
313-
getDependencies().create(getProject().project(parentPath + ":" + projectName));
313+
ProjectDependency projectDependency = (ProjectDependency) getDependencies()
314+
.create(getDependencies().project(singletonMap("path", parentPath + ":" + projectName)));
314315
String capabilityName = projectName
315316
+ moduleNameSuffix.substring(projectName.length()).replace(".", "-");
316317
projectDependency.capabilities(
@@ -515,10 +516,7 @@ public Configuration versionsFromConsistentResolution(Collection<String> version
515516
private Dependency createDependency(String project) {
516517
boolean isProjectInBuild = project.startsWith(":");
517518
return getDependencies()
518-
.create(
519-
isProjectInBuild
520-
? getDependencies().project(Collections.singletonMap("path", project))
521-
: project);
519+
.create(isProjectInBuild ? getDependencies().project(singletonMap("path", project)) : project);
522520
}
523521

524522
/**

0 commit comments

Comments
 (0)