Skip to content

Commit ab781a9

Browse files
authored
Do not fail for duplicated project names (#113)
See #108
1 parent c3c8b51 commit ab781a9

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ private String toProjectName(String moduleNameSuffix) {
214214
public Provider<Dependency> create(String moduleName, SourceSet sourceSetWithModuleInfo) {
215215
return getProviders().provider(() -> {
216216
Map<String, String> allProjectNamesAndGroups = getProject().getRootProject().getSubprojects().stream().collect(
217-
Collectors.toMap(Project::getName, p -> (String) p.getGroup()));
217+
Collectors.toMap(Project::getName, p -> (String) p.getGroup(), (a, b) -> a));
218218

219219
Provider<String> coordinates = getModuleNameToGA().getting(moduleName).orElse(mapByPrefix(getProviders().provider(() -> moduleName)));
220220

src/test/groovy/org/gradlex/javamodule/dependencies/test/LocalModuleMappingsTest.groovy

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,31 @@ class LocalModuleMappingsTest extends Specification {
5353
then:
5454
runner(false, 'build').build()
5555
}
56+
57+
def "does not fail if there are two project with same name (but different path)"() {
58+
when:
59+
libModuleInfoFile << '''
60+
module org.gradlex.test.lib {
61+
requires org.gradlex.test.anotherlib;
62+
}
63+
'''
64+
settingsFile << 'include("another:lib")'
65+
file("another/lib/build.gradle.kts") << '''
66+
plugins {
67+
id("org.gradlex.java-module-dependencies")
68+
id("java-library")
69+
}
70+
group = "another"
71+
'''
72+
file("another/lib/src/main/java/module-info.java") << '''
73+
module org.gradlex.test.anotherlib { }
74+
'''
75+
76+
file("gradle/modules.properties") << '''
77+
org.gradlex.test.anotherlib=another:lib
78+
'''
79+
80+
then:
81+
build()
82+
}
5683
}

0 commit comments

Comments
 (0)