Skip to content

Commit d84494c

Browse files
committed
Fix in module name calculation for additional source sets
1 parent e7a2265 commit d84494c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,13 @@ private void declareDependency(String moduleName, @Nullable String ownModuleName
267267
projectDependency.because(moduleName);
268268
} else if (existingProjectName.isPresent()) {
269269
// no exact match -> add capability to point at Module in other source set
270+
String projectName = existingProjectName.get();
270271
ProjectDependency projectDependency = (ProjectDependency) project.getDependencies().add(
271-
configuration.getName(), project.project(parentPath + ":" + existingProjectName.get()));
272+
configuration.getName(), project.project(parentPath + ":" + projectName));
272273
assert projectDependency != null;
274+
String capabilityName = projectName + moduleNameSuffix.substring(projectName.length()).replace(".", "-");
273275
projectDependency.capabilities(c -> c.requireCapabilities(
274-
allProjectNamesAndGroups.get(existingProjectName.get()) + ":" + moduleNameSuffix.replace(".", "-")));
276+
allProjectNamesAndGroups.get(projectName) + ":" + capabilityName));
275277
projectDependency.because(moduleName);
276278
} else if (gav.isPresent()) {
277279
project.getDependencies().addProvider(configuration.getName(), gav, d -> d.because(moduleName));

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/ModuleInfo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ public String moduleNamePrefix(String projectName, String sourceSetName) {
9191
if (moduleName.endsWith("." + projectPlusSourceSetName)) {
9292
return moduleName.substring(0, moduleName.length() - projectPlusSourceSetName.length() - 1);
9393
}
94+
if (moduleName.equals(projectPlusSourceSetName)) {
95+
return "";
96+
}
9497
if (moduleName.endsWith("." + projectName)) {
9598
return moduleName.substring(0, moduleName.length() - projectName.length() - 1);
9699
}

0 commit comments

Comments
 (0)