fix gradle dependency stuff

PolyhedralDev · Jul 21, 2021 · af1520e · af1520e
1 parent 7932a97
commit af1520e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt
@@ -33,6 +33,6 @@ fun Project.configureDependencies() {
     dependencies {
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
         "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        "api"("org.jetbrains:annotations:20.1.0")
+        "compileOnly"("org.jetbrains:annotations:20.1.0")
     }
 }
diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt
@@ -123,12 +123,7 @@ fun Project.configureDistribution() {
         archiveClassifier.set("shaded")
         setVersion(project.version)
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
-        relocate("net.jafama", "com.dfsek.terra.lib.jafama")
         relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
-        relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone")
-        relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc")
-        relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework")
-        relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
     }

diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts
@@ -19,9 +19,6 @@ dependencies {
     "shadedApi"("com.dfsek.tectonic:yaml:2.1.2")
 
     "shadedApi"("net.jafama:jafama:2.3.2")
-    "shadedApi"("org.yaml:snakeyaml:1.27")
-    "shadedApi"("org.ow2.asm:asm:9.0")
-
 
     "compileOnly"("com.google.guava:guava:30.0-jre")
 

diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts
@@ -18,11 +18,11 @@ dependencies {
     "shadedApi"(project(":common:loader:addon"))
 
     "shadedApi"("org.apache.commons:commons-rng-core:1.3")
-
     "shadedApi"("commons-io:commons-io:2.6")
-
     "shadedImplementation"("org.apache.commons:commons-text:1.9")
 
+    "shadedImplementation"("org.yaml:snakeyaml:1.27")
+    "shadedImplementation"("org.ow2.asm:asm:9.0")
 
     "compileOnly"("com.google.guava:guava:30.0-jre")