From f227a31ee75038a4cd801352038475486541683e Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Fri, 19 Jun 2026 20:27:30 +0200 Subject: [PATCH] Fix build for Adventure 5 and bump dependencies The Adventure 5 upgrade removed Audience#sendMessage(Identity, Component, MessageType), which broke multification-core test compilation. Override the remaining sendMessage(Component) overload in AudienceMock instead. Apply the pending Renovate dependency bumps: - Adventure API 5.0.1 -> 5.1.1 (#137) - JUnit 6.0.3 -> 6.1.0 (#138) - Gradle wrapper 9.5.0 -> 9.6.0 (#140) - actions/checkout v6 -> v7 (#139) - gradle/actions/setup-gradle v5 -> v6 (#132) Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01ErZ6cWq2LVW35c7JA8S13C --- .github/workflows/gradle.yml | 4 ++-- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../test/com/eternalcode/multification/AudienceMock.java | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c29d98e..c5f253a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up JDK 21 uses: actions/setup-java@v5 @@ -21,7 +21,7 @@ jobs: java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 + uses: gradle/actions/setup-gradle@v6 - name: Make gradlew executable run: chmod +x gradlew diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6e49cf8..5441624 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,11 +1,11 @@ object Versions { const val ADVENTURE_PLATFORM_BUKKIT = "4.4.1" - const val ADVENTURE_API = "5.0.1" + const val ADVENTURE_API = "5.1.1" const val CDN = "1.14.9" const val MOCKITO_CORE = "5.23.0" - const val JUNIT_JUPITER = "6.0.3" + const val JUNIT_JUPITER = "6.1.0" const val ASSERTJ_CORE = "3.27.7" const val AWAITILITY = "4.3.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b52fb7e..eb84db6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/multification-core/test/com/eternalcode/multification/AudienceMock.java b/multification-core/test/com/eternalcode/multification/AudienceMock.java index 539d084..f09cbf0 100644 --- a/multification-core/test/com/eternalcode/multification/AudienceMock.java +++ b/multification-core/test/com/eternalcode/multification/AudienceMock.java @@ -8,8 +8,6 @@ import java.util.Map; import java.util.UUID; import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.audience.MessageType; -import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; @@ -24,7 +22,7 @@ public AudienceMock(UUID uuid) { } @Override - public void sendMessage(final @NotNull Identity source, final @NotNull Component message, final @NotNull MessageType type) { + public void sendMessage(final @NotNull Component message) { MESSAGES.computeIfAbsent(uuid, key -> new ArrayList<>()).add(ComponentUtil.componentToText(message)); }