Merge branch 'master' into fix/placeholder-rounding

Iridium-Development · Dec 27, 2024 · cee5f73 · cee5f73
2 parents 0669bed + fcd8f0b
commit cee5f73
Show file tree

Hide file tree

Showing 13 changed files with 245 additions and 204 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "automerge": true,
+  "autoApprove": true
+}
diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.commits[0].message, '[ci-skip]')"
     steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
@@ -26,7 +26,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload artifacts
-        uses: "actions/upload-artifact@v2.2.3"
+        uses: actions/upload-artifact@v4
         with:
           name: "IridiumSkyblock"
-          path: "build/libs/IridiumSkyblock-*.jar"
+          path: "build/libs/IridiumSkyblock-*.jar"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,10 +10,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4.2.2
+      - uses: gradle/wrapper-validation-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: temurin
           java-version: 17
@@ -25,7 +25,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload artifacts
-        uses: "actions/upload-artifact@v2.2.3"
+        uses: "actions/upload-artifact@v4.5.0"
         with:
           name: "IridiumSkyblock"
           path: "build/libs/IridiumSkyblock-*.jar"
@@ -35,12 +35,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"
@@ -55,12 +55,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"
@@ -117,12 +117,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Downloading artifact
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: thecodemonkey/action-get-gradle-version@master
         id: version
         with:
           file: "build.gradle.kts"
-      - uses: actions/download-artifact@v3.0.2
+      - uses: actions/download-artifact@v4.1.8
         with:
           name: "IridiumSkyblock"
           path: "./"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.8"
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
 }
 
@@ -22,21 +22,21 @@ repositories {
 
 dependencies {
     // Dependencies that we want to shade in
-    implementation("org.jetbrains:annotations:24.1.0")
+    implementation("org.jetbrains:annotations:26.0.1")
     implementation("com.j256.ormlite:ormlite-core:6.1")
     implementation("com.j256.ormlite:ormlite-jdbc:6.1")
-    implementation("com.iridium:IridiumTeams:2.5.8")
+    implementation("com.iridium:IridiumTeams:2.5.9.5")
     implementation("commons-lang:commons-lang:2.6")
 
     // Other dependencies that are not required or already available at runtime
-    compileOnly("org.projectlombok:lombok:1.18.34")
-    compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
+    compileOnly("org.projectlombok:lombok:1.18.36")
+    compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
     compileOnly("net.ess3:EssentialsXSpawn:2.16.1")
     compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.13-SNAPSHOT")
 
     // Enable lombok annotation processing
-    annotationProcessor("org.projectlombok:lombok:1.18.34")
+    annotationProcessor("org.projectlombok:lombok:1.18.36")
 }
 
 bukkit {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists