update gradle, update depends

ProxioDev · Dec 22, 2024 · ef2d090 · ef2d090
1 parent 1788806
commit ef2d090
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/proxies/velocity/build.gradle.kts b/proxies/velocity/build.gradle.kts
@@ -39,7 +39,6 @@ tasks {
         relocate("com.squareup.okhttp", "com.imaginarycode.minecraft.redisbungee.internal.okhttp")
         relocate("okio", "com.imaginarycode.minecraft.redisbungee.internal.okio")
         relocate("org.json", "com.imaginarycode.minecraft.redisbungee.internal.json")
-        relocate("com.github.benmanes.caffeine", "com.imaginarycode.minecraft.redisbungee.internal.caffeine")
         // acf shade
         relocate("co.aikar.commands", "com.imaginarycode.minecraft.redisbungee.internal.acf.commands")
     }

diff --git a/proxies/velocity/velocity-api/build.gradle.kts b/proxies/velocity/velocity-api/build.gradle.kts
@@ -5,10 +5,11 @@ plugins {
 
 dependencies {
     api(project(":RedisBungee-API")) {
-        // Since velocity already includes guava / configurate exlude them
+        // Since velocity already includes guava / configurate / guava exlude them
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")
         exclude("org.spongepowered", "configurate-yaml")
+        exclude("com.github.ben-manes.caffeine", "caffeine")
         // exclude also adventure api
         exclude("net.kyori", "adventure-api")
         exclude("net.kyori", "adventure-text-serializer-gson")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -42,22 +42,22 @@ dependencyResolutionManagement {
             name = "sonatype"
             url = uri("https://oss.sonatype.org/content/repositories/snapshots")
         }
+
         maven {
-            name = "aikar repo"
-            url = uri("https://repo.aikar.co/content/groups/aikar/")
+            url = uri("https://jitpack.io")
         }
 
     }
     versionCatalogs {
-        val jedisVersion = "5.1.2"
+        val jedisVersion = "5.2.0"
         val configurateVersion = "3.7.3"
         val guavaVersion = "31.1-jre"
         val okHttpVersion = "2.7.5"
         val caffeineVersion = "3.1.8"
-        val adventureVersion = "4.16.0"
-        val acf = "0.5.1-SNAPSHOT"
+        val adventureVersion = "4.17.0"
+        val acf = "e2005dd62d" // use our own fork 'same upstream with jitpack file only'
         val bungeecordApiVersion = "1.21-R0.1-SNAPSHOT"
-        val velocityVersion = "3.3.0-SNAPSHOT";
+        val velocityVersion = "3.4.0-SNAPSHOT";
 
 
         create("libs") {
@@ -74,9 +74,9 @@ dependencyResolutionManagement {
             library("adventure-plain", "net.kyori:adventure-text-serializer-plain:$adventureVersion")
             library("adventure-miniMessage", "net.kyori:adventure-text-minimessage:$adventureVersion")
 
-            library("acf-core", "co.aikar:acf-core:$acf")
-            library("acf-bungeecord", "co.aikar:acf-bungee:$acf")
-            library("acf-velocity", "co.aikar:acf-velocity:$acf")
+            library("acf-core", "com.github.ProxioDev.commands:acf-core:$acf")
+            library("acf-bungeecord", "com.github.ProxioDev.commands:acf-bungee:$acf")
+            library("acf-velocity", "com.github.ProxioDev.commands:acf-velocity:$acf")
 
             library("platform-bungeecord","net.md-5:bungeecord-api:$bungeecordApiVersion")
             library("adventure-platforms-bungeecord", "net.kyori:adventure-platform-bungeecord:4.3.2")