Merge branch 'discord-jda:master' into master

Author: dima-dencep

README.md

@@ -1,9 +1,7 @@
-[maven-central]: https://img.shields.io/maven-central/v/net.dv8tion/JDA?color=blue
-[jitpack]: https://img.shields.io/badge/Snapshots-JitPack-blue
+[maven-central]: https://img.shields.io/maven-central/v/net.dv8tion/JDA?filter=!*-preview*&logo=apachemaven&color=blue
+[jitpack]: https://img.shields.io/badge/Snapshots-JitPack?logo=jitpack
 [installation]: #-installation
 [discord-invite]: https://discord.gg/0hMr4ce0tIl3SLv5
-[migration]: https://jda.wiki/introduction/migration-v4-v5/
-[jenkins]: https://ci.dv8tion.net/job/JDA5
 [license]: https://github.com/discord-jda/JDA/tree/master/LICENSE
 [faq]: https://jda.wiki/introduction/faq/
 [docs]: https://docs.jda.wiki/index.html
@@ -13,9 +11,7 @@
 [faq-shield]: https://img.shields.io/badge/Wiki-FAQ-blue.svg
 [docs-shield]: https://img.shields.io/badge/Wiki-Docs-blue.svg
 [troubleshooting-shield]: https://img.shields.io/badge/Wiki-Troubleshooting-darkgreen.svg
-[jenkins-shield]: https://img.shields.io/badge/Download-Jenkins-purple.svg
 [license-shield]: https://img.shields.io/badge/License-Apache%202.0-white.svg
-[migration-shield]: https://img.shields.io/badge/Wiki-Migrating%20from%20V4-darkgreen.svg
 [GatewayIntent]: https://docs.jda.wiki/net/dv8tion/jda/api/requests/GatewayIntent.html
 [JDABuilder]: https://docs.jda.wiki/net/dv8tion/jda/api/JDABuilder.html
 [DefaultShardManagerBuilder]: https://docs.jda.wiki/net/dv8tion/jda/api/sharding/DefaultShardManagerBuilder.html
@@ -24,14 +20,12 @@
 
 [![maven-central][]][installation]
 [![jitpack][]](https://jitpack.io/#discord-jda/JDA)
-[![jenkins-shield][]][jenkins]
 [![license-shield][]][license]
 
 [![discord-shield][]][discord-invite]
 [![faq-shield]][faq]
 [![docs-shield]][docs]
 [![troubleshooting-shield]][troubleshooting]
-[![migration-shield][]][migration]
 
 # JDA (Java Discord API)
 
@@ -53,7 +47,7 @@ You can learn more by visiting our [wiki][wiki] or referencing our [Javadocs][do
 
 ## 🔬 Installation
 
-[![maven-central][]](https://mvnrepository.com/artifact/net.dv8tion/JDA/latest)
+[![maven-central][]](https://central.sonatype.com/artifact/net.dv8tion/JDA)
 [![jitpack][]](https://jitpack.io/#discord-jda/JDA)
 
 This library is available on maven central. The latest version is always shown in the [GitHub Release](https://github.com/discord-jda/JDA/releases/latest).

build.gradle.kts

@@ -16,6 +16,7 @@
 
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import de.undercouch.gradle.tasks.download.Download
 import net.dv8tion.jda.tasks.Version
 import net.dv8tion.jda.tasks.applyAudioExclusions
 import net.dv8tion.jda.tasks.applyOpusExclusions
@@ -35,6 +36,7 @@ plugins {
     alias(libs.plugins.versions)
     alias(libs.plugins.version.catalog.update)
     alias(libs.plugins.jreleaser)
+    alias(libs.plugins.download)
 }
 
 
@@ -45,7 +47,7 @@ plugins {
 ////////////////////////////////////
 
 projectEnvironment {
-    version = Version(major = "5", minor = "6", revision = "1", classifier = null)
+    version = Version(major = "6", minor = "0", revision = "0", classifier = "rc.1")
 }
 
 artifactFilters {
@@ -88,10 +90,7 @@ configure<SourceSetContainer> {
 //                                //
 ////////////////////////////////////
 
-val recipeParserClasspath by configurations.creating
-
 repositories {
-    mavenLocal()
     mavenCentral()
 }
 
@@ -160,8 +159,6 @@ dependencies {
 
     // For authoring tests for any kind of Recipe
     testImplementation("org.openrewrite:rewrite-test")
-
-    recipeParserClasspath("net.dv8tion:JDA:5.6.1")
 }
 
 fun isNonStable(version: String): Boolean {
@@ -299,7 +296,9 @@ val javadoc by tasks.getting(Javadoc::class) {
     dependsOn(generateJavaSources)
     source = generateJavaSources.get().source
 
-    exclude("net/dv8tion/jda/internal")
+    exclude {
+        it.file.absolutePath.contains("internal", ignoreCase=false)
+    }
 }
 
 val javadocJar by tasks.registering(Jar::class) {
@@ -341,11 +340,11 @@ val build by tasks.getting(Task::class) {
     shadowJar.mustRunAfter(sourcesJar)
 }
 
-val downloadRecipeClasspath by tasks.registering(Copy::class) {
-    from(recipeParserClasspath)
-    into("src/test/resources/META-INF/rewrite/classpath")
-
-    include("JDA-*.jar")
+val downloadRecipeClasspath by tasks.registering(Download::class) {
+    val targetVersion = "5.6.1"
+    src("https://repo.maven.apache.org/maven2/net/dv8tion/JDA/$targetVersion/JDA-$targetVersion.jar")
+    dest("src/test/resources/META-INF/rewrite/classpath/JDA-$targetVersion.jar")
+    overwrite(false)
 }
 
 tasks.named("processTestResources").configure {

buildSrc/src/main/kotlin/net/dv8tion/jda/tasks/ProjectEnvironmentConfig.kt

@@ -31,7 +31,7 @@ abstract class ProjectEnvironmentConfig(
 ) {
     abstract val version: Property<Version>
 
-    val isGithubAction = System.getenv("GITHUB_ACTION") == "true"
+    val isGithubAction = System.getenv("GITHUB_ACTION") != null
     val isJitpack = System.getenv("JITPACK") == "true"
     val isCI = isGithubAction || isJitpack
 

gradle/libs.versions.toml

@@ -38,3 +38,4 @@ shadow = "com.gradleup.shadow:8.3.8"
 version-catalog-update = "nl.littlerobots.version-catalog-update:1.0.0"
 versions = "com.github.ben-manes.versions:0.52.0"
 jreleaser = "org.jreleaser:1.19.0"
+download = "de.undercouch.download:5.6.0"