Skip to content

Commit b72df91

Browse files
committed
Rename task classes for consistency
1 parent 4d3425e commit b72df91

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.gradle.api.tasks.TaskProvider;
4646
import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo;
4747
import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfoCache;
48-
import org.gradlex.javamodule.dependencies.tasks.SyntheticModuleInfoFoldersGeneration;
48+
import org.gradlex.javamodule.dependencies.tasks.SyntheticModuleInfoFoldersGenerate;
4949

5050
import javax.inject.Inject;
5151
import java.io.CharArrayReader;
@@ -471,9 +471,9 @@ void doAddRequiresRuntimeSupport(SourceSet sourceSetForModuleInfo, SourceSet sou
471471

472472
ConfigurableFileCollection syntheticModuleInfoFolders = getObjects().fileCollection();
473473
Provider<Directory> moduleInfoFoldersBase = getLayout().getBuildDirectory().dir("tmp/java-module-dependencies/" + sourceSetForClasspath.getName());
474-
TaskProvider<SyntheticModuleInfoFoldersGeneration> generatorTask = getProject().getTasks().register(
474+
TaskProvider<SyntheticModuleInfoFoldersGenerate> generatorTask = getProject().getTasks().register(
475475
generatorTaskName,
476-
SyntheticModuleInfoFoldersGeneration.class, t -> {
476+
SyntheticModuleInfoFoldersGenerate.class, t -> {
477477
t.getModuleNames().set(requiresRuntime);
478478
t.getSyntheticModuleInfoFolder().set(moduleInfoFoldersBase);
479479
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo;
4040
import org.gradlex.javamodule.dependencies.tasks.ModuleDependencyReport;
4141
import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesOrderingCheck;
42-
import org.gradlex.javamodule.dependencies.tasks.ModuleInfoGeneration;
42+
import org.gradlex.javamodule.dependencies.tasks.ModuleInfoGenerate;
4343
import org.gradlex.javamodule.dependencies.tasks.ModulePathAnalysis;
4444
import org.gradlex.javamodule.dependencies.tasks.ModuleVersionRecommendation;
4545

@@ -181,7 +181,7 @@ private void setupMigrationTasks(Project project, JavaModuleDependenciesExtensio
181181
});
182182

183183
sourceSets.all(sourceSet -> {
184-
TaskProvider<ModuleInfoGeneration> generateModuleInfo = project.getTasks().register(sourceSet.getTaskName("generate", "ModuleInfoFile"), ModuleInfoGeneration.class, t -> {
184+
TaskProvider<ModuleInfoGenerate> generateModuleInfo = project.getTasks().register(sourceSet.getTaskName("generate", "ModuleInfoFile"), ModuleInfoGenerate.class, t -> {
185185
t.setGroup("java modules");
186186
t.setDescription("Generate 'module-info.java' in '" + sourceSet.getName() + "' source set");
187187

src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGeneration.java renamed to src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGenerate.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import static org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo.Directive.*;
3838

39-
public abstract class ModuleInfoGeneration extends DefaultTask {
39+
public abstract class ModuleInfoGenerate extends DefaultTask {
4040

4141
@Input
4242
public abstract Property<String> getModuleName();
@@ -65,11 +65,6 @@ public abstract class ModuleInfoGeneration extends DefaultTask {
6565
@TaskAction
6666
public void generate() throws IOException {
6767
File moduleInfo = getModuleInfoFile().get().getAsFile();
68-
if (moduleInfo.exists()) {
69-
getLogger().lifecycle("Skipping generation of existing file: " + moduleInfo.getPath());
70-
return;
71-
}
72-
7368
List<String> content = new ArrayList<>();
7469

7570
content.add("module "+ getModuleName().get() + " {");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
@NonNullApi
3030
@CacheableTask
31-
public abstract class SyntheticModuleInfoFoldersGeneration extends DefaultTask {
31+
public abstract class SyntheticModuleInfoFoldersGenerate extends DefaultTask {
3232

3333
@Input
3434
public abstract ListProperty<String> getModuleNames();

0 commit comments

Comments
 (0)