improve addon dependency system

2026-04-18 22:30:00 +00:00 · 2022-04-29 23:03:18 -07:00
parent d2795bfdb6
commit 4396623420
40 changed files with 104 additions and 102 deletions
--- a/common/addons/biome-provider-image/build.gradle.kts
+++ b/common/addons/biome-provider-image/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/biome-provider-pipeline/build.gradle.kts
+++ b/common/addons/biome-provider-pipeline/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/biome-provider-single/build.gradle.kts
+++ b/common/addons/biome-provider-single/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/chunk-generator-noise-3d/build.gradle.kts
+++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/command-addons/build.gradle.kts
+++ b/common/addons/command-addons/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/command-packs/build.gradle.kts
+++ b/common/addons/command-packs/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/command-profiler/build.gradle.kts
+++ b/common/addons/command-profiler/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/command-structures/build.gradle.kts
+++ b/common/addons/command-structures/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-biome/build.gradle.kts
+++ b/common/addons/config-biome/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-distributors/build.gradle.kts
+++ b/common/addons/config-distributors/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-feature/build.gradle.kts
+++ b/common/addons/config-feature/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-flora/build.gradle.kts
+++ b/common/addons/config-flora/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-locators/build.gradle.kts
+++ b/common/addons/config-locators/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-noise-function/build.gradle.kts
+++ b/common/addons/config-noise-function/build.gradle.kts
@@ -1,5 +1,17 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 version = version("0.1.0")

-dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+plugins {
+    id("com.github.johnrengelman.shadow")
 }
+
+
+dependencies {
+    compileOnly(project(":common:addons:manifest-addon-loader"))
+    implementation("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+}
+
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.noise.lib.paralithic")
+}
--- a/common/addons/config-ore/build.gradle.kts
+++ b/common/addons/config-ore/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-palette/build.gradle.kts
+++ b/common/addons/config-palette/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-structure/build.gradle.kts
+++ b/common/addons/config-structure/build.gradle.kts
@@ -1,6 +1,6 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi("com.googlecode.json-simple:json-simple:1.1.1")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("com.googlecode.json-simple:json-simple:1.1.1")
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/generation-stage-feature/build.gradle.kts
+++ b/common/addons/generation-stage-feature/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/generation-stage-structure/build.gradle.kts
+++ b/common/addons/generation-stage-structure/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/language-yaml/build.gradle.kts
+++ b/common/addons/language-yaml/build.gradle.kts
@@ -1,6 +1,6 @@
 version = version("0.1.0")

 dependencies {
-    shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/manifest-addon-loader/build.gradle.kts
+++ b/common/addons/manifest-addon-loader/build.gradle.kts
@@ -1,8 +1,8 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    api("commons-io:commons-io:2.6")
+    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
 }

 tasks.withType<Jar> {
--- a/common/addons/palette-block-shortcut/build.gradle.kts
+++ b/common/addons/palette-block-shortcut/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/structure-block-shortcut/build.gradle.kts
+++ b/common/addons/structure-block-shortcut/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/structure-mutator/build.gradle.kts
+++ b/common/addons/structure-mutator/build.gradle.kts
@@ -1,5 +1,5 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/structure-sponge-loader/build.gradle.kts
+++ b/common/addons/structure-sponge-loader/build.gradle.kts
@@ -11,15 +11,11 @@ repositories {
 }

 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedApi("com.github.Querz:NBT:6.1")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("commons-io:commons-io:2.7")
+    api("com.github.Querz:NBT:6.1")
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }

 tasks.named<ShadowJar>("shadowJar") {
    relocate("org.apache.commons", "com.dfsek.terra.addons.sponge.lib.commons")
 }
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
-}
--- a/common/addons/structure-terrascript-loader/build.gradle.kts
+++ b/common/addons/structure-terrascript-loader/build.gradle.kts
@@ -8,14 +8,10 @@ plugins {
 }

 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("commons-io:commons-io:2.7")
+    compileOnly(project(":common:addons:manifest-addon-loader"))
 }

 tasks.named<ShadowJar>("shadowJar") {
    relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
-}
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
 }
--- a/common/addons/terrascript-function-check-noise-3d/build.gradle.kts
+++ b/common/addons/terrascript-function-check-noise-3d/build.gradle.kts
@@ -1,7 +1,7 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
-    shadedApi(project(":common:addons:chunk-generator-noise-3d"))
-    shadedApi(project(":common:addons:structure-terrascript-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
+    api(project(":common:addons:chunk-generator-noise-3d"))
+    api(project(":common:addons:structure-terrascript-loader"))
 }
--- a/common/addons/terrascript-function-sampler/build.gradle.kts
+++ b/common/addons/terrascript-function-sampler/build.gradle.kts
@@ -1,7 +1,7 @@
 version = version("0.1.0")

 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
-    shadedApi(project(":common:addons:config-noise-function"))
-    shadedApi(project(":common:addons:structure-terrascript-loader"))
+    compileOnly(project(":common:addons:manifest-addon-loader"))
+    api(project(":common:addons:config-noise-function"))
+    api(project(":common:addons:structure-terrascript-loader"))
 }
--- a/common/api/build.gradle.kts
+++ b/common/api/build.gradle.kts
@@ -1,11 +1,9 @@
 dependencies {
-    shadedApi("ca.solo-studios", "strata", Versions.Libraries.strata)
-    shadedApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
-    shadedApi("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
+    compileOnlyApi("ca.solo-studios", "strata", Versions.Libraries.strata)
+    compileOnlyApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
+    compileOnlyApi("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
    
-    shadedApi("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-    shadedApi("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
+    compileOnlyApi("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
    
-    
-    shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    compileOnlyApi("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
--- a/common/implementation/base/build.gradle.kts
+++ b/common/implementation/base/build.gradle.kts
@@ -1,13 +1,24 @@
 dependencies {
-    shadedApi(project(":common:api"))
-    shadedApi(project(":common:implementation:bootstrap-addon-loader"))
+    api(project(":common:api"))
+    api(project(":common:implementation:bootstrap-addon-loader"))
    
-    shadedImplementation("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
+    implementation("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
+    implementation("org.apache.commons", "commons-text", Versions.Libraries.Internal.apacheText)
    
-    shadedImplementation("org.apache.commons", "commons-text", Versions.Libraries.Internal.apacheText)
-    shadedImplementation("com.dfsek.tectonic", "yaml", Versions.Libraries.tectonic)
+    implementation("com.dfsek.tectonic", "yaml", Versions.Libraries.tectonic)
+    implementation("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
    
-    shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    implementation("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+    
+    implementation("ca.solo-studios", "strata", Versions.Libraries.strata)
+    
+    implementation("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
+    
+    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    
    implementation("org.ow2.asm", "asm", Versions.Libraries.Internal.asm)
+    
+    
+    
+    testImplementation("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
 }
--- a/common/implementation/bootstrap-addon-loader/build.gradle.kts
+++ b/common/implementation/bootstrap-addon-loader/build.gradle.kts
@@ -1,3 +1,3 @@
 dependencies {
-    "shadedApi"(project(":common:api"))
+    "api"(project(":common:api"))
 }