chore: move modules & fix build scripts

Incendo · Jan 14, 2024 · 2396266 · 2396266
1 parent 59993b4
commit 2396266
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 20 deletions.
diff --git a/cloud-discord/cloud-javacord/build.gradle.kts b/cloud-discord/cloud-javacord/build.gradle.kts
diff --git a/cloud-discord/cloud-jda/build.gradle.kts b/cloud-discord/cloud-jda/build.gradle.kts
diff --git a/cloud-javacord/build.gradle.kts b/cloud-javacord/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("cloud-discord.base-conventions")
+    id("cloud-discord.publishing-conventions")
+}
+
+version = "2.0.0-dev"
+
+dependencies {
+    api(libs.cloud.core)
+    implementation(libs.javacord)
+}
diff --git a/...ndframework/javacord/JavacordCommand.java → ...ndframework/javacord/JavacordCommand.java b/...ndframework/javacord/JavacordCommand.java → ...ndframework/javacord/JavacordCommand.java
diff --git a/...work/javacord/JavacordCommandManager.java → ...work/javacord/JavacordCommandManager.java b/...work/javacord/JavacordCommandManager.java → ...work/javacord/JavacordCommandManager.java
diff --git a/...javacord/JavacordRegistrationHandler.java → ...javacord/JavacordRegistrationHandler.java b/...javacord/JavacordRegistrationHandler.java → ...javacord/JavacordRegistrationHandler.java
diff --git a/...mmandframework/javacord/package-info.java → ...mmandframework/javacord/package-info.java b/...mmandframework/javacord/package-info.java → ...mmandframework/javacord/package-info.java
diff --git a/...avacord/sender/JavacordCommandSender.java → ...avacord/sender/JavacordCommandSender.java b/...avacord/sender/JavacordCommandSender.java → ...avacord/sender/JavacordCommandSender.java
diff --git a/...avacord/sender/JavacordPrivateSender.java → ...avacord/sender/JavacordPrivateSender.java b/...avacord/sender/JavacordPrivateSender.java → ...avacord/sender/JavacordPrivateSender.java
diff --git a/...javacord/sender/JavacordServerSender.java → ...javacord/sender/JavacordServerSender.java b/...javacord/sender/JavacordServerSender.java → ...javacord/sender/JavacordServerSender.java
diff --git a/...amework/javacord/sender/package-info.java → ...amework/javacord/sender/package-info.java b/...amework/javacord/sender/package-info.java → ...amework/javacord/sender/package-info.java
diff --git a/cloud-jda/build.gradle.kts b/cloud-jda/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("cloud-discord.base-conventions")
+    id("cloud-discord.publishing-conventions")
+}
+
+version = "2.0.0-dev"
+
+dependencies {
+    api(libs.cloud.core)
+    compileOnly(libs.jda)
+}
diff --git a/...mandframework/jda/JDA4CommandManager.java → ...mandframework/jda/JDA4CommandManager.java b/...mandframework/jda/JDA4CommandManager.java → ...mandframework/jda/JDA4CommandManager.java
diff --git a/...mandframework/jda/JDACommandListener.java → ...mandframework/jda/JDACommandListener.java b/...mandframework/jda/JDACommandListener.java → ...mandframework/jda/JDACommandListener.java
diff --git a/...mmandframework/jda/JDACommandManager.java → ...mmandframework/jda/JDACommandManager.java b/...mmandframework/jda/JDACommandManager.java → ...mmandframework/jda/JDACommandManager.java
diff --git a/...framework/jda/JDACommandPreprocessor.java → ...framework/jda/JDACommandPreprocessor.java b/...framework/jda/JDACommandPreprocessor.java → ...framework/jda/JDACommandPreprocessor.java
diff --git a/...ommandframework/jda/JDACommandSender.java → ...ommandframework/jda/JDACommandSender.java b/...ommandframework/jda/JDACommandSender.java → ...ommandframework/jda/JDACommandSender.java
diff --git a/.../commandframework/jda/JDAGuildSender.java → .../commandframework/jda/JDAGuildSender.java b/.../commandframework/jda/JDAGuildSender.java → .../commandframework/jda/JDAGuildSender.java
diff --git a/...ommandframework/jda/JDAPrivateSender.java → ...ommandframework/jda/JDAPrivateSender.java b/...ommandframework/jda/JDAPrivateSender.java → ...ommandframework/jda/JDAPrivateSender.java
diff --git a/...ud/commandframework/jda/package-info.java → ...ud/commandframework/jda/package-info.java b/...ud/commandframework/jda/package-info.java → ...ud/commandframework/jda/package-info.java
diff --git a/...dframework/jda/parsers/ChannelParser.java → ...dframework/jda/parsers/ChannelParser.java b/...dframework/jda/parsers/ChannelParser.java → ...dframework/jda/parsers/ChannelParser.java
diff --git a/...mandframework/jda/parsers/RoleParser.java → ...mandframework/jda/parsers/RoleParser.java b/...mandframework/jda/parsers/RoleParser.java → ...mandframework/jda/parsers/RoleParser.java
diff --git a/...mandframework/jda/parsers/UserParser.java → ...mandframework/jda/parsers/UserParser.java b/...mandframework/jda/parsers/UserParser.java → ...mandframework/jda/parsers/UserParser.java
diff --git a/...ndframework/jda/parsers/package-info.java → ...ndframework/jda/parsers/package-info.java b/...ndframework/jda/parsers/package-info.java → ...ndframework/jda/parsers/package-info.java
diff --git a/cloud-jda5/build.gradle.kts b/cloud-jda5/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 
 dependencies {
     api(projects.cloudDiscordCommon)
-    implementation(libs.jda)
+    implementation(libs.jda5)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,9 @@ cloud = "2.0.0-SNAPSHOT"
 
 # External
 immutables = "2.10.0"
-jda = "5.0.0-beta.19"
+javacord = "3.1.1"
+jda = "4.2.1_257"
+jda5 = "5.0.0-beta.19"
 
 # Test
 jupiterEngine = "5.10.1"
@@ -32,7 +34,9 @@ cloud-annotations = { group = "cloud.commandframework", name = "cloud-annotation
 
 # External
 immutables = { group = "org.immutables", name = "value", version.ref = "immutables" }
+javacord = { group = "org.javacord", name = "javacord", version.ref = "javacord" }
 jda = { group = "net.dv8tion", name = "JDA", version.ref = "jda" }
+jda5 = { group = "net.dv8tion", name = "JDA", version.ref = "jda5" }
 
 # Test
 jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiterEngine" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -22,10 +22,16 @@ dependencyResolutionManagement {
                 snapshotsOnly()
             }
         }
+        maven("https://m2.dv8tion.net/releases") {
+            name = "dv8tion"
+            mavenContent { releasesOnly() }
+        }
     }
 }
 
 rootProject.name = "cloud-discord"
 
 include(":cloud-discord-common")
+include(":cloud-javacord")
+include(":cloud-jda")
 include(":cloud-jda5")