build: switch to composite build

RelativityMC · Dec 19, 2024 · 7d66f12 · 7d66f12
1 parent 8ff8f27
commit 7d66f12
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "netty-raknet"]
+	path = netty-raknet
+	url = https://github.com/RelativityMC/netty-raknet.git
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-common:${project.netty_raknet_version}") {
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-common") {
         transitive = false
     }
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-client:${project.netty_raknet_version}")
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-server:${project.netty_raknet_version}")
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-client")
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-server")
     api("org.apache.commons:commons-math3:3.6.1")
 
     //noinspection GradlePackageUpdate

diff --git a/gradle.properties b/gradle.properties
@@ -17,5 +17,4 @@ archives_base_name = raknetify
 
 # Dependencies
 fabric_version=0.44.0+1.18
-netty_raknet_version=3ecc41f4e9
 #mixinextras_version=0.1.1
diff --git a/netty-raknet b/netty-raknet
diff --git a/settings.gradle b/settings.gradle
@@ -11,6 +11,14 @@ pluginManagement {
 
 rootProject.name = "raknetify"
 
+includeBuild('netty-raknet') {
+    dependencySubstitution {
+        substitute module("com.github.RelativityMC.netty-raknet:netty-raknet-common") using project(":netty-raknet-common")
+        substitute module("com.github.RelativityMC.netty-raknet:netty-raknet-client") using project(":netty-raknet-client")
+        substitute module("com.github.RelativityMC.netty-raknet:netty-raknet-server") using project(":netty-raknet-server")
+    }
+}
+
 include "fabric"
 include "velocity"
 include "bungee"

diff --git a/velocity/build.gradle b/velocity/build.gradle
@@ -46,11 +46,11 @@ dependencies {
     shadowInclude implementation(project(":common"))
 
     // copied here to workaround incomplete fastutil in velocity
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-common:${project.netty_raknet_version}") {
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-common") {
         transitive = false
     }
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-client:${project.netty_raknet_version}")
-    api("com.github.RelativityMC.netty-raknet:netty-raknet-server:${project.netty_raknet_version}")
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-client")
+    api("com.github.RelativityMC.netty-raknet:netty-raknet-server")
 }
 
 processResources {