diff --git a/build.gradle.kts b/build.gradle.kts index 3a0d42b..845622e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,8 @@ plugins { `java-library` `maven-publish` idea - id("com.github.ben-manes.versions") version "0.46.0" - id("org.ajoberstar.grgit") version "5.0.0" + id("com.github.ben-manes.versions") version "0.48.0" + id("org.ajoberstar.grgit") version "5.2.0" } group = "space.npstr.prometheus_extensions" @@ -33,14 +33,15 @@ repositories { } val prometheusVersion = "0.16.0" -val dsProxyVersion = "1.8.1" -val jdaVersion = "5.0.0-beta.9" +val dsProxyVersion = "1.9" +val jdaVersion = "5.0.0-beta.14" val troveVersion = "3.0.3" val fastutilVersion = "8.5.12" // see https://oss.sonatype.org/content/repositories/snapshots/com/discord4j/discord4j-core/ -val d4jCoreVersion = "3.2.4" -val jUnitVersion = "5.9.2" -val mockitoVersion = "5.2.0" +val d4jCoreVersion = "3.2.6" +val jUnitPlatformVersion = "1.10.0" +val jUnitVersion = "5.10.0" +val mockitoVersion = "5.5.0" val assertJVersion = "3.24.2" dependencies { @@ -55,6 +56,7 @@ dependencies { compileOnly("com.discord4j:discord4j-core:$d4jCoreVersion") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:$jUnitPlatformVersion") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jUnitVersion") testImplementation("org.junit.jupiter:junit-jupiter-api:$jUnitVersion") testImplementation("net.dv8tion:JDA:$jdaVersion") @@ -70,10 +72,10 @@ tasks.named("test") { } fun isNonStable(version: String): Boolean { - val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) } + val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) } val regex = "^[0-9,.v\\-_]+(-r)?$".toRegex() val isStable = stableKeyword || regex.matches(version) - val isUnstable = listOf("ALPHA", "BETA").any { version.toUpperCase().contains(it) } + val isUnstable = listOf("ALPHA", "BETA").any { version.uppercase().contains(it) } return isUnstable || isStable.not() } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a2efda8..6c7fa4d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..0adc8e1 100755 --- a/gradlew +++ b/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,10 +131,13 @@ 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. @@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in