From af1520eb83fdf1cd3e47568b8087e5cb8022ace2 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 21 Jul 2021 16:18:06 -0700 Subject: [PATCH] fix gradle dependency stuff --- buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt | 2 +- .../src/main/kotlin/com/dfsek/terra/DistributionConfig.kt | 5 ----- common/api/build.gradle.kts | 3 --- common/implementation/build.gradle.kts | 4 ++-- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index a73154b3f..c55c30873 100644 --- 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") } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt index e0c39062d..c0085d9dc 100644 --- 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 index a903cf25c..2b8bc9fa9 100644 --- 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 index d4cde1973..3d6c61866 100644 --- 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")