Skip to content

Commit 742142b

Browse files
committed
Remove 'package-info' files and format code
1 parent 8dbf8f4 commit 742142b

65 files changed

Lines changed: 195 additions & 284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
import java.util.Arrays;
55
import java.util.List;
6+
import org.jspecify.annotations.NullMarked;
67

8+
@NullMarked
79
interface JDKInfo {
810
List<String> MODULES = Arrays.asList(
911
"java.base",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfoCache;
5555
import org.gradlex.javamodule.dependencies.tasks.MetaInfServicesGenerate;
5656
import org.gradlex.javamodule.dependencies.tasks.SyntheticModuleInfoFoldersGenerate;
57+
import org.jspecify.annotations.NullMarked;
5758
import org.jspecify.annotations.Nullable;
5859

5960
/**
@@ -62,6 +63,7 @@
6263
* - Define dependencies and dependency constraints by Module Name
6364
* using {@link #ga(String)}, {@link #gav(String, String)} or {@link #gav(String)}
6465
*/
66+
@NullMarked
6567
public abstract class JavaModuleDependenciesExtension {
6668
static final String JAVA_MODULE_DEPENDENCIES = "javaModuleDependencies";
6769

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.gradle.api.Project;
2222
import org.gradle.api.Task;
2323
import org.gradle.api.artifacts.Configuration;
24-
import org.gradle.api.artifacts.ConfigurationContainer;
2524
import org.gradle.api.artifacts.VersionCatalogsExtension;
2625
import org.gradle.api.initialization.Settings;
2726
import org.gradle.api.plugins.ExtensionAware;
@@ -45,8 +44,9 @@
4544
import org.gradlex.javamodule.dependencies.tasks.ModuleInfoGenerate;
4645
import org.gradlex.javamodule.dependencies.tasks.ModulePathAnalysis;
4746
import org.gradlex.javamodule.dependencies.tasks.ModuleVersionRecommendation;
47+
import org.jspecify.annotations.NullMarked;
4848

49-
@SuppressWarnings("unused")
49+
@NullMarked
5050
public abstract class JavaModuleDependenciesPlugin implements Plugin<ExtensionAware> {
5151

5252
private static final String EXTRA_JAVA_MODULE_INFO_PLUGIN_ID = "org.gradlex.extra-java-module-info";
@@ -134,7 +134,7 @@ private void setupForJavaProject(Project project, JavaModuleDependenciesExtensio
134134
if (registerHelpTasks) {
135135
setupOrderingCheckTasks(project, checkAllModuleInfo, javaModuleDependencies);
136136
setupModuleDependenciesTask(project);
137-
setupReportTasks(project, javaModuleDependencies);
137+
setupReportTasks(project);
138138
setupMigrationTasks(project, javaModuleDependencies);
139139
}
140140

@@ -198,7 +198,7 @@ private void setupModuleDependenciesTask(Project project) {
198198
}));
199199
}
200200

201-
private void setupReportTasks(Project project, JavaModuleDependenciesExtension javaModuleDependencies) {
201+
private void setupReportTasks(Project project) {
202202
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
203203
project.getTasks().register("analyzeModulePath", ModulePathAnalysis.class, t -> {
204204
t.setGroup(HELP_GROUP);
@@ -222,7 +222,6 @@ private void setupReportTasks(Project project, JavaModuleDependenciesExtension j
222222

223223
private void setupMigrationTasks(Project project, JavaModuleDependenciesExtension javaModuleDependencies) {
224224
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
225-
ConfigurationContainer configurations = project.getConfigurations();
226225

227226
TaskProvider<Task> generateAllModuleInfoFiles = project.getTasks().register("generateAllModuleInfoFiles", t -> {
228227
t.setGroup("java modules");
@@ -316,7 +315,6 @@ private void setupOrderingCheckTasks(
316315
TaskProvider<Task> checkAllModuleInfo,
317316
JavaModuleDependenciesExtension javaModuleDependencies) {
318317
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
319-
ConfigurationContainer configurations = project.getConfigurations();
320318

321319
sourceSets.configureEach(sourceSet -> {
322320
TaskProvider<ModuleDirectivesOrderingCheck> checkModuleInfo = project.getTasks()

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import org.gradle.api.plugins.JavaPlatformPlugin;
2323
import org.gradle.api.plugins.JavaPlugin;
2424
import org.gradle.api.provider.Provider;
25-
import org.gradle.api.tasks.SourceSetContainer;
2625
import org.gradle.util.GradleVersion;
2726
import org.gradlex.javamodule.dependencies.dsl.ModuleVersions;
2827
import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo;
2928
import org.gradlex.javamodule.dependencies.tasks.CatalogGenerate;
29+
import org.jspecify.annotations.NullMarked;
3030
import org.jspecify.annotations.Nullable;
3131

32-
@SuppressWarnings("unused")
32+
@NullMarked
3333
public abstract class JavaModuleVersionsPlugin implements Plugin<Project> {
3434
private static final boolean MIN_GRADLE_9_0 =
3535
GradleVersion.current().compareTo(GradleVersion.version("9.0.0")) >= 0;
@@ -49,7 +49,6 @@ private void setupForJavaPlatformProject(Project project) {
4949

5050
private void setupForJavaProject(Project project) {
5151
ObjectFactory objects = project.getObjects();
52-
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
5352

5453
Configuration versions = project.getConfigurations().create("versions", c -> {
5554
c.setCanBeResolved(false);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
import java.io.Serializable;
55
import java.util.Objects;
6+
import org.jspecify.annotations.NullMarked;
67
import org.jspecify.annotations.Nullable;
78

9+
@NullMarked
810
public class LocalModule implements Comparable<LocalModule>, Serializable {
911
private final String moduleName;
1012
private final String projectPath;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
import java.io.InputStream;
66
import java.util.Map;
77
import java.util.Properties;
8+
import org.jspecify.annotations.NullMarked;
89
import org.jspecify.annotations.Nullable;
910

11+
@NullMarked
1012
public final class SharedMappings {
1113
public static Map<String, String> mappings = loadModuleNameToGAProperties();
1214

src/main/java/org/gradlex/javamodule/dependencies/dsl/AllDirectives.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
import org.gradle.api.tasks.SourceSet;
55
import org.gradlex.javamodule.dependencies.JavaModuleDependenciesExtension;
6+
import org.jspecify.annotations.NullMarked;
67

8+
@NullMarked
79
public abstract class AllDirectives extends GradleOnlyDirectives {
810

911
public AllDirectives(

src/main/java/org/gradlex/javamodule/dependencies/dsl/GradleOnlyDirectives.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import org.gradle.api.artifacts.dsl.DependencyHandler;
88
import org.gradle.api.tasks.SourceSet;
99
import org.gradlex.javamodule.dependencies.JavaModuleDependenciesExtension;
10+
import org.jspecify.annotations.NullMarked;
1011

12+
@NullMarked
1113
public abstract class GradleOnlyDirectives {
1214

1315
protected final SourceSet sourceSet;

src/main/java/org/gradlex/javamodule/dependencies/dsl/ModuleVersions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import org.gradle.api.artifacts.MutableVersionConstraint;
1111
import org.gradle.api.artifacts.dsl.DependencyHandler;
1212
import org.gradlex.javamodule.dependencies.JavaModuleDependenciesExtension;
13+
import org.jspecify.annotations.NullMarked;
1314

15+
@NullMarked
1416
public abstract class ModuleVersions {
1517

1618
private final Map<String, String> declaredVersions = new LinkedHashMap<>();

src/main/java/org/gradlex/javamodule/dependencies/dsl/package-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)