Publish shaded common (#90)

* publish shaded commons * publish the dev jar too --------- Co-authored-by: connorhartley <[email protected]>
LunarClient · Jan 1, 2024 · e622ea1 · e622ea1
1 parent ea7f446
commit e622ea1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
@@ -183,6 +183,7 @@ fun Project.publishJar() {
 
 fun Project.publishShadowJar() {
     configurePublication {
+        artifact(tasks["jar"])
         artifact(tasks["shadowJar"])
         artifact(tasks["sourcesJar"])
     }

diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     compileOnly(libs.bukkit)
 
     api(project(path = ":apollo-api", configuration = "shadow"))
-    api(project(":apollo-common"))
+    api(project(path = ":apollo-common", configuration = "shadow"))
 
     "loaderCompileOnly"(libs.bukkit.api)
     "loaderImplementation"(project(":extra:apollo-extra-loader"))

diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts
@@ -9,7 +9,7 @@ setupDynamicDependency("adventure4", "shadowJarAdventure4", "adventure/4/", "dep
 
 dependencies {
     api(project(path = ":apollo-api", configuration = "shadow"))
-    api(project(":apollo-common"))
+    api(project(path = ":apollo-common", configuration = "shadow"))
 
     "loaderCompileOnly"(libs.bungee)
     "loaderImplementation"(project(":extra:apollo-extra-loader"))

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    id("apollo.shadow-conventions")
     id("apollo.publish-conventions")
 }
 
@@ -13,4 +14,4 @@ dependencies {
     api(libs.configurate.yaml)
 }
 
-publishJar()
+publishShadowJar()
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -6,7 +6,7 @@ dependencies {
     compileOnly(libs.velocity)
 
     api(project(path = ":apollo-api", configuration = "shadow"))
-    api(project(":apollo-common"))
+    api(project(path = ":apollo-common", configuration = "shadow"))
     api(project(":extra:apollo-extra-adventure4"))
 
     annotationProcessor(libs.velocity)