chore: Update dependencies

gradle/libs.versions.toml

@@ -6,30 +6,29 @@ version = "1.0"
 kotlin-core = "1.9.10"
 kotlin-coroutine = "1.7.3"
 kotlin-runtime = "3.1.0"
-kotlinx-serialization = "1.6.0"
+kotlinx-serialization = "1.6.1"
 java = "17"
 mindustry = "146"
 
 # libraries
 distributor = "3.2.1"
-junit = "5.9.0"
-testcontainers = "1.18.3"
+junit = "5.10.1"
+testcontainers = "1.19.3"
+# Can't update guava because of gradle metadata skill issue, very anoying
 guava = "32.0.1-jre"
 gson = "2.10.1"
-hoplite = "2.7.4"
-deepl = "1.3.0"
+hoplite = "2.7.5"
+deepl = "1.4.0"
 slf4j = "2.0.7"
 discord4j = "3.2.4"
-password4j = "1.7.1"
-rabbitmq-client = "5.17.0"
-jsoup = "1.16.1"
+password4j = "1.7.3"
+rabbitmq-client = "5.20.0"
+jsoup = "1.16.2"
 javacord = "3.8.0"
-log4j-to-slf4j = "2.20.0"
+log4j-to-slf4j = "2.22.0"
 snowflake-id = "0.0.2"
-okhttp = "4.11.0"
-# Fixes CVE in okhttp
-okio = "3.6.0"
-classgraph = "4.8.162"
+okhttp = "4.12.0"
+classgraph = "4.8.165"
 logback = "1.4.11"
 hikari = "5.1.0"
 exposed = "0.44.1"
@@ -72,7 +71,6 @@ javacord-core = { module = "org.javacord:javacord-core", version.ref = "javacord
 log4j-to-slf4j = { module = "org.apache.logging.log4j:log4j-to-slf4j", version.ref = "log4j-to-slf4j" }
 snowflake-id = { module = "de.mkammerer.snowflake-id:snowflake-id", version.ref = "snowflake-id" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

imperium-build-logic/src/main/kotlin/imperium.parent-conventions.gradle.kts

@@ -9,3 +9,18 @@ tasks.register("incrementVersionFile") {
 tasks.register("printVersion") {
     doLast { println(project.version.toString()) }
 }
+
+// https://github.com/ben-manes/gradle-versions-plugin
+fun isNonStable(version: String): Boolean {
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
+    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+    val isStable = stableKeyword || regex.matches(version)
+    return isStable.not()
+}
+
+tasks.dependencyUpdates {
+    // https://github.com/ben-manes/gradle-versions-plugin
+    rejectVersionIf {
+        isNonStable(candidate.version) && !isNonStable(currentVersion)
+    }
+}

imperium-common/build.gradle.kts

@@ -8,32 +8,28 @@ dependencies {
     api(libs.gson)
     api(libs.hoplite.core)
     api(libs.hoplite.yaml)
-    api(libs.deepl) {
-        exclude("org.apache.commons", "commons-math3")
-    }
-    api(libs.slf4j.api)
+    api(libs.deepl)
     api(libs.password4j)
     api(libs.rabbitmq.client)
     api(libs.snowflake.id)
     api(libs.okhttp)
-    runtimeOnly(libs.okio) // Fixes CVE in okhttp
+
+    api(libs.slf4j.api)
+    testApi(libs.slf4j.simple)
 
     api(libs.kotlinx.coroutines.core)
     api(libs.kotlinx.coroutines.jdk8)
+    testApi(libs.kotlinx.coroutines.test)
     api(libs.kotlinx.serialization.json)
 
-    testApi(libs.slf4j.simple)
-    testApi(libs.kotlinx.coroutines.test)
-    testApi(libs.kotlinx.serialization.json)
     testApi(libs.classgraph)
 
     api(libs.exposed.core)
     api(libs.exposed.jdbc)
     api(libs.exposed.java.time)
     api(libs.exposed.json)
     api(libs.hikari)
-
+    runtimeOnly(libs.mariadb)
     runtimeOnly(libs.sqlite)
     testRuntimeOnly(libs.sqlite)
-    runtimeOnly(libs.mariadb)
 }