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

GH-154 Update all dependencies #154

Merged
merged 1 commit into from
Jun 9, 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
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- name: Run checkstyle
run: ./gradlew checkstyleMain
- name: Build with Gradle
uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6
uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff
with:
arguments: shadowJar
- name: Upload a Build Artifact
uses: actions/[email protected].1
uses: actions/[email protected].3
with:
name: 'Successfully build DiscordOfficer JDK${{ matrix.jdk }}'
path: build/libs/*.jar
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}

checkstyle {
toolVersion = "10.15.0"
toolVersion = "10.17.0"

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

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

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

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

// slf4j setup
implementation("ch.qos.logback:logback-classic:1.5.5")
implementation("ch.qos.logback:logback-classic:1.5.6")

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

// Sentry.io integration
implementation("io.sentry:sentry:7.8.0")
implementation("io.sentry:sentry:7.10.0")

// ORMLite
implementation("com.j256.ormlite:ormlite-core:6.1")
Expand All @@ -68,10 +68,10 @@ dependencies {
implementation("mysql:mysql-connector-java:8.0.33")
implementation("org.postgresql:postgresql:42.7.3")
implementation("com.h2database:h2:2.2.224")
implementation("org.mariadb.jdbc:mariadb-java-client:3.3.3")
implementation("org.mariadb.jdbc:mariadb-java-client:3.4.0")

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

// tests
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
Expand All @@ -82,8 +82,8 @@ dependencies {
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

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

// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
implementation("org.apache.commons:commons-lang3:3.14.0")
Expand Down
2 changes: 1 addition & 1 deletion docker/java21.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app/
COPY .. /app/
RUN gradle clean shadowJar

FROM amazoncorretto:21.0.2-alpine
FROM amazoncorretto:21.0.3-alpine
LABEL org.label-schema.name="eternalcode/discordofficer"
LABEL org.label-schema.description="EternalCode DiscordOfficer official image"
LABEL org.label-schema.url="http://eternalcode.pl/"
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
Loading