Skip to content

Commit

Permalink
todo for myself, fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Nopock committed Nov 6, 2023
1 parent 67aa7a2 commit 073e8ab
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 49 deletions.
6 changes: 0 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,6 @@ allprojects {
tasks.processResources {
duplicatesStrategy = DuplicatesStrategy.WARN // or DuplicatesStrategy.FAIL
}

tasks["build"]
.dependsOn(
"shadowJar",
"publishMavenJavaPublicationToMavenLocalRepository",
)
}

kotlin {
Expand Down
4 changes: 3 additions & 1 deletion independent/backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ dependencies {
implementation("org.reflections:reflections:0.10.2")

implementation("com.squareup.retrofit2:retrofit:2.9.0")
}
}

tasks["build"].dependsOn("shadowJar")
4 changes: 3 additions & 1 deletion independent/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ dependencies {
implementation("io.kubernetes:client-java:15.0.1")

implementation("com.squareup.retrofit2:retrofit:2.9.0")
}
}

tasks["build"].dependsOn("shadowJar")
20 changes: 10 additions & 10 deletions mc-commons/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"]}")
}
44 changes: 13 additions & 31 deletions paper/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"]}")
}
}

tasks["build"].dependsOn("shadowJar")

0 comments on commit 073e8ab

Please sign in to comment.