Skip to content

Commit c641d3a

Browse files
committed
Print full paths in report tasks
1 parent 8acf1dc commit c641d3a

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ private void setupOrderingCheckTasks(Project project, TaskProvider<Task> checkAl
220220

221221
ModuleInfo moduleInfo = javaModuleDependencies.getModuleInfoCache().get(sourceSet);
222222

223-
t.getModuleInfoPath().convention(project.getLayout().getProjectDirectory().getAsFile().getParentFile().toPath().relativize(
224-
sourceSet.getJava().getSrcDirs().iterator().next().toPath()).resolve("module-info.java").toString());
223+
t.getModuleInfoPath().convention(moduleInfo.getFilePath().getAbsolutePath());
225224
t.getModuleNamePrefix().convention(moduleInfo.moduleNamePrefix(project.getName(), sourceSet.getName()));
226225
t.getModuleInfo().convention(moduleInfo);
227226
});

src/main/java/org/gradlex/javamodule/dependencies/internal/bridges/DependencyAnalysisBridge.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public static void registerDependencyAnalysisPostProcessingTask(Project project,
3939
if (!moduleInfo.exists()) {
4040
moduleInfo = project.getBuildFile(); // no module-info: dependencies are declared in build file
4141
}
42-
t.getSourceSets().put(
43-
sourceSet.getName(),
44-
project.getLayout().getProjectDirectory().getAsFile().getParentFile().toPath().relativize(moduleInfo.toPath()).toString());
42+
t.getSourceSets().put(sourceSet.getName(), moduleInfo.getAbsolutePath());
4543

4644
Configuration cpClasspath = project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName());
4745
Configuration rtClasspath = project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ class OrderingCheckTest extends Specification {
4040

4141
then:
4242
def result = runner(":app:checkAllModuleInfo").buildAndFail()
43-
result.output.contains('''
44-
|> app/src/main/java/module-info.java
43+
result.output.contains("""
44+
|> ${projectDir.canonicalPath}/app/src/main/java/module-info.java
4545
|
4646
| 'requires' are not declared in alphabetical order. Please use this order:
4747
| requires a.b.c;
4848
| requires b.f.g;
49-
| requires b.z.u;'''.stripMargin()
49+
| requires b.z.u;""".stripMargin()
5050
)
5151
}
5252

0 commit comments

Comments
 (0)