Java 25への移行

.github/workflows/code_quality.yml

@@ -1,11 +1,15 @@
 name: Qodana
+
+# QodanaがGradle 9 + Java 25ツールチェーンに対応するまで無効化
+# 参照: https://youtrack.jetbrains.com/issue/IDEA-379314
+# 参照: https://youtrack.jetbrains.com/issue/QD-4936
 on:
   workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - main
-      - 'releases/*'
+  # pull_request:
+  # push:
+  #   branches:
+  #     - main
+  #     - 'releases/*'
 
 jobs:
   qodana:
@@ -20,6 +24,8 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
+        uses: JetBrains/qodana-action@v2025.3
+        with:
+          args: -e,JAVA_HOME=/root/.jdks/jdk,--clear-cache
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.github/workflows/released.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '25'
 
       - name: Setup Gradle #Gradleセットアップ
         uses: gradle/gradle-build-action@v3
@@ -97,7 +97,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '25'
 
       - name: Setup Gradle #Gradleセットアップ
         uses: gradle/gradle-build-action@v3

.github/workflows/verification.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '25'
 
       - name: Setup Gradle # Gradleセットアップ
         uses: gradle/actions/setup-gradle@v4

build.gradle.kts

@@ -36,6 +36,14 @@ subprojects {
 
     group = rootProject.group
     version = rootProject.version
+
+    configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(25))
+        }
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
+    }
 }
 
 tasks.withType<JavaCompile>().configureEach {
@@ -44,9 +52,9 @@ tasks.withType<JavaCompile>().configureEach {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }

core/build.gradle.kts

@@ -8,33 +8,39 @@ base {
 }
 
 checkstyle {
-    toolVersion = "10.12.2"
+    toolVersion = "10.26.1"
     sourceSets = listOf(project.sourceSets.getByName("main"))
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation(platform("org.junit:junit-bom:6.0.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.mockito:mockito-junit-jupiter:5.14.2")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.21.0")
 
-    api("net.dv8tion:JDA:6.1.0")
-    api("org.apache.commons:commons-lang3:3.19.0")
+    api("net.dv8tion:JDA:6.3.0")
+    api("org.apache.commons:commons-lang3:3.20.0")
     api("com.google.code.gson:gson:2.13.2")
     api("com.google.guava:guava:33.5.0-jre")
     api("dev.felnull:felnull-java-library:1.75")
-    api("dev.arbjerg:lavaplayer:2.2.4")
+    api("dev.arbjerg:lavaplayer:2.2.6")
+    api("club.minnced:jdave-api:0.1.5")
+    runtimeOnly("club.minnced:jdave-native-linux-x86-64:0.1.5")
+    runtimeOnly("club.minnced:jdave-native-linux-aarch64:0.1.5")
+    runtimeOnly("club.minnced:jdave-native-win-x86-64:0.1.5")
+    runtimeOnly("club.minnced:jdave-native-darwin:0.1.5")
     api("commons-io:commons-io:2.20.0")
     api("com.ibm.icu:icu4j:77.1")
     api("com.atilika.kuromoji:kuromoji-ipadic:0.9.0")
-    api("com.zaxxer:HikariCP:5.1.0")
-    api("mysql:mysql-connector-java:8.0.32")
-    api("org.xerial:sqlite-jdbc:3.46.0.1")
+    api("com.zaxxer:HikariCP:7.0.2")
+    api("com.mysql:mysql-connector-j:9.3.0")
+    api("org.xerial:sqlite-jdbc:3.51.1.0")
     api("it.unimi.dsi:fastutil:8.5.18")
 
     api("org.jetbrains:annotations:26.0.2-1")
 
     // api("org.apache.logging.log4j:log4j-core:3.0.0-beta3")
-    api("org.apache.logging.log4j:log4j-core:2.25.2")
+    api("org.apache.logging.log4j:log4j-core:2.25.3")
 }
 
 tasks.getByName<Test>("test") {

core/src/main/java/dev/felnull/itts/core/discord/Bot.java

@@ -3,9 +3,11 @@
 import dev.felnull.itts.core.ITTSRuntimeUse;
 import dev.felnull.itts.core.ImmortalityTimer;
 import dev.felnull.itts.core.discord.command.*;
+import club.minnced.discord.jdave.interop.JDaveSessionFactory;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.OnlineStatus;
+import net.dv8tion.jda.api.audio.AudioModuleConfig;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.managers.Presence;
 import net.dv8tion.jda.api.requests.GatewayIntent;
@@ -44,6 +46,7 @@ public void start() {
         this.jda = JDABuilder.createDefault(getConfigManager().getConfig().getBotToken())
                 .enableIntents(GatewayIntent.MESSAGE_CONTENT)
                 .addEventListeners(new DCEventListener(this), this.connectControl.getAdaptor())
+                .setAudioModuleConfig(new AudioModuleConfig().withDaveSessionFactory(new JDaveSessionFactory()))
                 .build();
 
         updateCommands(this.jda);

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists