From 073e8ab445d7070ad24041938ea2bf4e2e3eef0d Mon Sep 17 00:00:00 2001 From: Nopox <78834703+Nopock@users.noreply.github.com> Date: Mon, 6 Nov 2023 07:47:40 -0800 Subject: [PATCH] todo for myself, fix --- build.gradle.kts | 6 ---- independent/backend/build.gradle.kts | 4 ++- independent/core/build.gradle.kts | 4 ++- mc-commons/build.gradle.kts | 20 ++++++------- paper/core/build.gradle.kts | 44 ++++++++-------------------- 5 files changed, 29 insertions(+), 49 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d6559f8..34d9008 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -161,12 +161,6 @@ allprojects { tasks.processResources { duplicatesStrategy = DuplicatesStrategy.WARN // or DuplicatesStrategy.FAIL } - - tasks["build"] - .dependsOn( - "shadowJar", - "publishMavenJavaPublicationToMavenLocalRepository", - ) } kotlin { diff --git a/independent/backend/build.gradle.kts b/independent/backend/build.gradle.kts index 2e3321c..23d8b51 100644 --- a/independent/backend/build.gradle.kts +++ b/independent/backend/build.gradle.kts @@ -11,4 +11,6 @@ dependencies { implementation("org.reflections:reflections:0.10.2") implementation("com.squareup.retrofit2:retrofit:2.9.0") -} \ No newline at end of file +} + +tasks["build"].dependsOn("shadowJar") \ No newline at end of file diff --git a/independent/core/build.gradle.kts b/independent/core/build.gradle.kts index f106bc7..5fc3a5a 100644 --- a/independent/core/build.gradle.kts +++ b/independent/core/build.gradle.kts @@ -23,4 +23,6 @@ dependencies { implementation("io.kubernetes:client-java:15.0.1") implementation("com.squareup.retrofit2:retrofit:2.9.0") -} \ No newline at end of file +} + +tasks["build"].dependsOn("shadowJar") \ No newline at end of file diff --git a/mc-commons/build.gradle.kts b/mc-commons/build.gradle.kts index cfe2b72..d595d0f 100644 --- a/mc-commons/build.gradle.kts +++ b/mc-commons/build.gradle.kts @@ -1,14 +1,14 @@ dependencies { - compileOnly("net.kyori:adventure-api:4.14.0") - compileOnly("net.kyori:adventure-key:4.14.0") - compileOnly("net.kyori:adventure-text-minimessage:4.10.1") + api("net.kyori:adventure-api:4.14.0") + api("net.kyori:adventure-key:4.14.0") + api("net.kyori:adventure-text-minimessage:4.10.1") - implementation("co.aikar:acf-core:0.5.1-SNAPSHOT") - implementation(project(":independent:independent-api")) + api("co.aikar:acf-core:0.5.1-SNAPSHOT") + api(project(":independent:independent-api")) - implementation("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}") - implementation(project(":independent:protocol-stub")) - implementation("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}") - implementation("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}") - implementation("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}") + api("io.grpc:grpc-netty:${rootProject.ext["grpcVersion"]}") + api(project(":independent:protocol-stub")) + api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}") + api("api.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}") + api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}") } \ No newline at end of file diff --git a/paper/core/build.gradle.kts b/paper/core/build.gradle.kts index 6cd0551..c9c8e2f 100644 --- a/paper/core/build.gradle.kts +++ b/paper/core/build.gradle.kts @@ -9,21 +9,13 @@ repositories { dependencies { // local project includes - implementation(project(":independent:independent-api")) { - isTransitive = false - } + implementation(project(":independent:independent-api")) - implementation(project(":paper:paper-api")) { - isTransitive = false - } + implementation(project(":paper:paper-api")) - implementation(project(":minecraft-platform")) { - isTransitive = false - } + implementation(project(":minecraft-platform")) - implementation(project(":independent:protocol-stub")) { - isTransitive = false - } + implementation(project(":independent:protocol-stub")) // reference libraries compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") @@ -44,31 +36,21 @@ dependencies { kapt("me.lucko:helper:5.6.10") // NMS Stuff - implementation(project(":paper:nms:nms-core")) { - isTransitive = false - } - implementation(project(":paper:nms:nms-v1_20_R1", "reobf")) { - isTransitive = false - } - implementation(project(":paper:nms:nms-v1_19_R4", "reobf")) { - isTransitive = false - } - implementation(project(":paper:nms:nms-v1_18_R2", "reobf")) { - isTransitive = false - } - implementation(project(":paper:nms:nms-v1_17_R1", "reobf")) { - isTransitive = false - } + implementation(project(":paper:nms:nms-core")) + implementation(project(":paper:nms:nms-v1_20_R1", "reobf")) + implementation(project(":paper:nms:nms-v1_19_R4", "reobf")) + implementation(project(":paper:nms:nms-v1_18_R2", "reobf")) + implementation(project(":paper:nms:nms-v1_17_R1", "reobf")) //These don't use deobf because Official Mojang Mappings didn't exist for these. implementation(project(":paper:nms:nms-v1_12_R2")) { isTransitive = false } - implementation(project(":paper:nms:nms-v1_8_R8")) { - isTransitive = false - } + implementation(project(":paper:nms:nms-v1_8_R8")) compileOnly("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}") compileOnly("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}") compileOnly("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}") -} \ No newline at end of file +} + +tasks["build"].dependsOn("shadowJar") \ No newline at end of file