From a15e45875ec8715c4ce347e86021bf63641a7a0a Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 23 Jul 2021 10:59:24 -0700 Subject: [PATCH] automatically depend on API in addons --- buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt | 2 +- common/addons/api-features/build.gradle.kts | 2 -- common/addons/biome-provider-image/build.gradle.kts | 2 -- common/addons/biome-provider-pipeline/build.gradle.kts | 2 -- common/addons/biome-provider-single/build.gradle.kts | 2 -- common/addons/chunk-generator-noise-3d/build.gradle.kts | 2 -- common/addons/config-biome/build.gradle.kts | 2 -- common/addons/config-carver/build.gradle.kts | 2 -- common/addons/config-distributors/build.gradle.kts | 2 -- common/addons/config-feature/build.gradle.kts | 2 -- common/addons/config-flora/build.gradle.kts | 2 -- common/addons/config-locators/build.gradle.kts | 2 -- common/addons/config-noise-function/build.gradle.kts | 2 -- common/addons/config-ore/build.gradle.kts | 2 -- common/addons/config-palette/build.gradle.kts | 2 -- common/addons/config-structure/build.gradle.kts | 5 ----- common/addons/generation-stage-feature/build.gradle.kts | 2 -- common/addons/generation-stage-flora/build.gradle.kts | 2 -- common/addons/generation-stage-structure/build.gradle.kts | 2 -- common/addons/language-yaml/build.gradle.kts | 2 -- common/addons/structure-terrascript-loader/build.gradle.kts | 4 ---- 21 files changed, 1 insertion(+), 46 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index 8e35e1aca..c9e7b27ad 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt @@ -36,7 +36,7 @@ fun Project.configureDependencies() { "testImplementation"("com.google.guava:guava:30.0-jre") } - if (project(":common:addons").subprojects.contains(this)) { + if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API. dependencies { "compileOnly"(project(":common:api")) "testImplementation"(project(":common:api")) diff --git a/common/addons/api-features/build.gradle.kts b/common/addons/api-features/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/api-features/build.gradle.kts +++ b/common/addons/api-features/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/biome-provider-image/build.gradle.kts b/common/addons/biome-provider-image/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/biome-provider-image/build.gradle.kts +++ b/common/addons/biome-provider-image/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/biome-provider-pipeline/build.gradle.kts b/common/addons/biome-provider-pipeline/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/biome-provider-pipeline/build.gradle.kts +++ b/common/addons/biome-provider-pipeline/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/biome-provider-single/build.gradle.kts b/common/addons/biome-provider-single/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/biome-provider-single/build.gradle.kts +++ b/common/addons/biome-provider-single/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/chunk-generator-noise-3d/build.gradle.kts b/common/addons/chunk-generator-noise-3d/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/chunk-generator-noise-3d/build.gradle.kts +++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-biome/build.gradle.kts b/common/addons/config-biome/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-biome/build.gradle.kts +++ b/common/addons/config-biome/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-carver/build.gradle.kts b/common/addons/config-carver/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-carver/build.gradle.kts +++ b/common/addons/config-carver/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-distributors/build.gradle.kts b/common/addons/config-distributors/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-distributors/build.gradle.kts +++ b/common/addons/config-distributors/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-feature/build.gradle.kts b/common/addons/config-feature/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-feature/build.gradle.kts +++ b/common/addons/config-feature/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-flora/build.gradle.kts b/common/addons/config-flora/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-flora/build.gradle.kts +++ b/common/addons/config-flora/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-locators/build.gradle.kts b/common/addons/config-locators/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-locators/build.gradle.kts +++ b/common/addons/config-locators/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-noise-function/build.gradle.kts b/common/addons/config-noise-function/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-noise-function/build.gradle.kts +++ b/common/addons/config-noise-function/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-ore/build.gradle.kts b/common/addons/config-ore/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-ore/build.gradle.kts +++ b/common/addons/config-ore/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-palette/build.gradle.kts b/common/addons/config-palette/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/config-palette/build.gradle.kts +++ b/common/addons/config-palette/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/config-structure/build.gradle.kts b/common/addons/config-structure/build.gradle.kts index fada603d1..00db04ba3 100644 --- a/common/addons/config-structure/build.gradle.kts +++ b/common/addons/config-structure/build.gradle.kts @@ -13,11 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) - - - "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1") } diff --git a/common/addons/generation-stage-feature/build.gradle.kts b/common/addons/generation-stage-feature/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/generation-stage-feature/build.gradle.kts +++ b/common/addons/generation-stage-feature/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/generation-stage-flora/build.gradle.kts b/common/addons/generation-stage-flora/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/generation-stage-flora/build.gradle.kts +++ b/common/addons/generation-stage-flora/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/generation-stage-structure/build.gradle.kts b/common/addons/generation-stage-structure/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/generation-stage-structure/build.gradle.kts +++ b/common/addons/generation-stage-structure/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/language-yaml/build.gradle.kts b/common/addons/language-yaml/build.gradle.kts index 6c101765d..6424f1a2b 100644 --- a/common/addons/language-yaml/build.gradle.kts +++ b/common/addons/language-yaml/build.gradle.kts @@ -13,8 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) } publishing { diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index 8f3c6aaa7..a8b41352b 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -13,10 +13,6 @@ configureDependencies() group = "com.dfsek.terra.common" dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) - - "shadedApi"("commons-io:commons-io:2.6") }