From 29ac78a32e4e69ed723ca6bbcaf6f9d8c8666cc7 Mon Sep 17 00:00:00 2001 From: Allink Date: Fri, 16 Jun 2023 00:24:34 +0100 Subject: [PATCH] Add common submodule dependencies to subprojects block --- build.gradle.kts | 8 ++++++++ core/build.gradle.kts | 2 -- shared/build.gradle.kts | 1 - v1_17_R1/build.gradle.kts | 2 -- v1_18_R1/build.gradle.kts | 2 -- v1_18_R2/build.gradle.kts | 2 -- v1_19_R1/build.gradle.kts | 2 -- v1_19_R2/build.gradle.kts | 2 -- v1_19_R3/build.gradle.kts | 2 -- v1_20_R1/build.gradle.kts | 2 -- 10 files changed, 8 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3455e51..f40f062 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,14 @@ subprojects { url = uri("https://maven.playpro.com/") } } + + dependencies { + if (project.name != "shared") { + implementation(project(":shared")) + } + + compileOnly("net.coreprotect:coreprotect:21.3") + } } tasks { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 427b35f..2352e4f 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,7 +2,6 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) implementation(project(":v1_20_R1")) implementation(project(":v1_19_R3")) implementation(project(":v1_19_R2")) @@ -11,5 +10,4 @@ dependencies { implementation(project(":v1_18_R1")) implementation(project(":v1_17_R1")) compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index fe20009..09d019b 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -3,5 +3,4 @@ version = rootProject.version dependencies { compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_17_R1/build.gradle.kts b/v1_17_R1/build.gradle.kts index 88f66c3..050d818 100644 --- a/v1_17_R1/build.gradle.kts +++ b/v1_17_R1/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_18_R1/build.gradle.kts b/v1_18_R1/build.gradle.kts index 4de4d41..aac271c 100644 --- a/v1_18_R1/build.gradle.kts +++ b/v1_18_R1/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_18_R2/build.gradle.kts b/v1_18_R2/build.gradle.kts index badd54e..9afeb92 100644 --- a/v1_18_R2/build.gradle.kts +++ b/v1_18_R2/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_19_R1/build.gradle.kts b/v1_19_R1/build.gradle.kts index 4fb0de6..fa956ca 100644 --- a/v1_19_R1/build.gradle.kts +++ b/v1_19_R1/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.19.2-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_19_R2/build.gradle.kts b/v1_19_R2/build.gradle.kts index 02f8bd7..586c948 100644 --- a/v1_19_R2/build.gradle.kts +++ b/v1_19_R2/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_19_R3/build.gradle.kts b/v1_19_R3/build.gradle.kts index 6558dae..9c068bd 100644 --- a/v1_19_R3/build.gradle.kts +++ b/v1_19_R3/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts index ce23f87..447bd98 100644 --- a/v1_20_R1/build.gradle.kts +++ b/v1_20_R1/build.gradle.kts @@ -2,7 +2,5 @@ group = rootProject.group version = rootProject.version dependencies { - implementation(project(":shared")) compileOnly("org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT") - compileOnly("net.coreprotect:coreprotect:21.3") } \ No newline at end of file