chore: be explicit for each class file, and preserve transitive JBA dependency

Author: zml2008

build.gradle

@@ -17,6 +17,7 @@ indraSonatype {
 }
 
 dependencies {
+  compileOnlyApi libs.jetbrainsAnnotations // keep to avoid breaking builds, will be removed for 2.0
   compileOnlyApi libs.jspecify
   implementation gradleApi()
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [metadata]
-version = "1.0"
+format = { version = "1.1" }
 
 [versions]
 checkstyle = "10.18.2"
@@ -9,6 +9,7 @@ stylecheck = "0.2.1"
 errorprone = "2.30.0"
 
 [libraries]
+jetbrainsAnnotations = { module = "org.jetbrains:annotations", version = "25.0.0" }
 jspecify = { module = "org.jspecify:jspecify", version = "1.0.0" }
 
 # test

mammoth-test/src/main/java/net/kyori/mammoth/test/GradleFunctionalTestExtension.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2024 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 import org.gradle.util.GradleVersion;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -47,6 +48,7 @@
 /**
  * An extension that can be applied to test methods to provide test template invocation context.
  */
+@NullMarked
 class GradleFunctionalTestExtension implements TestTemplateInvocationContextProvider {
   private static final int CURRENT_JVM;
 

mammoth-test/src/main/java/net/kyori/mammoth/test/TemplateInvocationExtensions.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2022 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,13 +29,15 @@
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
 
 // Template-specific context information
+@NullMarked
 class TemplateInvocationExtensions implements AfterEachCallback, ParameterResolver {
   private final TestContext context;
 

mammoth-test/src/main/java/net/kyori/mammoth/test/TestContext.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2024 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,7 @@
 import java.util.regex.Pattern;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
+import org.jspecify.annotations.NullMarked;
 import org.junit.jupiter.api.Assertions;
 
 import static java.util.Objects.requireNonNull;
@@ -48,6 +49,7 @@
  *
  * @since 1.1.0
  */
+@NullMarked
 public final class TestContext {
   private static final Pattern LINE_ENDING = Pattern.compile("\r\n");
 

mammoth-test/src/main/java/net/kyori/mammoth/test/package-info.java

@@ -28,7 +28,4 @@
  * annotating methods that have a parameter of either type {@link net.kyori.mammoth.test.TestContext}
  * or {@link org.gradle.testkit.runner.GradleRunner}.</p>
  */
-@NullMarked
 package net.kyori.mammoth.test;
-
-import org.jspecify.annotations.NullMarked;

src/main/java/net/kyori/mammoth/Configurable.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2024 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 package net.kyori.mammoth;
 
 import org.gradle.api.Action;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import static java.util.Objects.requireNonNull;
@@ -33,6 +34,7 @@
  *
  * @since 1.0.0
  */
+@NullMarked
 public final class Configurable {
   private Configurable() {
   }

src/main/java/net/kyori/mammoth/Extensions.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2022 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +24,14 @@
 package net.kyori.mammoth;
 
 import org.gradle.api.plugins.ExtensionContainer;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Helpers for working with extensions.
  *
  * @since 1.0.0
  */
+@NullMarked
 public final class Extensions {
   private Extensions() {
   }

src/main/java/net/kyori/mammoth/GradleCompat.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2021-2024 KyoriPowered
+ * Copyright (c) 2021-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,8 +28,10 @@
 import org.gradle.api.Project;
 import org.gradle.api.provider.Provider;
 import org.gradle.util.GradleVersion;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+@NullMarked
 final class GradleCompat {
   static final boolean SHOULD_USE_CONVENTION = hasMethod(Project.class, "getConvention") && !hasMinGradleVersion("8.2");
   static final boolean HAS_FOR_USE_AT_CONFIGURATION_TIME = hasMethod(Provider.class, "forUseAtConfigurationTime") && !hasMinGradleVersion("7.6");

src/main/java/net/kyori/mammoth/IsolatingClassLoader.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of mammoth, licensed under the MIT License.
  *
- * Copyright (c) 2024 KyoriPowered
+ * Copyright (c) 2024-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@
 import java.util.Iterator;
 import java.util.Set;
 import org.gradle.api.file.FileCollection;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -41,6 +42,7 @@
  *
  * @since 1.4.0
  */
+@NullMarked
 public final class IsolatingClassLoader {
   private IsolatingClassLoader() {
   }