PaperMC/patches/api/0002-Build-system-changes.patch

49 lines
2.2 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
2021-06-14 03:48:31 +02:00
Subject: [PATCH] Build system changes
2021-06-11 14:02:28 +02:00
diff --git a/build.gradle.kts b/build.gradle.kts
index 997a70e2150d3de51d5d9185bdbba5535a9db1d9..a781bd61e2968a29cd3b8f14a85555486c32cb63 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
2021-10-19 16:32:18 +02:00
@@ -14,18 +14,26 @@ dependencies {
// api dependencies are listed transitively to API consumers
api("commons-lang:commons-lang:2.6")
api("com.google.guava:guava:21.0")
- api("com.google.code.gson:gson:2.8.0")
+ api("com.google.code.gson:gson:2.8.8") // Paper - bump
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
+ api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+ compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
2021-06-14 03:48:31 +02:00
- val annotations = "org.jetbrains:annotations-java5:21.0.1"
+ val annotations = "org.jetbrains:annotations:21.0.1" // Paper - we don't want Java 5 annotations...
compileOnly(annotations)
2021-06-14 03:48:31 +02:00
testCompileOnly(annotations)
+ // Paper start - add checker
+ val checkerAnnotations = "org.checkerframework:checker-qual:3.18.0"
+ compileOnlyApi(checkerAnnotations)
+ testCompileOnly(checkerAnnotations)
+ // Paper end
+
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:9.2")
@@ -62,7 +70,7 @@ tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).links(
"https://guava.dev/releases/21.0/api/docs/",
2021-07-07 08:52:40 +02:00
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
+ "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations
"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
)
}