From 9d540d471dbd0a71758edcc6a048ad756554a1a3 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 23 Jul 2021 10:52:15 -0700 Subject: [PATCH] remove redundant Guava dependency declarations --- common/addons/api-features/build.gradle.kts | 3 --- common/addons/biome-provider-image/build.gradle.kts | 3 --- common/addons/biome-provider-pipeline/build.gradle.kts | 3 --- common/addons/biome-provider-single/build.gradle.kts | 3 --- common/addons/chunk-generator-noise-3d/build.gradle.kts | 3 --- common/addons/config-biome/build.gradle.kts | 3 --- common/addons/config-carver/build.gradle.kts | 3 --- common/addons/config-distributors/build.gradle.kts | 4 ---- common/addons/config-feature/build.gradle.kts | 3 --- common/addons/config-flora/build.gradle.kts | 3 --- common/addons/config-locators/build.gradle.kts | 3 --- common/addons/config-noise-function/build.gradle.kts | 3 --- common/addons/config-ore/build.gradle.kts | 3 --- common/addons/config-palette/build.gradle.kts | 3 --- common/addons/config-structure/build.gradle.kts | 4 ---- common/addons/generation-stage-feature/build.gradle.kts | 3 --- common/addons/generation-stage-flora/build.gradle.kts | 3 --- common/addons/generation-stage-structure/build.gradle.kts | 3 --- common/addons/language-yaml/build.gradle.kts | 3 --- common/addons/structure-terrascript-loader/build.gradle.kts | 5 ----- common/api/build.gradle.kts | 4 ---- common/implementation/build.gradle.kts | 4 ---- common/loader/addon/build.gradle.kts | 3 --- common/loader/config/build.gradle.kts | 3 --- 24 files changed, 78 deletions(-) diff --git a/common/addons/api-features/build.gradle.kts b/common/addons/api-features/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/api-features/build.gradle.kts +++ b/common/addons/api-features/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/biome-provider-image/build.gradle.kts b/common/addons/biome-provider-image/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/biome-provider-image/build.gradle.kts +++ b/common/addons/biome-provider-image/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/biome-provider-pipeline/build.gradle.kts b/common/addons/biome-provider-pipeline/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/biome-provider-pipeline/build.gradle.kts +++ b/common/addons/biome-provider-pipeline/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/biome-provider-single/build.gradle.kts b/common/addons/biome-provider-single/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/biome-provider-single/build.gradle.kts +++ b/common/addons/biome-provider-single/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/chunk-generator-noise-3d/build.gradle.kts b/common/addons/chunk-generator-noise-3d/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/chunk-generator-noise-3d/build.gradle.kts +++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-biome/build.gradle.kts b/common/addons/config-biome/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-biome/build.gradle.kts +++ b/common/addons/config-biome/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-carver/build.gradle.kts b/common/addons/config-carver/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-carver/build.gradle.kts +++ b/common/addons/config-carver/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-distributors/build.gradle.kts b/common/addons/config-distributors/build.gradle.kts index 74b2da97c..6c101765d 100644 --- a/common/addons/config-distributors/build.gradle.kts +++ b/common/addons/config-distributors/build.gradle.kts @@ -15,10 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-feature/build.gradle.kts b/common/addons/config-feature/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-feature/build.gradle.kts +++ b/common/addons/config-feature/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-flora/build.gradle.kts b/common/addons/config-flora/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-flora/build.gradle.kts +++ b/common/addons/config-flora/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-locators/build.gradle.kts b/common/addons/config-locators/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-locators/build.gradle.kts +++ b/common/addons/config-locators/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-noise-function/build.gradle.kts b/common/addons/config-noise-function/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-noise-function/build.gradle.kts +++ b/common/addons/config-noise-function/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-ore/build.gradle.kts b/common/addons/config-ore/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-ore/build.gradle.kts +++ b/common/addons/config-ore/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-palette/build.gradle.kts b/common/addons/config-palette/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/config-palette/build.gradle.kts +++ b/common/addons/config-palette/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/config-structure/build.gradle.kts b/common/addons/config-structure/build.gradle.kts index 5a88b2b6e..fada603d1 100644 --- a/common/addons/config-structure/build.gradle.kts +++ b/common/addons/config-structure/build.gradle.kts @@ -19,10 +19,6 @@ dependencies { "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1") - - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/generation-stage-feature/build.gradle.kts b/common/addons/generation-stage-feature/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/generation-stage-feature/build.gradle.kts +++ b/common/addons/generation-stage-feature/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/generation-stage-flora/build.gradle.kts b/common/addons/generation-stage-flora/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/generation-stage-flora/build.gradle.kts +++ b/common/addons/generation-stage-flora/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/generation-stage-structure/build.gradle.kts b/common/addons/generation-stage-structure/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/generation-stage-structure/build.gradle.kts +++ b/common/addons/generation-stage-structure/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/language-yaml/build.gradle.kts b/common/addons/language-yaml/build.gradle.kts index 4478a14e6..6c101765d 100644 --- a/common/addons/language-yaml/build.gradle.kts +++ b/common/addons/language-yaml/build.gradle.kts @@ -15,9 +15,6 @@ group = "com.dfsek.terra.common" dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index c7272af79..8f3c6aaa7 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -18,11 +18,6 @@ dependencies { "shadedApi"("commons-io:commons-io:2.6") - - - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts index 2b8bc9fa9..77aaf87ac 100644 --- a/common/api/build.gradle.kts +++ b/common/api/build.gradle.kts @@ -19,9 +19,5 @@ dependencies { "shadedApi"("com.dfsek.tectonic:yaml:2.1.2") "shadedApi"("net.jafama:jafama:2.3.2") - - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts index 3d6c61866..6608cc5fb 100644 --- a/common/implementation/build.gradle.kts +++ b/common/implementation/build.gradle.kts @@ -23,10 +23,6 @@ dependencies { "shadedImplementation"("org.yaml:snakeyaml:1.27") "shadedImplementation"("org.ow2.asm:asm:9.0") - - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/loader/addon/build.gradle.kts b/common/loader/addon/build.gradle.kts index 07542d899..d4c25d8c1 100644 --- a/common/loader/addon/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -14,9 +14,6 @@ group = "com.dfsek.terra.common" dependencies { "shadedApi"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing { diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts index 07542d899..d4c25d8c1 100644 --- a/common/loader/config/build.gradle.kts +++ b/common/loader/config/build.gradle.kts @@ -14,9 +14,6 @@ group = "com.dfsek.terra.common" dependencies { "shadedApi"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") } publishing {