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

Release 1.15.2 #652

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d522998
Update dependency org.slf4j:slf4j-api to v2.0.14 (#618)
renovate[bot] Aug 8, 2024
d792528
Update dependency org.slf4j:slf4j-api to v2.0.15 (#620)
renovate[bot] Aug 8, 2024
439d8d0
Update dependency org.slf4j:slf4j-api to v2.0.16 (#622)
renovate[bot] Aug 10, 2024
2097429
Update postgres Docker tag to v16.4
renovate[bot] Aug 10, 2024
b30e713
Update dependency org.junit:junit-bom to v5.11.0
renovate[bot] Aug 14, 2024
fd220a1
Update dependency gradle to v8.10
renovate[bot] Aug 14, 2024
89121fb
Update sadu to v2.2.4
renovate[bot] Aug 16, 2024
be4ad46
Update shadow plugin id
rainbowdashlabs Aug 18, 2024
d7662b8
Update sadu to v2.2.5
renovate[bot] Aug 20, 2024
7ef98aa
Update dependency org.postgresql:postgresql to v42.7.4
renovate[bot] Aug 22, 2024
c7591b5
Update sadu to v2.3.0
renovate[bot] Aug 28, 2024
0c676db
Update dependency org.apache.logging.log4j:log4j-layout-template-json…
renovate[bot] Sep 6, 2024
0ad24fd
Update dependency gradle to v8.10.1
renovate[bot] Sep 9, 2024
288a6f0
Update plugin com.gradleup.shadow to v8.3.1 (#632)
renovate[bot] Sep 10, 2024
66808a5
Update plugin com.gradleup.shadow to v8.3.2 (#634)
renovate[bot] Sep 18, 2024
65122e2
Update dependency gradle to v8.10.2
renovate[bot] Sep 23, 2024
9f06ecc
Update dependency org.junit:junit-bom to v5.11.1
renovate[bot] Sep 25, 2024
4d20717
Update log4j to v2.24.1
renovate[bot] Sep 29, 2024
6abb0d3
Update plugin com.gradleup.shadow to v8.3.3 (#639)
renovate[bot] Oct 2, 2024
f3cbd51
Update dependency org.junit:junit-bom to v5.11.2
renovate[bot] Oct 4, 2024
7737ac9
update action to java 21
yannicklamprecht Oct 4, 2024
24fc1f9
Update dependency org.junit:junit-bom to v5.11.3
renovate[bot] Oct 21, 2024
35f4168
Update plugin com.gradleup.shadow to v8.3.4 (#642)
renovate[bot] Oct 29, 2024
3ee9553
Update plugin com.gradleup.shadow to v8.3.5 (#643)
renovate[bot] Nov 3, 2024
571469a
Update dependency gradle to v8.11 (#644)
renovate[bot] Nov 11, 2024
941a807
Update postgres Docker tag to v17
renovate[bot] Nov 22, 2024
ab6da85
Update log4j to v2.24.3 (#647)
renovate[bot] Dec 13, 2024
73c60a9
Update dependency gradle to v8.11.1 (#646)
renovate[bot] Dec 13, 2024
5019f6c
Update plugin org.gradle.toolchains.foojay-resolver-convention to v0.…
renovate[bot] Dec 13, 2024
9bbcdda
Update sadu to v2.3.1 (#648)
renovate[bot] Dec 13, 2024
943a4ab
Update dependency org.junit:junit-bom to v5.11.4 (#651)
renovate[bot] Dec 16, 2024
25a1864
Escape error in archived thread
rainbowdashlabs Dec 18, 2024
8167fbf
Update dependency gradle to v8.12 (#653)
renovate[bot] Dec 20, 2024
8901352
Update plugin com.diffplug.spotless to v7 (#654)
renovate[bot] Jan 7, 2025
bf7be0a
Update plugin com.diffplug.spotless to v7.0.1 (#655)
renovate[bot] Jan 8, 2025
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/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v3
- name: Set up JDK 19
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 19
java-version: 21
- name: Build with Gradle
run: ./gradlew --build-cache build
- name: Test with Gradle
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group = "de.chojo"
version = "1.15.1"
version = "1.15.2"

repositories {
mavenCentral()
Expand All @@ -30,7 +30,7 @@ dependencies {
}

// database
implementation("org.postgresql", "postgresql", "42.7.3")
implementation("org.postgresql", "postgresql", "42.7.4")
implementation(libs.bundles.sadu)

// Logging
Expand All @@ -42,7 +42,7 @@ dependencies {
implementation("org.knowm.xchart", "xchart", "3.8.8")

// unit testing
testImplementation(platform("org.junit:junit-bom:5.10.3"))
testImplementation(platform("org.junit:junit-bom:5.11.4"))
testImplementation("org.junit.jupiter", "junit-jupiter")
testImplementation("org.knowm.xchart", "xchart", "3.8.8")
}
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
database:
networks:
- repbot
image: postgres:16.3
image: postgres:17.2
expose:
- 5432
volumes:
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.9-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
12 changes: 6 additions & 6 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
rootProject.name = "rep-bot"

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
id("org.gradle.toolchains.foojay-resolver-convention") version("0.9.0")
}

dependencyResolutionManagement {
versionCatalogs {
create("libs") {
// misc
version("sadu", "2.2.2")
version("sadu", "2.3.1")
library("sadu-queries", "de.chojo.sadu", "sadu-queries").versionRef("sadu")
library("sadu-updater", "de.chojo.sadu", "sadu-updater").versionRef("sadu")
library("sadu-postgresql", "de.chojo.sadu", "sadu-postgresql").versionRef("sadu")
library("sadu-datasource", "de.chojo.sadu", "sadu-datasource").versionRef("sadu")
bundle("sadu", listOf("sadu-queries", "sadu-updater", "sadu-postgresql", "sadu-datasource"))

version("log4j", "2.23.1")
library("slf4j-api", "org.slf4j:slf4j-api:2.0.13")
version("log4j", "2.24.3")
library("slf4j-api", "org.slf4j:slf4j-api:2.0.16")
library("log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
library("log4j-slf4j2", "org.apache.logging.log4j", "log4j-slf4j2-impl").versionRef("log4j")
library("log4j-jsontemplate","org.apache.logging.log4j", "log4j-layout-template-json").versionRef("log4j")
bundle("log4j", listOf("slf4j-api", "log4j-core", "log4j-slf4j2", "log4j-jsontemplate"))

// plugins
plugin("spotless", "com.diffplug.spotless").version("6.25.0")
plugin("shadow", "com.github.johnrengelman.shadow").version("8.1.1")
plugin("spotless", "com.diffplug.spotless").version("7.0.1")
plugin("shadow", "com.gradleup.shadow").version("8.3.5")

}
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/chojo/repbot/util/Messages.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ private static void handleMark(RestAction<Void> action) {
ErrorResponse.UNKNOWN_MESSAGE,
ErrorResponse.TOO_MANY_REACTIONS,
ErrorResponse.REACTION_BLOCKED,
ErrorResponse.UNKNOWN_CHANNEL));
ErrorResponse.UNKNOWN_CHANNEL,
ErrorResponse.THREAD_LOCKED));
}
}
Loading