From be8e15e087217771080f7f7ffe691a642758f293 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Tue, 8 Oct 2024 17:15:38 +0200 Subject: [PATCH 1/9] Update gradle to 8.10.2 --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 582929bbe..7198a875d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ ext["versionNoHash"] = "$fullVersion${getVersionMeta(false)}" tasks { wrapper { - gradleVersion = "8.10" + gradleVersion = "8.10.2" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 66cd5a0e4..79eb9d003 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-8.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 100d02904e4ebe13eb6e0c08c13dcbb17d1fc2df Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Tue, 8 Oct 2024 17:15:45 +0200 Subject: [PATCH 2/9] Update shadow --- buildSrc/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/libs.versions.toml b/buildSrc/libs.versions.toml index ba8080913..f71ba5b86 100644 --- a/buildSrc/libs.versions.toml +++ b/buildSrc/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -shadow = "8.3.0" +shadow = "8.3.3" jetbrains-annotations = "23.0.0" via-nbt = "4.1.0" fast-util = "8.5.6" From 1881336a140abee25f5b7efa0284cd0d588120e6 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Tue, 8 Oct 2024 17:15:51 +0200 Subject: [PATCH 3/9] Update runTask --- libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs.versions.toml b/libs.versions.toml index e89fe8e69..85cd76ee6 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -8,7 +8,7 @@ protocol-support = "3d24efeda6" paper = "1.20.6-R0.1-SNAPSHOT" bungeecord = "1.21-R0.1-SNAPSHOT" velocity = "3.1.0" -run-paper = "2.3.0" +run-paper = "2.3.1" [libraries] adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" } From adbaa5cfbc7d2d6363fdf40fd78e0101aaa93764 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Tue, 8 Oct 2024 17:30:40 +0200 Subject: [PATCH 4/9] Update test libraries --- testlibs.versions.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testlibs.versions.toml b/testlibs.versions.toml index c4eb0565e..eafb5cc1c 100644 --- a/testlibs.versions.toml +++ b/testlibs.versions.toml @@ -1,13 +1,14 @@ [versions] -mockbukkit = "3.9.0" -slf4j = "2.0.7" -junit = "5.10.0" +mockbukkit = "3.131.0" +slf4j = "2.0.16" +junit = "5.11.2" [libraries] -mockbukkit = { group = "com.github.seeseemelk", name = "MockBukkit-v1.20", version.ref = "mockbukkit" } +mockbukkit = { group = "com.github.seeseemelk", name = "MockBukkit-v1.21", version.ref = "mockbukkit" } slf4j = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" } junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" } +junit-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" } [bundles] -junit = [ "junit-api", "junit-engine" ] \ No newline at end of file +junit = [ "junit-api", "junit-engine", "junit-launcher" ] \ No newline at end of file From 13fa3504bf2cce0b66ba48bd1d606b9147f70e14 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Tue, 8 Oct 2024 17:41:09 +0200 Subject: [PATCH 5/9] Remove unused and deprecated import --- .../src/main/kotlin/packetevents.library-conventions.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts index 684a4aef3..ad0e6178f 100644 --- a/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts @@ -1,4 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.ShadowExtension import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import groovy.util.Node From 76ea2aa665e311fca16311b82fa8141d10d7884b Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Fri, 25 Oct 2024 19:40:45 +0200 Subject: [PATCH 6/9] Update loom --- libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs.versions.toml b/libs.versions.toml index 85cd76ee6..4c3e6b1c0 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -35,4 +35,4 @@ adventure-serializers = [ "adventure-text-serializer-gson", "adventure-text-seri [plugins] run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" } run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" } -fabric-loom = { id = "fabric-loom", version = "1.7.2" } +fabric-loom = { id = "fabric-loom", version = "1.8.1" } From 72c337a68c52ce13bbf45c15366cd16ec3e631e3 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Fri, 25 Oct 2024 19:51:21 +0200 Subject: [PATCH 7/9] Update SpongeGradle --- sponge/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts index 6d0bfa9c5..f5d54a75d 100644 --- a/sponge/build.gradle.kts +++ b/sponge/build.gradle.kts @@ -4,7 +4,7 @@ import org.spongepowered.plugin.metadata.model.PluginDependency plugins { packetevents.`shadow-conventions` packetevents.`library-conventions` - id("org.spongepowered.gradle.plugin") version("2.0.2") + id("org.spongepowered.gradle.plugin") version("2.2.0") } repositories { From dc6db3cfaa5a8e98858349e3d449ba36eede0dda Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Fri, 25 Oct 2024 19:53:14 +0200 Subject: [PATCH 8/9] Revert "Update SpongeGradle" This reverts commit 72c337a68c52ce13bbf45c15366cd16ec3e631e3. --- sponge/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts index f5d54a75d..6d0bfa9c5 100644 --- a/sponge/build.gradle.kts +++ b/sponge/build.gradle.kts @@ -4,7 +4,7 @@ import org.spongepowered.plugin.metadata.model.PluginDependency plugins { packetevents.`shadow-conventions` packetevents.`library-conventions` - id("org.spongepowered.gradle.plugin") version("2.2.0") + id("org.spongepowered.gradle.plugin") version("2.0.2") } repositories { From 6997bb46156901fee48f415ccd2239f9d1dd8f63 Mon Sep 17 00:00:00 2001 From: rafi67000 Date: Fri, 25 Oct 2024 19:55:17 +0200 Subject: [PATCH 9/9] Revert "Update loom" This reverts commit 76ea2aa665e311fca16311b82fa8141d10d7884b. --- libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs.versions.toml b/libs.versions.toml index 4c3e6b1c0..85cd76ee6 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -35,4 +35,4 @@ adventure-serializers = [ "adventure-text-serializer-gson", "adventure-text-seri [plugins] run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" } run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" } -fabric-loom = { id = "fabric-loom", version = "1.8.1" } +fabric-loom = { id = "fabric-loom", version = "1.7.2" }