Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Jan 13, 2024
1 parent 8f509b9 commit dfb9608
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
Expand All @@ -25,11 +25,11 @@ jobs:
- name: Run checkstyle
run: ./gradlew checkstyleMain
- name: Build with Gradle
uses: gradle/gradle-build-action@0bfe00a136db5e61ba3416b372542a65863a9fee
uses: gradle/gradle-build-action@709956998852ef4cf43f91ee974b0771d4ae4965
with:
arguments: shadowJar
- name: Upload a Build Artifact
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.1.0
with:
name: 'Successfully build DiscordOfficer JDK${{ matrix.jdk }}'
path: build/libs/*.jar
24 changes: 12 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}

checkstyle {
toolVersion = "10.12.4"
toolVersion = "10.12.7"

configFile = file("${rootDir}/checkstyle/checkstyle.xml")

Expand All @@ -30,52 +30,52 @@ checkstyle {

dependencies {
// JDA
implementation("net.dv8tion:JDA:5.0.0-beta.17") {
implementation("net.dv8tion:JDA:5.0.0-beta.19") {
exclude("opus-java", "opus-java")
}

// configs
implementation("net.dzikoysk:cdn:1.14.4")

// slf4j setup
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation("ch.qos.logback:logback-classic:1.4.14")

// new modern fork of jda-utilities
implementation("pw.chew:jda-chewtils-command:2.0-SNAPSHOT")

// Sentry.io integration
implementation("io.sentry:sentry:6.33.0")
implementation("io.sentry:sentry:7.2.0")

// ORMLite
implementation("com.j256.ormlite:ormlite-core:6.1")
implementation("com.j256.ormlite:ormlite-jdbc:6.1")

// HikariCP
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("com.zaxxer:HikariCP:5.1.0")

// Database drivers
implementation("mysql:mysql-connector-java:8.0.33")
implementation("org.postgresql:postgresql:42.6.0")
implementation("org.postgresql:postgresql:42.7.1")
implementation("com.h2database:h2:2.2.224")
implementation("org.mariadb.jdbc:mariadb-java-client:3.2.0")
implementation("org.mariadb.jdbc:mariadb-java-client:3.3.2")

// Gson
implementation("com.google.code.gson:gson:2.10.1")

// tests
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")

// mockwebserver
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

// mockito
testImplementation("org.mockito:mockito-core:5.7.0")
testImplementation("org.mockito:mockito-junit-jupiter:5.7.0")
testImplementation("org.mockito:mockito-core:5.8.0")
testImplementation("org.mockito:mockito-junit-jupiter:5.8.0")

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation("org.apache.commons:commons-lang3:3.13.0")
implementation("org.apache.commons:commons-lang3:3.14.0")
}

tasks.getByName<Test>("test") {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
19 changes: 11 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -131,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
Expand Down Expand Up @@ -199,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" \
Expand Down

0 comments on commit dfb9608

Please sign in to comment.