diff --git a/build.gradle b/build.gradle index 267ebcb..ddb2463 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'com.cadiducho' -version = '3.5' +version = '3.5-pre' sourceCompatibility = JavaVersion.VERSION_17; mainClassName = 'com.cadiducho.bot.CadiBotServer' @@ -18,27 +18,27 @@ repositories { } dependencies { - implementation group: 'com.cadiducho', name: 'Zincite', version: '1.7' - implementation group: 'com.cadiducho', name: 'Zincite-JsonModule', version: '1.7' - implementation group: 'com.cadiducho', name: 'Zincite-MessageIDModule', version: '1.5' + implementation group: 'com.cadiducho', name: 'Zincite', version: '1.8' + implementation group: 'com.cadiducho', name: 'Zincite-JsonModule', version: '1.8' + implementation group: 'com.cadiducho', name: 'Zincite-MessageIDModule', version: '1.8' implementation group: 'com.vdurmont', name: 'emoji-java', version: '5.1.1' implementation group: 'commons-cli', name: 'commons-cli', version: '1.5.0' - implementation group: 'com.squareup.moshi', name: 'moshi', version: '1.13.0' - implementation group: 'com.squareup.moshi', name: 'moshi-adapters', version: '1.13.0' - implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.10.0' - implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '3.3.0' - implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1' // Database - implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.0.0' // Database migrations - implementation group: 'org.flywaydb', name: 'flyway-mysql', version: '10.0.0' // Database migrations + implementation group: 'com.squareup.moshi', name: 'moshi', version: '1.15.0' + implementation group: 'com.squareup.moshi', name: 'moshi-adapters', version: '1.15.0' + implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0' + implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.6' + implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.1.0' // Database + implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.4.1' // Database migrations + implementation group: 'org.flywaydb', name: 'flyway-mysql', version: '10.4.1' // Database migrations //Tests testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.1' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.10.1' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0' - testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.7.0' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.8.0' + testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.8.0' } test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 index c1962a7..d64cd49 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 744c64d..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +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.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 index aeb74cb..1aa94a4 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 @@ -130,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. @@ -141,7 +145,7 @@ 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 @@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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 @@ -198,11 +202,11 @@ 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# 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" \