diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
index 80d519f63..0f337f5fe 100644
--- a/.checkstyle/checkstyle.xml
+++ b/.checkstyle/checkstyle.xml
@@ -42,7 +42,7 @@
-
+
@@ -245,9 +245,6 @@
-
-
-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d1c36c3f..5c2cad4d8 100644
--- a/.github/workflows/build.yml
+++ b/.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/
diff --git a/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java b/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
index f574fbe3a..f0e93b3eb 100644
--- a/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
+++ b/api/src/main/java/net/kyori/adventure/bossbar/BossBar.java
@@ -68,8 +68,8 @@ 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
@@ -77,8 +77,8 @@ public interface BossBar extends Examinable {
/**
* 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 {
*
The progress is a value between 0 and 1.
*
* @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
diff --git a/api/src/main/java/net/kyori/adventure/text/Component.java b/api/src/main/java/net/kyori/adventure/text/Component.java
index 72dd19917..4d4c777c1 100644
--- a/api/src/main/java/net/kyori/adventure/text/Component.java
+++ b/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
diff --git a/api/src/main/java/net/kyori/adventure/util/ShadyPines.java b/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
index 16b8a9c7b..a2030a2f5 100644
--- a/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
+++ b/api/src/main/java/net/kyori/adventure/util/ShadyPines.java
@@ -43,8 +43,8 @@ private ShadyPines() {
* @param constants the enum constants
* @param 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
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 8c54bde8f..acdd5abb1 100644
--- a/build-logic/build.gradle.kts
+++ b/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
}
diff --git a/build-logic/src/main/kotlin/CopyJavadoc.kt b/build-logic/src/main/kotlin/CopyJavadoc.kt
deleted file mode 100644
index 5bde5f90d..000000000
--- a/build-logic/src/main/kotlin/CopyJavadoc.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This file is part of adventure, licensed under the MIT License.
- *
- * Copyright (c) 2017-2021 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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.FileSystemOperations
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.options.Option
-import javax.inject.Inject
-
-internal const val ADVENTURE_PREFIX = "adventure-"
-
-/**
- * Copy project javadoc into the `adventure-javadoc` directory tree
- */
-abstract class CopyJavadoc : DefaultTask() {
- @get:Input
- abstract val projectName: Property
-
- @get:Input
- abstract val projectVersion: Property
-
- @get:InputFiles
- abstract val javadocFiles: ConfigurableFileCollection
-
- @get:Internal
- abstract val rootDir: DirectoryProperty
-
- @get:Internal
- @get:Option(option="output", description="The root of the adventure-javadocs repository")
- abstract val output: Property
-
- @get:OutputDirectory
- abstract val outputDir: DirectoryProperty
-
- @get:Inject
- protected abstract val fsOps: FileSystemOperations
-
- init {
- // relative to project root,