diff --git a/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts index cca8484a..6815887a 100644 --- a/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts @@ -1,3 +1,5 @@ +import de.skuzzle.restrictimports.gradle.RestrictImports + plugins { `java-library` id("com.diffplug.spotless") @@ -81,13 +83,20 @@ spotless { } } -restrictImports { - group { +tasks { + // Bypass inability to have two groups with same base packages inside the import restriction plugin + val restrictJavaxAnnotations = register("restrictJavaxAnnotations") { + group = "verification" reason = "Use org.jspecify.annotations to add annotations, or org.jetbrains.annotations if needed" bannedImports = listOf("javax.annotation.**") } - group { + val restrictAsserts = register("restrictAsserts") { + group = "verification" reason = "Use tc.oc.pgm.util.Assert to add assertions" bannedImports = listOf("com.google.common.base.Preconditions.**", "java.util.Objects.requireNonNull") } -} + // Enforce the import restrictions + check { + dependsOn(restrictJavaxAnnotations, restrictAsserts) + } +} \ No newline at end of file diff --git a/core/src/main/java/dev/pgm/community/events/PlayerPardonEvent.java b/core/src/main/java/dev/pgm/community/events/PlayerPardonEvent.java index 3602a2c7..dbab31e1 100644 --- a/core/src/main/java/dev/pgm/community/events/PlayerPardonEvent.java +++ b/core/src/main/java/dev/pgm/community/events/PlayerPardonEvent.java @@ -3,7 +3,7 @@ import dev.pgm.community.moderation.punishments.PunishmentType; import dev.pgm.community.utils.CommandAudience; import java.util.UUID; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** PlayerPardonEvent - Called when a punishment is pardoned */ public class PlayerPardonEvent extends CommunityEvent {