Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies #163

Merged
merged 1 commit into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dockerHub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
docker-image-push:
name: Push Docker Image
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
arguments: shadowJar
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.3.6
uses: actions/upload-artifact@v4.5.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.17.0"
toolVersion = "10.21.1"

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

Expand All @@ -33,58 +33,58 @@ configurations.named("checkstyle") {
resolutionStrategy {
capabilitiesResolution {
withCapability("com.google.collections:google-collections") {
select("com.google.guava:guava:33.3.0-jre")
select("com.google.guava:guava:33.4.0-jre")
}
}
}
}

dependencies {
// JDA
implementation("net.dv8tion:JDA:5.0.2") {
implementation("net.dv8tion:JDA:5.2.2") {
exclude("opus-java", "opus-java")
}

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

// slf4j setup
implementation("ch.qos.logback:logback-classic:1.5.7")
implementation("ch.qos.logback:logback-classic:1.5.15")

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

// Sentry.io integration
implementation("io.sentry:sentry:7.14.0")
implementation("io.sentry:sentry:7.19.1")

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

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

// Database drivers
implementation("com.h2database:h2:2.3.232")
implementation("org.mariadb.jdbc:mariadb-java-client:3.4.1")
implementation("org.mariadb.jdbc:mariadb-java-client:3.5.1")

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

// tests
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")

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

// mockito
testImplementation("org.mockito:mockito-core:5.12.0")
testImplementation("org.mockito:mockito-junit-jupiter:5.12.0")
testImplementation("org.mockito:mockito-core:5.14.2")
testImplementation("org.mockito:mockito-junit-jupiter:5.14.2")

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

tasks.getByName<Test>("test") {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
Loading