From a7d0e7f49bc6571202da5d39f47aae17c2688fbb Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 24 Sep 2021 12:06:06 -0700 Subject: [PATCH] base API project --- .../main/kotlin/com/dfsek/terra/DependencyConfig.kt | 4 ++-- common/api/build.gradle.kts | 10 ++++++++++ common/implementation/build.gradle.kts | 2 +- common/loader/addon/build.gradle.kts | 2 +- common/loader/config/build.gradle.kts | 3 --- 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 common/api/build.gradle.kts delete mode 100644 common/loader/config/build.gradle.kts diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index 712cf512d..c659676e6 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt @@ -41,8 +41,8 @@ fun Project.configureDependencies() { if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API. dependencies { - "compileOnly"(project(":common:api:core")) - "testImplementation"(project(":common:api:core")) + "compileOnly"(project(":common:api")) + "testImplementation"(project(":common:api")) } } } \ No newline at end of file diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts new file mode 100644 index 000000000..35de7c414 --- /dev/null +++ b/common/api/build.gradle.kts @@ -0,0 +1,10 @@ +afterEvaluate { + subprojects.forEach { + if(it != project) { + println("Project: ${it.name}") + dependencies { + "shadedApi"(it) + } + } + } +} \ No newline at end of file diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts index 6173da7e3..299324611 100644 --- a/common/implementation/build.gradle.kts +++ b/common/implementation/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - "shadedApi"(project(":common:api:core")) + "shadedApi"(project(":common:api")) "shadedApi"(project(":common:loader:config")) "shadedApi"(project(":common:loader:addon")) diff --git a/common/loader/addon/build.gradle.kts b/common/loader/addon/build.gradle.kts index f2cb9058c..e4239d784 100644 --- a/common/loader/addon/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - "shadedApi"(project(":common:api:core")) + "shadedApi"(project(":common:api")) } diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts deleted file mode 100644 index f2cb9058c..000000000 --- a/common/loader/config/build.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - "shadedApi"(project(":common:api:core")) -}