Skip to content

Commit ea9121b

Browse files
committed
Improve analyzeModulePath help task
#6
1 parent 9bba733 commit ea9121b

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/main/java/de/jjohannes/gradle/moduledependencies/JavaModuleDependenciesPlugin.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,19 @@ public void apply(Project project) {
6363
}
6464

6565
private void setupReportTasks(Project project, JavaModuleDependenciesExtension javaModuleDependencies) {
66+
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
6667
project.getTasks().register("analyzeModulePath", AnalyzeModulePathReportTask.class, t -> {
6768
t.setGroup(HELP_GROUP);
68-
// t.setDescription("TODO");
69+
t.setDescription("Check consistency of the Module Path");
70+
71+
for (SourceSet sourceSet : sourceSets) {
72+
t.getClasspathConfigurations().add(project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()));
73+
t.getClasspathConfigurations().add(project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()));
74+
}
6975
});
7076
project.getTasks().register("recommendModuleVersions", RecommendModuleVersionsReportTask.class, t -> {
7177
t.setGroup(HELP_GROUP);
72-
// t.setDescription("TODO");
78+
t.setDescription("Query repositories for latest stable versions of the used Java Modules");
7379
});
7480
}
7581

src/main/java/de/jjohannes/gradle/moduledependencies/tasks/AnalyzeModulePathReportTask.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import org.gradle.api.DefaultTask;
66
import org.gradle.api.Project;
77
import org.gradle.api.artifacts.Configuration;
8-
import org.gradle.api.artifacts.ConfigurationContainer;
98
import org.gradle.api.artifacts.component.ComponentIdentifier;
109
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
1110
import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
1211
import org.gradle.api.artifacts.result.ResolvedArtifactResult;
12+
import org.gradle.api.provider.ListProperty;
13+
import org.gradle.api.tasks.InputFiles;
1314
import org.gradle.api.tasks.SourceSet;
1415
import org.gradle.api.tasks.SourceSetContainer;
1516
import org.gradle.api.tasks.TaskAction;
@@ -26,14 +27,15 @@
2627
public abstract class AnalyzeModulePathReportTask extends DefaultTask {
2728

2829
private final String projectName;
29-
private final ConfigurationContainer configurations;
3030
private final SourceSetContainer sourceSets;
3131
private final JavaModuleDependenciesExtension javaModuleDependencies;
3232

33+
@InputFiles
34+
public abstract ListProperty<Configuration> getClasspathConfigurations() ;
35+
3336
@Inject
3437
public AnalyzeModulePathReportTask(Project project) {
3538
this.projectName = project.getName();
36-
this.configurations = project.getConfigurations();
3739
this.sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
3840
this.javaModuleDependencies = project.getExtensions().getByType(JavaModuleDependenciesExtension.class);
3941
}
@@ -60,9 +62,8 @@ public void report() throws IOException {
6062
}
6163
}
6264

63-
for (SourceSet sourceSet : sourceSets) {
64-
collect(configurations.getByName(sourceSet.getCompileClasspathConfigurationName()), usedMappings, nonModules, missingMappings, wrongMappings, ownModuleNamesPrefix);
65-
collect(configurations.getByName(sourceSet.getRuntimeClasspathConfigurationName()), usedMappings, nonModules, missingMappings, wrongMappings, ownModuleNamesPrefix);
65+
for (Configuration classPath: getClasspathConfigurations().get()) {
66+
collect(classPath, usedMappings, nonModules, missingMappings, wrongMappings, ownModuleNamesPrefix);
6667
}
6768

6869
p("");

0 commit comments

Comments
 (0)