Skip to content
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/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
running-workflow-name: 'Verify'
repo-token: ${{ secrets.GITHUB_TOKEN }}
allowed-conclusions: success
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: gradle/actions/wrapper-validation@v4
- name: Build Image
run: docker build . -f docker/Dockerfile -t ghcr.io/rainbowdashlabs/reputation-bot:${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.13
- run: echo "repbot.docs.chojo.dev" > ./docs/CNAME
- run: pip install pipenv && pipenv install && pipenv run mkdocs gh-deploy --force
6 changes: 3 additions & 3 deletions .github/workflows/translate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
outputs:
should_run: ${{ steps.check_message.outputs.should_run }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 2 # Fetch the previous commit

Expand All @@ -33,14 +33,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.13

- name: Install dependencies
run: pip install pipenv && pipenv install
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
name: Gradle build

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 21
Expand All @@ -27,7 +27,7 @@ jobs:
name: Docker build

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Build as Docker image
run: docker build . -f docker/Dockerfile

Expand All @@ -36,7 +36,7 @@ jobs:
name: Encoding check

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Remove allowed us-ascii files before check
run: rm src/main/resources/locale.properties src/main/resources/locale_en_US.properties # This needs improvement
- name: Check UTF-8 for resource bundles
Expand All @@ -49,8 +49,8 @@ jobs:
name: Docs build

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.13
- run: pip install pipenv && pipenv install && pipenv run mkdocs build
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ buildNumber.properties
/site/
/.direnv
.run
.env
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ deepl = "*"
[dev-packages]

[requires]
python_version = "3.11"
python_version = "3.13"
246 changes: 117 additions & 129 deletions Pipfile.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 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.16.0"
version = "1.17.0"

repositories {
mavenLocal()
Expand All @@ -26,18 +26,18 @@ spotless {

dependencies {
//discord
implementation("de.chojo", "cjda-util", "2.11.0+jda-5.3.2-20250608.200008-20") {
implementation("de.chojo", "cjda-util", "2.11.0+jda-6.0.0-rc.3") {
exclude(group = "club.minnced", module = "opus-java")
}

val openapi = "6.6.0"
val openapi = "6.7.0-1"

annotationProcessor("io.javalin.community.openapi:openapi-annotation-processor:$openapi")
implementation("io.javalin.community.openapi:javalin-openapi-plugin:$openapi") // for /openapi route with JSON scheme
implementation("io.javalin.community.openapi:javalin-swagger-plugin:$openapi") // for Swagger UI

// database
implementation("org.postgresql", "postgresql", "42.7.6")
implementation("org.postgresql", "postgresql", "42.7.7")
implementation(libs.bundles.sadu)

// Logging
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:17.5
image: postgres:17.6
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.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@ dependencyResolutionManagement {
library("sadu-datasource", "de.chojo.sadu", "sadu-datasource").versionRef("sadu")
bundle("sadu", listOf("sadu-queries", "sadu-updater", "sadu-postgresql", "sadu-datasource"))

version("log4j", "2.24.3")
version("log4j", "2.25.1")
library("slf4j-api", "org.slf4j:slf4j-api:2.0.17")
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("7.0.4")
plugin("shadow", "com.gradleup.shadow").version("8.3.6")
plugin("spotless", "com.diffplug.spotless").version("7.2.1")
plugin("shadow", "com.gradleup.shadow").version("9.0.2")
}

create("testlibs") {
version("junit", "5.13.1")
version("junit", "5.13.4")
library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("junit")
library("junit-params", "org.junit.jupiter", "junit-jupiter-params").versionRef("junit")
bundle("junit", listOf("junit-jupiter", "junit-params", "slf4j-simple"))

version("sadu", "2.3.2")
library("sadu-testing", "de.chojo.sadu", "sadu-testing").versionRef("sadu")

version("testcontainers", "1.21.1")
version("testcontainers", "1.21.3")
library("testcontainers-postgres", "org.testcontainers", "postgresql").versionRef("testcontainers")
library("testcontainers-core", "org.testcontainers", "testcontainers").versionRef("testcontainers")
library("testcontainers-junit", "org.testcontainers", "junit-jupiter").versionRef("testcontainers")
Expand All @@ -45,7 +45,7 @@ dependencyResolutionManagement {
library("slf4j-noop", "org.slf4j", "slf4j-nop").versionRef("slf4j")
library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j")

library("driver-postgres", "org.postgresql:postgresql:42.7.6")
library("driver-postgres", "org.postgresql:postgresql:42.7.7")

bundle("database-postgres", listOf("testcontainers-junit", "testcontainers-core", "testcontainers-postgres", "driver-postgres"))
}
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ pkgs ? import <nixpkgs> {}, ... }:

pkgs.mkShell {
packages = with pkgs; [jdk21 python311 pipenv];
packages = with pkgs; [jdk21 python313 pipenv];
}

Loading