geforkt von Mirrors/Paper
4af62f6d1d
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: 2d009e64 Update SnakeYAML javadoc link b4fd213c Switch Player#updateInventory deprecation for internal API annotation CraftBukkit Changes: f3b2b2210 SPIGOT-7376: Exception with getBlockData when hasBlockData is false 725545630 SPIGOT-7375: Fix crash breeding certain entities b9873b0d4 Update Brigadier version with fix 68b320562 SPIGOT-7266: Found typo in CraftBukkit package 98b4d2ff8 SPIGOT-7372, SPIGOT-7373: Signs can't be edited, issues with SignChangeEvent 5f7bd4d78 SPIGOT-7371: Sign does not open edit text on placement b4cf99d24 SPIGOT-7371: Fix editing signs with API a2b6c2744 PR-1200: Implement open sign by side a345bb940 SPIGOT-7368: Downgrade SpecialSource version Spigot Changes: 723951c3 Rebuild patches b655c57d Drop old collision API deprecated since 1.9.4 55b0fed4 Rebuild patches
88 Zeilen
3.4 KiB
Diff
88 Zeilen
3.4 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 73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a..34117c1178e04885ff9be5b73c7c2547e77ed4d5 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -17,15 +17,27 @@ dependencies {
|
|
api("net.md-5:bungeecord-chat:1.16-R0.4")
|
|
api("org.yaml:snakeyaml:2.0")
|
|
api("org.joml:joml:1.10.5")
|
|
+ // 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.9.2")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
|
|
+ compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
|
|
|
|
- val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
|
|
+ val annotations = "org.jetbrains:annotations:$annotationsVersion" // 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("org.apache.commons:commons-lang3:3.12.0")
|
|
testImplementation("junit:junit:4.13.2")
|
|
testImplementation("org.hamcrest:hamcrest-library:1.3")
|
|
@@ -67,7 +79,7 @@ tasks.withType<Javadoc> {
|
|
options.links(
|
|
"https://guava.dev/releases/31.1-jre/api/docs/",
|
|
"https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
|
|
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
|
+ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
|
"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
|
|
)
|
|
options.tags("apiNote:a:API Note:")
|
|
@@ -83,3 +95,14 @@ tasks.withType<Javadoc> {
|
|
}
|
|
}
|
|
}
|
|
+
|
|
+// Paper start
|
|
+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
|
|
+ badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
|
|
+ jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
|
+ classpath.from(configurations.compileClasspath)
|
|
+}
|
|
+tasks.check {
|
|
+ dependsOn(scanJar)
|
|
+}
|
|
+// Paper end
|
|
diff --git a/src/main/java/io/papermc/paper/annotation/DoNotUse.java b/src/main/java/io/papermc/paper/annotation/DoNotUse.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..4766e49d819e75e5c2127c698b44078bf2fd6219
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/annotation/DoNotUse.java
|
|
@@ -0,0 +1,18 @@
|
|
+package io.papermc.paper.annotation;
|
|
+
|
|
+import java.lang.annotation.ElementType;
|
|
+import java.lang.annotation.Retention;
|
|
+import java.lang.annotation.RetentionPolicy;
|
|
+import java.lang.annotation.Target;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+
|
|
+/**
|
|
+ * Annotation used to mark methods or constructors which should not be called.
|
|
+ *
|
|
+ * <p>Separate from {@link Deprecated} to differentiate from the large amount of deprecations.</p>
|
|
+ */
|
|
+@ApiStatus.Internal
|
|
+@Retention(RetentionPolicy.RUNTIME)
|
|
+@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
|
|
+public @interface DoNotUse {
|
|
+}
|