mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 07:23:43 +01:00
aabbfcdf8d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 4b08dbc5 PR-752: Make Leaves Waterlogged de323fc9 Downgrade dependency version CraftBukkit Changes: c3f219edb Fix missing abstract in CraftLeaves 886e6d8c8 SPIGOT-7038: Setting title or subtitle to empty string causes the player to disconnect 6c302a5e3 Make Leaves Waterlogged 53b681be5 Downgrade dependency version Spigot Changes: ee737122 Fixed system messages shown in action bar f343df82 SPIGOT-7036: Don't use CHAT message type 63a06049 SPIGOT-7035: Actionbar Sending in Main Chat
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
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
|
|
Subject: [PATCH] Build system changes
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 53fbbb989a8bec663f12e90c2890740220ac8cd4..b929458b72f26568b4c87571113eb2f867359312 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -14,15 +14,27 @@ dependencies {
|
|
api("com.google.code.gson:gson:2.8.9")
|
|
api("net.md-5:bungeecord-chat:1.16-R0.4")
|
|
api("org.yaml:snakeyaml:1.30")
|
|
+ // Paper start
|
|
+ api("com.googlecode.json-simple:json-simple:1.1.1") {
|
|
+ isTransitive = false // includes junit
|
|
+ }
|
|
+ // Paper end
|
|
|
|
compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
|
|
+ compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
|
|
|
|
- val annotations = "org.jetbrains:annotations-java5:23.0.0"
|
|
+ val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
|
|
compileOnly(annotations)
|
|
testCompileOnly(annotations)
|
|
|
|
+ // Paper start - add checker
|
|
+ val checkerQual = "org.checkerframework:checker-qual:3.21.0"
|
|
+ compileOnlyApi(checkerQual)
|
|
+ testCompileOnly(checkerQual)
|
|
+ // Paper end
|
|
+
|
|
testImplementation("junit:junit:4.13.2")
|
|
testImplementation("org.hamcrest:hamcrest-library:1.3")
|
|
testImplementation("org.ow2.asm:asm-tree:9.3")
|
|
@@ -62,7 +74,7 @@ tasks.withType<Javadoc> {
|
|
options.links(
|
|
"https://guava.dev/releases/31.0.1-jre/api/docs/",
|
|
"https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
|
|
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
|
|
+ "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
|
|
"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
|
|
)
|
|
|