Fully integrate new brachy changes for Slbrachyura API

stianloader · Sep 30, 2022 · c7de1e0 · c7de1e0
1 parent 1802eaf
commit c7de1e0
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 43 deletions.
diff --git a/.../src/main/java/io/github/coolcrabs/brachyura/mappings/tinyremapper/RemapperProcessor.java b/.../src/main/java/io/github/coolcrabs/brachyura/mappings/tinyremapper/RemapperProcessor.java
@@ -397,7 +397,7 @@ public void checkAccess(Path path, AccessMode... modes) throws IOException {
 
         }
 
-        @SuppressWarnings("unchecked") // Slbrachyura: Make javac shut up about the JBR patch
+        @SuppressWarnings("all") // Slbrachyura: Make javac shut up about the JBR patch
         @Override
         public <V extends FileAttributeView> V getFileAttributeView(Path path, Class<V> type, LinkOption... options) {
             if (type != BasicFileAttributeView.class) return null;

diff --git a/brachyura/src/main/java/io/github/coolcrabs/brachyura/memurl/MemoryUrlConnection.java b/brachyura/src/main/java/io/github/coolcrabs/brachyura/memurl/MemoryUrlConnection.java
@@ -13,6 +13,7 @@ protected MemoryUrlConnection(URL url) {
         super(url);
     }
 
+    @SuppressWarnings("resource")
     @Override
     public void connect() throws IOException {
         if (!connected) {

diff --git a/brachyura/src/main/java/io/github/coolcrabs/brachyura/project/java/SimpleJavaModule.java b/brachyura/src/main/java/io/github/coolcrabs/brachyura/project/java/SimpleJavaModule.java
@@ -18,8 +18,8 @@
 import io.github.coolcrabs.brachyura.util.Lazy;
 
 public abstract class SimpleJavaModule extends BuildModule {
-    public abstract Path[] getSrcDirs();
-    public abstract Path[] getResourceDirs();
+    public abstract @NotNull Path @NotNull[] getSrcDirs();
+    public abstract @NotNull Path @NotNull[] getResourceDirs();
 
     public final Lazy<@NotNull List<JavaJarDependency>> dependencies = new Lazy<>(this::createDependencies);
 

diff --git a/brachyura/src/main/java/io/github/coolcrabs/brachyura/project/java/SimpleJavaProject.java b/brachyura/src/main/java/io/github/coolcrabs/brachyura/project/java/SimpleJavaProject.java
@@ -66,13 +66,13 @@ public int getJavaVersion() {
 
         @NotNull
         @Override
-        public Path[] getSrcDirs() {
+        public Path @NotNull[] getSrcDirs() {
             return new @NotNull Path[]{getModuleRoot().resolve("src").resolve("main").resolve("java")};
         }
 
         @NotNull
         @Override
-        public Path[] getResourceDirs() {
+        public Path @NotNull[] getResourceDirs() {
             return new @NotNull Path[]{getProjectDir().resolve("src").resolve("main").resolve("resources")};
         }