Update dependency de.chojo:cjda-util to v2.10.3+jda-5.1.0 (#121)

renovate[bot] · rainbowdashlabs · web-flow · commit 223ec18a1d6c · 2025-08-02T15:26:52.000+02:00
* Update dependency de.chojo:cjda-util to v2.10.3+jda-5.1.0

* Fix update issues

* Update gradle wrapper validation

---------

Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: Nora &lt;46890129+RainbowDashLabs@users.noreply.github.com&gt;
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -26,7 +26,7 @@ jobs:
           allowed-conclusions: success
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Login to GitHub Packages
         uses: docker/login-action@v3
         with:
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,10 +30,12 @@ spotless {
 
 dependencies {
     implementation("org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r")
-    implementation("de.chojo", "cjda-util", "2.9.5+beta.19") {
+    implementation("de.chojo", "cjda-util", "2.10.3+jda-5.1.0") {
         exclude(group = "club.minnced", module = "opus-java")
     }
 
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2")
+
     // database
     implementation("org.postgresql", "postgresql", "42.7.7")
     implementation(libs.bundles.sadu)
diff --git a/src/main/java/de/chojo/krile/Krile.java b/src/main/java/de/chojo/krile/Krile.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.core.Bot;
 import de.chojo.krile.core.Data;
diff --git a/src/main/java/de/chojo/krile/commands/discover/Discover.java b/src/main/java/de/chojo/krile/commands/discover/Discover.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.discover;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.Slash;
 import de.chojo.jdautil.interactions.slash.provider.SlashProvider;
 import de.chojo.krile.commands.discover.handler.repositories.RandomRepo;
diff --git a/src/main/java/de/chojo/krile/commands/discover/handler/repositories/SearchRepo.java b/src/main/java/de/chojo/krile/commands/discover/handler/repositories/SearchRepo.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.discover.handler.repositories;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.pagination.bag.IPageBag;
 import de.chojo.jdautil.pagination.bag.PageBuilder;
diff --git a/src/main/java/de/chojo/krile/commands/info/Info.java b/src/main/java/de/chojo/krile/commands/info/Info.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.info;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.Slash;
 import de.chojo.jdautil.interactions.slash.provider.SlashProvider;
 import de.chojo.krile.commands.info.handler.Default;
diff --git a/src/main/java/de/chojo/krile/commands/info/handler/Default.java b/src/main/java/de/chojo/krile/commands/info/handler/Default.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.localization.util.LocalizedEmbedBuilder;
 import de.chojo.jdautil.util.Colors;
diff --git a/src/main/java/de/chojo/krile/commands/repository/Repository.java b/src/main/java/de/chojo/krile/commands/repository/Repository.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.Group;
 import de.chojo.jdautil.interactions.slash.Slash;
 import de.chojo.jdautil.interactions.slash.provider.SlashCommand;
diff --git a/src/main/java/de/chojo/krile/commands/repository/handler/add/BaseAdd.java b/src/main/java/de/chojo/krile/commands/repository/handler/add/BaseAdd.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository.handler.add;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.localization.util.Replacement;
 import de.chojo.jdautil.wrapper.EventContext;
diff --git a/src/main/java/de/chojo/krile/commands/repository/handler/add/ByIdentifier.java b/src/main/java/de/chojo/krile/commands/repository/handler/add/ByIdentifier.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository.handler.add;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.util.Choice;
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.krile.configuration.ConfigFile;
diff --git a/src/main/java/de/chojo/krile/commands/repository/handler/add/ByNames.java b/src/main/java/de/chojo/krile/commands/repository/handler/add/ByNames.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository.handler.add;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.util.Choice;
 import de.chojo.jdautil.util.Completion;
 import de.chojo.jdautil.wrapper.EventContext;
diff --git a/src/main/java/de/chojo/krile/commands/repository/handler/add/ByUrl.java b/src/main/java/de/chojo/krile/commands/repository/handler/add/ByUrl.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository.handler.add;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.configuration.elements.RepositoryLocation;
diff --git a/src/main/java/de/chojo/krile/commands/repository/handler/update/Update.java b/src/main/java/de/chojo/krile/commands/repository/handler/update/Update.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.commands.repository.handler.update;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.localization.util.Replacement;
 import de.chojo.jdautil.wrapper.EventContext;
diff --git a/src/main/java/de/chojo/krile/core/Bot.java b/src/main/java/de/chojo/krile/core/Bot.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.core;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.interactions.dispatching.InteractionHub;
 import de.chojo.jdautil.localization.Localizer;
 import de.chojo.krile.commands.discover.Discover;
diff --git a/src/main/java/de/chojo/krile/core/Data.java b/src/main/java/de/chojo/krile/core/Data.java
@@ -7,7 +7,7 @@
 package de.chojo.krile.core;
 
 import com.zaxxer.hikari.HikariDataSource;
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.access.AuthorData;
 import de.chojo.krile.data.access.CategoryData;
@@ -19,7 +19,7 @@
 import de.chojo.sadu.mapper.RowMapperRegistry;
 import de.chojo.sadu.postgresql.databases.PostgreSql;
 import de.chojo.sadu.postgresql.mapper.PostgresqlMapper;
-import de.chojo.sadu.queries.configuration.QueryConfiguration;
+import de.chojo.sadu.queries.api.configuration.QueryConfiguration;
 import de.chojo.sadu.updater.QueryReplacement;
 import de.chojo.sadu.updater.SqlUpdater;
 import org.slf4j.Logger;
@@ -102,10 +102,10 @@ public TagData tags() {
     private void updateDatabase() throws IOException, SQLException {
         var schema = configuration.config().database().schema();
         SqlUpdater.builder(dataSource, PostgreSql.get())
-                .setReplacements(new QueryReplacement("krile", schema))
-                .setVersionTable(schema + ".krile_version")
-                .setSchemas(schema)
-                .execute();
+                  .setReplacements(new QueryReplacement("krile", schema))
+                  .setVersionTable(schema + ".krile_version")
+                  .setSchemas(schema)
+                  .execute();
     }
 
     private void configure() {
@@ -114,9 +114,9 @@ private void configure() {
         RowMapperRegistry rowMapperRegistry = new RowMapperRegistry();
         rowMapperRegistry.register(PostgresqlMapper.getDefaultMapper());
         QueryConfiguration.setDefault(QueryConfiguration.builder(dataSource)
-                .setExceptionHandler(err -> logger.error(LogNotify.NOTIFY_ADMIN, "An error occurred during a database request", err))
-                .setRowMapperRegistry(rowMapperRegistry)
-                .build());
+                                                        .setExceptionHandler(err -> logger.error(LogNotify.NOTIFY_ADMIN, "An error occurred during a database request", err))
+                                                        .setRowMapperRegistry(rowMapperRegistry)
+                                                        .build());
     }
 
     private void initDao() {
@@ -132,16 +132,16 @@ private HikariDataSource getConnectionPool() {
         log.info("Creating connection pool.");
         var data = configuration.config().database();
         return DataSourceCreator.create(PostgreSql.get())
-                .configure(config -> config
-                        .host(data.host())
-                        .port(data.port())
-                        .user(data.user())
-                        .password(data.password())
-                        .database(data.database()))
-                .create()
-                .withMaximumPoolSize(data.poolSize())
-                .withThreadFactory(Threading.createThreadFactory(threading.hikariGroup()))
-                .forSchema(data.schema())
-                .build();
+                                .configure(config -> config
+                                        .host(data.host())
+                                        .port(data.port())
+                                        .user(data.user())
+                                        .password(data.password())
+                                        .database(data.database()))
+                                .create()
+                                .withMaximumPoolSize(data.poolSize())
+                                .withThreadFactory(Threading.createThreadFactory(threading.hikariGroup()))
+                                .forSchema(data.schema())
+                                .build();
     }
 }
diff --git a/src/main/java/de/chojo/krile/data/access/GuildData.java b/src/main/java/de/chojo/krile/data/access/GuildData.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.access;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.dao.TagGuild;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/de/chojo/krile/data/access/RepositoryData.java b/src/main/java/de/chojo/krile/data/access/RepositoryData.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.access;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.dao.Identifier;
diff --git a/src/main/java/de/chojo/krile/data/dao/Repository.java b/src/main/java/de/chojo/krile/data/dao/Repository.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.dao;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.jdautil.localization.util.LocalizedEmbedBuilder;
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.krile.configuration.ConfigFile;
diff --git a/src/main/java/de/chojo/krile/data/dao/TagGuild.java b/src/main/java/de/chojo/krile/data/dao/TagGuild.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.dao;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.access.AuthorData;
 import de.chojo.krile.data.access.CategoryData;
diff --git a/src/main/java/de/chojo/krile/data/dao/tagguild/GuildRepository.java b/src/main/java/de/chojo/krile/data/dao/tagguild/GuildRepository.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.dao.tagguild;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.access.AuthorData;
 import de.chojo.krile.data.access.CategoryData;
diff --git a/src/main/java/de/chojo/krile/data/dao/tagguild/Repositories.java b/src/main/java/de/chojo/krile/data/dao/tagguild/Repositories.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.data.dao.tagguild;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.data.access.AuthorData;
 import de.chojo.krile.data.access.CategoryData;
diff --git a/src/main/java/de/chojo/krile/service/RepoUpdateService.java b/src/main/java/de/chojo/krile/service/RepoUpdateService.java
@@ -6,7 +6,7 @@
 
 package de.chojo.krile.service;
 
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.core.Threading;
 import de.chojo.krile.data.access.RepositoryData;
diff --git a/src/main/java/de/chojo/krile/tagimport/repo/RawRepository.java b/src/main/java/de/chojo/krile/tagimport/repo/RawRepository.java
@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
-import de.chojo.jdautil.configuratino.Configuration;
+import de.chojo.jdautil.configuration.Configuration;
 import de.chojo.krile.configuration.ConfigFile;
 import de.chojo.krile.configuration.elements.RepositoryLocation;
 import de.chojo.krile.data.dao.Identifier;
