Addon dependency updates

PolyhedralDev · Sep 25, 2024 · f5f3725 · f5f3725
1 parent a7a7354
commit f5f3725
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -25,6 +25,7 @@ object Versions {
             const val snakeYml = "2.3"
             const val jetBrainsAnnotations = "24.1.0"
             const val junit = "5.11.0"
+            const val nbt = "6.1"
         }
     }
 
@@ -72,7 +73,6 @@ object Versions {
 //    }
 //
     object CLI {
-        const val nbt = "6.1"
         const val logback = "1.5.8"
     }
 }
diff --git a/common/addons/config-number-predicate/build.gradle.kts b/common/addons/config-number-predicate/build.gradle.kts
@@ -5,9 +5,4 @@ version = version("1.0.0")
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
     api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-}
-
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.numberpredicate.lib.paralithic")
-}
+}
diff --git a/common/addons/manifest-addon-loader/build.gradle.kts b/common/addons/manifest-addon-loader/build.gradle.kts
@@ -1,8 +1,8 @@
 version = version("1.0.0")
 
 dependencies {
-    api("commons-io:commons-io:2.7")
-    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    api("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
+    implementation("com.dfsek.tectonic", "yaml", Versions.Libraries.tectonic)
 }
 
 tasks.withType<Jar> {

diff --git a/common/addons/structure-sponge-loader/build.gradle.kts b/common/addons/structure-sponge-loader/build.gradle.kts
@@ -3,11 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 version = version("1.0.0")
 
 dependencies {
-    api("commons-io:commons-io:2.7")
-    api("com.github.Querz:NBT:6.1")
+    api("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
+    api("com.github.Querz", "NBT", Versions.Libraries.Internal.nbt)
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-}
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("org.apache.commons", "com.dfsek.terra.addons.sponge.lib.commons")
 }
diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts
@@ -3,10 +3,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 version = version("1.2.0")
 
 dependencies {
-    api("commons-io:commons-io:2.7")
+    api("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-}
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
-}
+}
diff --git a/platforms/cli/build.gradle.kts b/platforms/cli/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     shadedApi(project(":common:implementation:base"))
 
     shadedApi("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
-    shadedApi("com.github.Querz", "NBT", Versions.CLI.nbt)
+    shadedApi("com.github.Querz", "NBT", Versions.Libraries.Internal.nbt)
 
     shadedImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)