|
1 | 1 | // SPDX-License-Identifier: Apache-2.0 |
2 | 2 | package org.gradlex.javamodule.dependencies; |
3 | 3 |
|
| 4 | +import static java.util.Collections.singletonMap; |
4 | 5 | import static java.util.Optional.empty; |
5 | 6 | import static org.gradlex.javamodule.dependencies.internal.utils.DependencyDeclarationsUtil.copyVersionConstraint; |
6 | 7 | import static org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo.Directive.REQUIRES_RUNTIME; |
@@ -261,8 +262,8 @@ private Provider<Dependency> createPrecise(String moduleName) { |
261 | 262 |
|
262 | 263 | if (localModule != null) { |
263 | 264 | // 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()))); |
266 | 267 | projectDependency.because(moduleName); |
267 | 268 | if (localModule.getCapability() != null) { |
268 | 269 | projectDependency.capabilities(c -> c.requireCapabilities(localModule.getCapability())); |
@@ -302,15 +303,15 @@ private Provider<Dependency> createWithGuessing(String moduleName, SourceSet sou |
302 | 303 | .max(Comparator.comparingInt(String::length)); |
303 | 304 |
|
304 | 305 | 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()))); |
307 | 308 | projectDependency.because(moduleName); |
308 | 309 | return projectDependency; |
309 | 310 | } else if (existingProjectName.isPresent()) { |
310 | 311 | // no exact match -> add capability to point at Module in other source set |
311 | 312 | 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))); |
314 | 315 | String capabilityName = projectName |
315 | 316 | + moduleNameSuffix.substring(projectName.length()).replace(".", "-"); |
316 | 317 | projectDependency.capabilities( |
@@ -515,10 +516,7 @@ public Configuration versionsFromConsistentResolution(Collection<String> version |
515 | 516 | private Dependency createDependency(String project) { |
516 | 517 | boolean isProjectInBuild = project.startsWith(":"); |
517 | 518 | return getDependencies() |
518 | | - .create( |
519 | | - isProjectInBuild |
520 | | - ? getDependencies().project(Collections.singletonMap("path", project)) |
521 | | - : project); |
| 519 | + .create(isProjectInBuild ? getDependencies().project(singletonMap("path", project)) : project); |
522 | 520 | } |
523 | 521 |
|
524 | 522 | /** |
|
0 commit comments