Merge pull request #670 from KyoriPowered/feature/indra-update

.checkstyle/checkstyle.xml

@@ -42,7 +42,7 @@
     <!-- https://checkstyle.org/config_javadoc.html#AtclauseOrder -->
     <module name="AtclauseOrder">
       <property name="violateExecutionOnNonTightHtml" value="true"/>
-      <property name="tagOrder" value="@author, @deprecated, @exception, @param, @return, @serial, @serialData, @serialField, @throws, @see, @since, @sinceMinecraft, @version"/>
+      <property name="tagOrder" value="@author, @exception, @param, @return, @serial, @serialData, @serialField, @throws, @see, @since, @sinceMinecraft, @version, @deprecated"/>
     </module>
 
     <!-- https://checkstyle.org/config_imports.html#AvoidStarImport -->
@@ -245,9 +245,6 @@
     <!-- https://checkstyle.org/config_whitespace.html#TypecastParenPad -->
     <module name="TypecastParenPad"/>
 
-    <!-- https://checkstyle.org/config_coding.html#UnnecessaryParentheses -->
-    <module name="UnnecessaryParentheses"/>
-
     <!-- https://checkstyle.org/config_imports.html#UnusedImports -->
     <module name="UnusedImports"/>
 

.github/workflows/build.yml

@@ -1,6 +1,17 @@
 name: "build"
 
-on: ["pull_request", "push"]
+on:
+  push:
+    branches: "**"
+    tags-ignore: ["**"]
+  pull_request:
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.event.number || github.ref }}"
+  cancel-in-progress: true
+
+env:
+  RUNTIME_VERSION: 11
 
 jobs:
   build:
@@ -13,17 +24,21 @@ jobs:
     steps:
       - name: "checkout repository"
         uses: "actions/checkout@v2"
-      - name: "setup jdk 11"
-        uses: "actions/setup-java@v1"
+      - name: "setup jdk ${{ env.RUNTIME_VERSION }}"
+        uses: "actions/setup-java@v2"
+        with:
+          distribution: "temurin"
+          java-version: "${{ env.RUNTIME_VERSION }}"
+      - name: "run gradle build"
+        uses: "gradle/gradle-build-action@v2"
         with:
-          java-version: "11"
-      - name: "build"
-        run: "./gradlew build"
+          cache-read-only: "${{ !startsWith(github.ref, 'refs/heads/master') || github.event_name == 'pull_request' }}"
+          arguments: "build"
       - name: "Archive test results"
         if: "${{ always() }}"
         uses: "actions/upload-artifact@v2"
         with:
-          name: "test-results"
+          name: "${{ runner.os }}-test-results"
           path: |
             build/reports/
             */build/reports/

api/src/main/java/net/kyori/adventure/bossbar/BossBar.java

@@ -68,17 +68,17 @@ public interface BossBar extends Examinable {
   /**
    * The minimum value the progress can be.
    *
-   * @deprecated for removal since 4.2.0, use {@link #MIN_PROGRESS}
    * @since 4.0.0
+   * @deprecated for removal since 4.2.0, use {@link #MIN_PROGRESS}
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
   float MIN_PERCENT = MIN_PROGRESS;
   /**
    * The maximum value the progress can be.
    *
-   * @deprecated for removal since 4.2.0, use {@link #MAX_PROGRESS}
    * @since 4.0.0
+   * @deprecated for removal since 4.2.0, use {@link #MAX_PROGRESS}
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
@@ -209,8 +209,8 @@ public interface BossBar extends Examinable {
    * <p>The progress is a value between 0 and 1.</p>
    *
    * @return the progress
-   * @deprecated for removal since 4.2.0, use {@link #progress()}
    * @since 4.0.0
+   * @deprecated for removal since 4.2.0, use {@link #progress()}
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated
@@ -226,8 +226,8 @@ default float percent() {
    * @param progress the progress
    * @return the bossbar
    * @throws IllegalArgumentException if progress is less than 0 or greater than 1
-   * @deprecated for removal since 4.2.0, use {@link #progress(float)}
    * @since 4.0.0
+   * @deprecated for removal since 4.2.0, use {@link #progress(float)}
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Contract("_ -> this")
@@ -415,8 +415,8 @@ default void bossBarProgressChanged(final @NotNull BossBar bar, final float oldP
      * @param bar the bossbar
      * @param oldProgress the old progress
      * @param newProgress the new progress
-     * @deprecated for removal since 4.2.0, use {@link #bossBarProgressChanged(BossBar, float, float)}
      * @since 4.0.0
+     * @deprecated for removal since 4.2.0, use {@link #bossBarProgressChanged(BossBar, float, float)}
      */
     @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
     @Deprecated

api/src/main/java/net/kyori/adventure/text/Component.java

@@ -1681,8 +1681,8 @@ default boolean contains(final @NotNull Component that, final @NotNull BiPredica
    * Prevents a cycle between this component and the provided component.
    *
    * @param that the other component
-   * @deprecated for removal since 4.7.0, with no replacement - this method is not necessary due to the fact {@code Component}s are immutable
    * @since 4.0.0
+   * @deprecated for removal since 4.7.0, with no replacement - this method is not necessary due to the fact {@code Component}s are immutable
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated

api/src/main/java/net/kyori/adventure/util/ShadyPines.java

@@ -43,8 +43,8 @@ private ShadyPines() {
    * @param constants the enum constants
    * @param <E> the enum type
    * @return the set
-   * @deprecated for removal since 4.8.0, use {@link MonkeyBars#enumSet(Class, Enum[])}
    * @since 4.0.0
+   * @deprecated for removal since 4.8.0, use {@link MonkeyBars#enumSet(Class, Enum[])}
    */
   @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
   @Deprecated

build-logic/build.gradle.kts

@@ -14,10 +14,16 @@ repositories {
 }
 
 dependencies {
-  val indraVersion = "2.0.6"
+  val indraVersion = "2.1.0"
   implementation("net.kyori", "indra-common", indraVersion)
   implementation("net.kyori", "indra-publishing-sonatype", indraVersion)
+  implementation("net.kyori", "indra-crossdoc", indraVersion)
   implementation("com.adarshr", "gradle-test-logger-plugin", "3.1.0")
   implementation("me.champeau.jmh", "jmh-gradle-plugin", "0.6.6")
-  implementation("com.diffplug.gradle", "goomph", "3.34.0")
+  implementation("com.diffplug.gradle", "goomph", "3.35.0")
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }

build-logic/src/main/kotlin/adventure.base-conventions.gradle.kts

@@ -4,8 +4,9 @@ plugins {
 
 indra {
   javaVersions {
-    testWith(8, 11, 16)
+    testWith(8, 11, 17)
   }
+  checkstyle("9.3")
 
   github("KyoriPowered", "adventure") {
     ci(true)