Merge branch 'api-8' into api-9

Author: zml2008

.checkstyle/checkstyle.xml

@@ -271,6 +271,8 @@
         <module name="CustomImportOrder">
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
+            <property name="standardPackageRegExp" value="^java\."/>
+            <property name="specialImportsRegExp" value="^javax\."/>
             <!-- Sponge - Custom import order -->
             <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
             <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 150
+tab_width = 4
+
+[*.java]
+ij_java_imports_layout = $*,|,*,|,java.**,|,javax.**
+ij_java_insert_inner_class_imports = false
+ij_java_layout_static_imports_separately = true

.github/workflows/check-license.yaml .github/workflows/check-spotless.yaml.github/workflows/check-license.yaml renamed to .github/workflows/check-spotless.yaml

@@ -1,4 +1,4 @@
-name: License Check
+name: Spotless Check
 
 on:
   push:
@@ -8,5 +8,5 @@ on:
 
 jobs:
   call-check:
-    uses: SpongePowered/.github/.github/workflows/shared-check-license.yaml@master
+    uses: SpongePowered/.github/.github/workflows/shared-check-spotless.yaml@master
     secrets: inherit

build.gradle.kts

@@ -252,9 +252,12 @@ spongeConvention {
 }
 
 indra {
+    val checkstyleVersion: String by project
+
     javaVersions {
         target(17)
     }
+    checkstyle(checkstyleVersion)
 
     configurePublications {
         artifactId = project.name.toLowerCase()
@@ -267,6 +270,25 @@ indra {
 
 indraCrossdoc {
     baseUrl(providers.gradleProperty("javadocPublishRoot"))
+    nameBasedDocumentationUrlProvider {
+        lowercaseProjectName.set(true)
+    }
+}
+
+spotless {
+    java {
+        endWithNewline()
+        indentWithSpaces(4)
+        trimTrailingWhitespace()
+        toggleOffOn("@formatter:off", "@formatter:on")
+        formatAnnotations()
+        importOrderFile(rootProject.file("extra/eclipse/sponge_eclipse.importorder"))
+    }
+    kotlinGradle {
+        endWithNewline()
+        indentWithSpaces(4)
+        trimTrailingWhitespace()
+    }
 }
 
 val sortClasses = listOf(
@@ -395,4 +417,4 @@ val sortClasses = listOf(
         "org.spongepowered.api.world.schematic.PaletteTypes",
         "org.spongepowered.api.world.teleport.TeleportHelperFilters",
         "org.spongepowered.api.world.weather.WeatherTypes"
-)
+)

gradle.properties

@@ -8,14 +8,16 @@ javadocPublishRoot=https://jd.spongepowered.org/
 
 org.gradle.parallel=true
 
-adventureVersion=4.10.0
-caffeineVersion=3.0.5
+adventureVersion=4.11.0
+caffeineVersion=3.1.1
+checkstyleVersion=10.3.4
 configurateVersion=4.1.2
-errorproneVersion=2.10.0
+errorproneVersion=2.16
 gsonVersion=2.8.9
 guavaVersion=31.0.1-jre
-junitVersion=5.8.2
+junitVersion=5.9.1
 log4jVersion=2.17.0
+
 mathVersion=2.0.1
-mockitoVersion=4.0.0
+mockitoVersion=4.8.0
 pluginSpiVersion=0.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -7,11 +7,11 @@ pluginManagement {
         }
     }
     plugins {
-        val indraVersion = "2.1.1"
+        val indraVersion = "3.0.1"
         id("org.spongepowered.gradle.event-impl-gen") version "7.0.0"
-        id("org.spongepowered.gradle.sponge.dev") version "2.0.2"
-        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.5"
-        id("net.ltgt.errorprone") version "2.0.2"
+        id("org.spongepowered.gradle.sponge.dev") version "2.1.1"
+        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.6"
+        id("net.ltgt.errorprone") version "3.0.1"
         id("net.kyori.indra.publishing") version indraVersion
         id("net.kyori.indra.publishing.sonatype") version indraVersion
         id("net.kyori.indra.checkstyle") version indraVersion
@@ -21,4 +21,4 @@ pluginManagement {
 
 if (JavaVersion.current() < JavaVersion.VERSION_11) {
     throw GradleException("SpongeAPI requires at least Java 11 to build, but you have ${JavaVersion.current()}.")
-} 
+}

src/ap/java/org/spongepowered/plugin/processor/ListenerParameterAnnotation.java

@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;

src/ap/java/org/spongepowered/plugin/processor/ListenerProcessor.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;

src/ap/java/org/spongepowered/plugin/processor/ParameterContext.java

@@ -28,6 +28,7 @@
 
 import java.util.Objects;
 import java.util.Optional;
+
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;