From 300b3d793e7d573701afdc11ba11e241af4f2b03 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 01:52:17 +0000 Subject: [PATCH 1/2] Update Gradle to v9.6.0 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 4 ++-- gradlew.bat | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bd82f36..65d8749 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index b9bb139..249efbb 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index aa5f10b..8508ef6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel From d6536f18184b493e7a78498ecf95f8cf65245337 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Fri, 19 Jun 2026 09:35:53 +0200 Subject: [PATCH 2/2] No longer use deprecated 'getProject().project()' method --- CHANGELOG.md | 4 ++++ .../JavaModuleDependenciesExtension.java | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69a2e7f..c61e5c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java index 6edd0f9..c2ae85c 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java @@ -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; @@ -261,8 +262,8 @@ private Provider 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())); @@ -302,15 +303,15 @@ private Provider 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( @@ -515,10 +516,7 @@ public Configuration versionsFromConsistentResolution(Collection 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); } /**