Merge branch 'master' of https://github.com/discord-jda/JDA

Author: dima-dencep

README.md

@@ -69,11 +69,13 @@ repositories {
 
 dependencies {
     implementation("net.dv8tion:JDA:$version") { // replace $version with the latest version
-      // Optionally disable audio natives to reduce jar size by excluding `opus-java`
+      // Optionally disable audio natives to reduce jar size by excluding `opus-java` and `tink`
       // Gradle DSL:
-      // exclude module: 'opus-java'
+      // exclude module: 'opus-java' // required for encoding audio into opus, not needed if audio is already provided in opus encoding
+      // exclude module: 'tink' // required for encrypting and decrypting audio
       // Kotlin DSL:
-      // exclude(module="opus-java")
+      // exclude(module="opus-java") // required for encoding audio into opus, not needed if audio is already provided in opus encoding
+      // exclude(module="tink") // required for encrypting and decrypting audio
     }
 }
 ```
@@ -85,14 +87,19 @@ dependencies {
     <groupId>net.dv8tion</groupId>
     <artifactId>JDA</artifactId>
     <version>$version</version> <!-- replace $version with the latest version -->
-    <!-- Optionally disable audio natives to reduce jar size by excluding `opus-java`
+    <!-- Optionally disable audio natives to reduce jar size by excluding `opus-java` and `tink` -->
     <exclusions>
+        <!-- required for encoding audio into opus, not needed if audio is already provided in opus encoding
         <exclusion>
             <groupId>club.minnced</groupId>
             <artifactId>opus-java</artifactId>
-        </exclusion>
+        </exclusion> -->
+        <!-- required for encrypting and decrypting audio
+        <exclusion>
+            <groupId>com.google.crypto.tink</groupId>
+            <artifactId>tink</artifactId>
+        </exclusion> -->
     </exclusions>
-    -->
 </dependency>
 ```
 

build.gradle.kts

@@ -17,6 +17,7 @@
 //to build everything:             "gradlew build"
 //to build and upload everything:  "gradlew release"
 
+import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import io.github.gradlenexus.publishplugin.AbstractNexusStagingRepositoryTask
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -27,8 +28,9 @@ plugins {
     `java-library`
     `maven-publish`
 
-    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.publish)
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.versions)
 }
 
 
@@ -40,7 +42,7 @@ plugins {
 
 
 val javaVersion = JavaVersion.current()
-val versionObj = Version(major = "5", minor = "3", revision = "2", classifier = null)
+val versionObj = Version(major = "5", minor = "4", revision = "0", classifier = null)
 val isGithubAction = System.getProperty("GITHUB_ACTION") != null || System.getenv("GITHUB_ACTION") != null
 val isCI = System.getProperty("BUILD_NUMBER") != null // jenkins
         || System.getenv("BUILD_NUMBER") != null
@@ -157,7 +159,7 @@ dependencies {
         addAll(configurations["compileOnly"].allDependencies)
     }
 
-    testImplementation(libs.junit)
+    testImplementation(libs.bundles.junit)
     testImplementation(libs.reflections)
     testImplementation(libs.mockito)
     testImplementation(libs.assertj)
@@ -166,14 +168,28 @@ dependencies {
     testImplementation(libs.archunit)
 }
 
+fun isNonStable(version: String): Boolean {
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
+    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+    val isStable = stableKeyword || regex.matches(version)
+    return isStable.not()
+}
+
+tasks.withType<DependencyUpdatesTask> {
+    rejectVersionIf {
+        isNonStable(candidate.version)
+    }
+
+    gradleReleaseChannel = "current"
+}
+
 
 ////////////////////////////////////
 //                                //
 //    Build Task Configuration    //
 //                                //
 ////////////////////////////////////
 
-
 val jar by tasks.getting(Jar::class) {
     archiveBaseName.set(project.name)
     manifest.attributes(
@@ -186,7 +202,7 @@ val shadowJar by tasks.getting(ShadowJar::class) {
     exclude("*.pom")
 }
 
-val sourcesForRelease by tasks.creating(Copy::class) {
+val sourcesForRelease by tasks.registering(Copy::class) {
     from("src/main/java") {
         include("**/JDAInfo.java")
         val tokens = mapOf(
@@ -207,16 +223,16 @@ val sourcesForRelease by tasks.creating(Copy::class) {
     includeEmptyDirs = false
 }
 
-val generateJavaSources by tasks.creating(SourceTask::class) {
+val generateJavaSources by tasks.registering(SourceTask::class) {
     val javaSources = sourceSets["main"].allJava.filter {
         it.name != "JDAInfo.java"
     }.asFileTree
 
-    source = javaSources + fileTree(sourcesForRelease.destinationDir)
+    source = javaSources + fileTree(sourcesForRelease.get().destinationDir)
     dependsOn(sourcesForRelease)
 }
 
-val noOpusJar by tasks.creating(ShadowJar::class) {
+val noOpusJar by tasks.registering(ShadowJar::class) {
     dependsOn(shadowJar)
     archiveClassifier.set(shadowJar.archiveClassifier.get() + "-no-opus")
 
@@ -230,7 +246,7 @@ val noOpusJar by tasks.creating(ShadowJar::class) {
     manifest.inheritFrom(jar.manifest)
 }
 
-val minimalJar by tasks.creating(ShadowJar::class) {
+val minimalJar by tasks.registering(ShadowJar::class) {
     dependsOn(shadowJar)
     minimize()
     archiveClassifier.set(shadowJar.archiveClassifier.get() + "-min")
@@ -248,12 +264,12 @@ val minimalJar by tasks.creating(ShadowJar::class) {
     manifest.inheritFrom(jar.manifest)
 }
 
-val sourcesJar by tasks.creating(Jar::class) {
+val sourcesJar by tasks.registering(Jar::class) {
     archiveClassifier.set("sources")
     from("src/main/java") {
         exclude("**/JDAInfo.java")
     }
-    from(sourcesForRelease.destinationDir)
+    from(sourcesForRelease.get().destinationDir)
 
     dependsOn(sourcesForRelease)
 }
@@ -290,7 +306,7 @@ val javadoc by tasks.getting(Javadoc::class) {
     }
 
     dependsOn(sourcesJar)
-    source = sourcesJar.source.asFileTree
+    source = sourcesJar.get().source.asFileTree
     exclude("MANIFEST.MF")
 
     //### excludes ###
@@ -302,7 +318,7 @@ val javadoc by tasks.getting(Javadoc::class) {
     exclude("com/iwebpp/crypto")
 }
 
-val javadocJar by tasks.creating(Jar::class) {
+val javadocJar by tasks.registering(Jar::class) {
     dependsOn(javadoc)
     archiveClassifier.set("javadoc")
     from(javadoc.destinationDir)
@@ -326,7 +342,7 @@ tasks.withType<JavaCompile> {
 
 val compileJava by tasks.getting(JavaCompile::class) {
     dependsOn(generateJavaSources)
-    source = generateJavaSources.source
+    source = generateJavaSources.get().source
 }
 
 val build by tasks.getting(Task::class) {
@@ -439,7 +455,7 @@ nexusPublishing {
 ////////////////////////////////////
 
 
-val rebuild by tasks.creating(Task::class) {
+val rebuild by tasks.registering(Task::class) {
     group = "build"
 
     dependsOn(build)
@@ -457,7 +473,7 @@ tasks.withType<AbstractNexusStagingRepositoryTask> {
     enabled = shouldPublish
 }
 
-val release by tasks.creating(Task::class) {
+val release by tasks.registering(Task::class) {
     group = "publishing"
     enabled = shouldPublish
 
@@ -467,7 +483,7 @@ val release by tasks.creating(Task::class) {
 afterEvaluate {
     val closeAndReleaseStagingRepositories by tasks.getting
     closeAndReleaseStagingRepositories.apply {
-        release.dependsOn(this)
+        release.get().dependsOn(this)
         mustRunAfter(publishingTasks)
     }
 }

gradle/libs.versions.toml

@@ -0,0 +1,39 @@
+[versions]
+jackson = "2.18.3"
+
+
+[libraries]
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
+websocket-client = { module = "com.neovisionaries:nv-websocket-client", version = "2.14" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
+trove4j = { module = "net.sf.trove4j:core", version = "3.1.0" }
+commons-collections = { module = "org.apache.commons:commons-collections4", version = "4.4" }
+commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.17.0" }
+slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.17" }
+findbugs = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+jetbrains-annotations = { module = "org.jetbrains:annotations", version = "26.0.2" }
+opus = { module = "club.minnced:opus-java", version = "1.1.1" }
+jna = { module = "net.java.dev.jna:jna", version = "5.17.0" }
+tink = { module = "com.google.crypto.tink:tink", version = "1.17.0" }
+
+# Test dependencies
+
+junit = { module = "org.junit.jupiter:junit-jupiter", version = "5.12.2" }
+junit-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.12.2" }
+reflections = { module = "org.reflections:reflections", version = "0.10.2" }
+logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.18" }
+assertj = { module = "org.assertj:assertj-core", version = "3.27.3" }
+archunit = { module = "com.tngtech.archunit:archunit", version = "1.4.0" }
+mockito = { module = "org.mockito:mockito-core", version = "5.17.0" }
+
+
+[bundles]
+jackson = ["jackson-core", "jackson-databind"]
+junit = ["junit", "junit-launcher"]
+
+
+[plugins]
+publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
+shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -1,30 +1,2 @@
 rootProject.name = "JDA"
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            version("jackson", "2.17.2")
-            library("jackson-core",     "com.fasterxml.jackson.core", "jackson-core").versionRef("jackson")
-            library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").versionRef("jackson")
-            bundle("jackson", listOf("jackson-core", "jackson-databind"))
-
-            library("logback-classic",       "ch.qos.logback",           "logback-classic"     ).version("1.5.6")
-            library("opus",                  "club.minnced",             "opus-java"           ).version("1.1.1")
-            library("findbugs",              "com.google.code.findbugs", "jsr305"              ).version("3.0.2")
-            library("websocket-client",      "com.neovisionaries",       "nv-websocket-client" ).version("2.14")
-            library("okhttp",                "com.squareup.okhttp3",     "okhttp"              ).version("4.12.0")
-            library("jna",                   "net.java.dev.jna",         "jna"                 ).version("5.14.0")
-            library("trove4j",               "net.sf.trove4j",           "core"                ).version("3.1.0")
-            library("commons-collections",   "org.apache.commons",       "commons-collections4").version("4.4")
-            library("commons-lang3",         "org.apache.commons",       "commons-lang3"       ).version("3.14.0")
-            library("assertj",               "org.assertj",              "assertj-core"        ).version("3.25.3")
-            library("jetbrains-annotations", "org.jetbrains",            "annotations"         ).version("24.1.0")
-            library("junit",                 "org.junit.jupiter",        "junit-jupiter"       ).version("5.10.2")
-            library("mockito",               "org.mockito",              "mockito-core"        ).version("5.11.0")
-            library("reflections",           "org.reflections",          "reflections"         ).version("0.10.2")
-            library("slf4j",                 "org.slf4j",                "slf4j-api"           ).version("2.0.13")
-            library("tink",                  "com.google.crypto.tink",   "tink"                ).version("1.14.1")
-            library("archunit",              "com.tngtech.archunit",     "archunit"            ).version("1.3.0")
-        }
-    }
-}