diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt index 6c62cfe9..6be6fa1d 100644 --- 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 index 0238551a..4f588dcc 100644 --- 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 index 1dd1aef4..b707a3e0 100644 --- 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 index b3f8ca04..329d53c9 100644 --- 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 index 188b2211..05a96bfe 100644 --- 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)