From 81b53cd1f865ab66db4f22a736b77aa50d58593a Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 20 Jun 2025 23:10:46 +0200 Subject: [PATCH] Update dependencies and build process Upgraded multiple dependencies including Spring Boot, JDA, and Configurate to their latest versions. Updated Java toolchain to version 21. Added the Versions plugin for dependency version management. Modified Jenkins build process to use `shadowJar`. --- Jenkinsfile | 4 ++-- build.gradle.kts | 30 +++++++++++++++++------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a26326..442d087 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { stages { stage('Gradle') { steps { - sh 'bash ./gradlew build' + sh 'bash ./gradlew shadowJar' } } stage('Archive') { @@ -17,4 +17,4 @@ pipeline { } } } -} \ No newline at end of file +} diff --git a/build.gradle.kts b/build.gradle.kts index ddcdc4b..f49ed1f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,10 @@ plugins { id("java") - id("com.github.johnrengelman.shadow") version "7.1.0" + id("com.github.johnrengelman.shadow") version "8.1.1" id("maven-publish") - id("org.springframework.boot") version("2.7.8") + id("org.springframework.boot") version("3.5.3") + id("com.github.ben-manes.versions") version "0.52.0" } group = "com.alttd" @@ -12,7 +13,7 @@ description = "Altitude Discord Bot." java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } } @@ -59,23 +60,26 @@ tasks { dependencies { // JDA - implementation("net.dv8tion:JDA:5.0.2") { + implementation("net.dv8tion:JDA:5.6.1") { exclude("opus-java") // exclude audio } // MySQL implementation("mysql:mysql-connector-java:8.0.33") // Configurate - implementation("org.spongepowered:configurate-yaml:4.1.2") + implementation("org.spongepowered:configurate-yaml:4.2.0") // Excel - implementation("org.apache.poi:poi:5.2.0") - implementation("org.apache.poi:poi-ooxml:5.2.0") + implementation("org.apache.poi:poi:5.4.1") + implementation("org.apache.poi:poi-ooxml:5.4.1") // Other stuff? - compileOnly("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.24") + compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor("org.projectlombok:lombok:1.18.38") implementation("com.alttd:AltitudeLogs:1.0") - implementation("org.springframework.boot:spring-boot-starter-web:3.2.1") - implementation("org.springframework.boot:spring-boot-starter-validation:3.2.1") - implementation("com.google.code.gson:gson:2.8.9") -} \ No newline at end of file + implementation("org.springframework.boot:spring-boot-starter-web:3.5.3") + implementation("org.springframework.boot:spring-boot-starter-validation:3.5.3") + implementation("com.google.code.gson:gson:2.13.1") + + testImplementation(platform("org.junit:junit-bom:5.13.1")) + testImplementation("org.junit.jupiter:junit-jupiter") +}