Skip to content

Commit de71fc8

Browse files
ix0raisupersaiyansubtlety
ix0rai
and
supersaiyansubtlety
committed
update dependencies for 2.7 and move to jspecify annotations (#334)
* update gradle and dependencies * fix deprecations * replace @nullable and @nonnull with jspecify annotations - add jspecify dependency - find-and-replace - full project optimise imports in intellij * fix checkstyle issues * fix broken tests * fix checkstyle issues, issues from merge, and newly added files * remove wildcard import in enigma-swing buildscript --------- Co-authored-by: supersaiyansubtlety <[email protected]> * update files merged in * checkstyle * create empty directories for excluded sub-projects * fix gradle deprecation warnings --------- Co-authored-by: supersaiyansubtlety <[email protected]>
1 parent 91cedcf commit de71fc8

File tree

251 files changed

+849
-846
lines changed

Some content is hidden

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

251 files changed

+849
-846
lines changed

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ subprojects {
2121
dependencies {
2222
implementation libs.guava
2323
implementation libs.gson
24+
implementation libs.jspecify
2425

2526
implementation libs.bundles.tinylog
2627

‎config/checkstyle/checkstyle.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@
161161
<module name="OuterTypeFilename"/>
162162
<module name="PackageDeclaration"/>
163163

164-
<!--<module name="InvalidJavadocPosition"/>-->
165-
<module name="JavadocParagraph">
166-
<property name="allowNewlineParagraph" value="false"/>
167-
</module>
164+
<module name="InvalidJavadocPosition"/>
165+
<!--<module name="JavadocParagraph">-->
166+
<!--<property name="allowNewlineParagraph" value="false"/>-->
167+
<!--</module>-->
168168
<module name="AtclauseOrder">
169169
<property name="tagOrder" value="@param,@return,@throws,@deprecated"/>
170170
</module>

‎enigma-cli/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ application {
1818
publishing {
1919
publications {
2020
"$project.name"(MavenPublication) {
21-
groupId project.group
22-
artifactId project.name
23-
version project.version
21+
groupId = project.group
22+
artifactId = project.name
23+
version = project.version
2424
from components.java
2525
}
2626
}

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/ArgsParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.google.common.collect.ImmutableList;
44
import com.google.common.collect.UnmodifiableIterator;
5+
import org.jspecify.annotations.NonNull;
56

6-
import javax.annotation.Nonnull;
77
import java.util.Map;
88
import java.util.function.BiFunction;
99
import java.util.stream.Stream;
@@ -202,7 +202,7 @@ boolean isEmpty() {
202202
}
203203

204204
@Override
205-
@Nonnull
205+
@NonNull
206206
public UnmodifiableIterator<Argument<?>> iterator() {
207207
return this.args.iterator();
208208
}

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/Argument.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.quiltmc.enigma.command;
22

33
import com.google.common.annotations.VisibleForTesting;
4+
import org.jspecify.annotations.Nullable;
45

5-
import javax.annotation.Nullable;
66
import java.io.IOException;
77
import java.nio.file.Files;
88
import java.nio.file.Path;

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/Command.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import com.google.common.annotations.VisibleForTesting;
44
import com.google.common.collect.ImmutableSet;
5+
import org.jspecify.annotations.Nullable;
56
import org.quiltmc.enigma.api.Enigma;
7+
import org.quiltmc.enigma.api.EnigmaPlugin;
68
import org.quiltmc.enigma.api.EnigmaProfile;
79
import org.quiltmc.enigma.api.EnigmaProject;
810
import org.quiltmc.enigma.api.ProgressListener;
911
import org.quiltmc.enigma.api.analysis.index.jar.JarIndex;
10-
import org.quiltmc.enigma.api.EnigmaPlugin;
1112
import org.quiltmc.enigma.api.analysis.index.jar.MainJarIndex;
1213
import org.quiltmc.enigma.api.class_provider.CachingClassProvider;
1314
import org.quiltmc.enigma.api.class_provider.ClasspathClassProvider;
@@ -33,7 +34,6 @@
3334
import java.util.Set;
3435
import java.util.function.BiConsumer;
3536
import java.util.stream.Stream;
36-
import javax.annotation.Nullable;
3737

3838
import static com.google.common.collect.ImmutableSet.toImmutableSet;
3939

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/ComposeMappingsCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package org.quiltmc.enigma.command;
22

33
import com.google.common.collect.ImmutableList;
4+
import org.jspecify.annotations.Nullable;
45
import org.quiltmc.enigma.api.Enigma;
56
import org.quiltmc.enigma.api.ProgressListener;
6-
import org.quiltmc.enigma.api.translation.mapping.serde.MappingsReader;
7-
import org.quiltmc.enigma.util.MappingOperations;
8-
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
97
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
108
import org.quiltmc.enigma.api.translation.mapping.serde.MappingFileNameFormat;
9+
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
1110
import org.quiltmc.enigma.api.translation.mapping.serde.MappingSaveParameters;
11+
import org.quiltmc.enigma.api.translation.mapping.serde.MappingsReader;
1212
import org.quiltmc.enigma.api.translation.mapping.serde.MappingsWriter;
1313
import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree;
14-
import org.quiltmc.enigma.util.Utils;
15-
import org.quiltmc.enigma.command.ComposeMappingsCommand.Required;
1614
import org.quiltmc.enigma.command.ComposeMappingsCommand.Optional;
15+
import org.quiltmc.enigma.command.ComposeMappingsCommand.Required;
16+
import org.quiltmc.enigma.util.MappingOperations;
17+
import org.quiltmc.enigma.util.Utils;
1718

18-
import javax.annotation.Nullable;
1919
import java.io.IOException;
2020
import java.nio.file.Path;
2121

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/ConvertMappingsCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.quiltmc.enigma.command;
22

3+
import org.jspecify.annotations.Nullable;
34
import org.quiltmc.enigma.api.Enigma;
45
import org.quiltmc.enigma.api.ProgressListener;
5-
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
66
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
77
import org.quiltmc.enigma.api.translation.mapping.serde.MappingFileNameFormat;
8+
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
89
import org.quiltmc.enigma.api.translation.mapping.serde.MappingSaveParameters;
910
import org.quiltmc.enigma.api.translation.mapping.serde.MappingsReader;
1011
import org.quiltmc.enigma.api.translation.mapping.serde.MappingsWriter;
1112
import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree;
1213
import org.quiltmc.enigma.command.ArgsParser.Empty;
13-
import org.quiltmc.enigma.util.Utils;
1414
import org.quiltmc.enigma.command.ConvertMappingsCommand.Required;
15+
import org.quiltmc.enigma.util.Utils;
1516

16-
import javax.annotation.Nullable;
1717
import java.io.IOException;
1818
import java.nio.file.Path;
1919

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/DecompileCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.google.common.collect.ImmutableList;
44
import org.quiltmc.enigma.api.EnigmaProject;
5-
import org.quiltmc.enigma.api.ProgressListener;
65
import org.quiltmc.enigma.api.EnigmaProject.DecompileErrorStrategy;
6+
import org.quiltmc.enigma.api.ProgressListener;
77
import org.quiltmc.enigma.api.service.DecompilerService;
88
import org.quiltmc.enigma.api.source.Decompilers;
99
import org.quiltmc.enigma.command.DecompileCommand.Required;

‎enigma-cli/src/main/java/org/quiltmc/enigma/command/FillClassMappingsCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.quiltmc.enigma.command;
22

3+
import org.jspecify.annotations.Nullable;
34
import org.quiltmc.enigma.api.Enigma;
45
import org.quiltmc.enigma.api.ProgressListener;
56
import org.quiltmc.enigma.api.analysis.index.jar.JarIndex;
@@ -13,12 +14,11 @@
1314
import org.quiltmc.enigma.api.translation.mapping.tree.HashEntryTree;
1415
import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
1516
import org.quiltmc.enigma.api.translation.representation.entry.ParentedEntry;
16-
import org.quiltmc.enigma.util.Utils;
17-
import org.quiltmc.enigma.command.FillClassMappingsCommand.Required;
1817
import org.quiltmc.enigma.command.FillClassMappingsCommand.Optional;
18+
import org.quiltmc.enigma.command.FillClassMappingsCommand.Required;
19+
import org.quiltmc.enigma.util.Utils;
1920
import org.tinylog.Logger;
2021

21-
import javax.annotation.Nullable;
2222
import java.nio.file.Path;
2323
import java.util.List;
2424

0 commit comments

Comments
 (0)