Merge branch 'v6' into build/v6/annotations

chore: Exclude .DS_Store files
build: Revert relocation change of unpublished, shaded deps
2025-10-24 23:23:44 +02:00 · 2022-05-15 15:39:02 +02:00 · 2022-05-07 16:51:11 +02:00 · 2022-05-07 16:49:34 +02:00 · 2022-05-07 16:44:16 +02:00 · 2022-04-30 14:17:41 +02:00
3 changed files with 5 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -131,5 +131,8 @@ local.properties
 checkstyle.xml
 classes/
 *.bat
+
+# Other
 docs/
 build/
+.DS_Store
--- a/.lift.toml
+++ b/.lift.toml
@@ -1,4 +0,0 @@
-jdkVersion = "17"
-build = "gradle clean build -x test"
-tools = ["findsecbugs", "ErrorProne", "Semgrep", "Detekt", "Infer"]
-ignoreRules = ["CatchAndPrintStackTrace", "ReferenceEquality", "FallThrough", "FutureReturnValueIgnored", "MixedMutabilityReturnType", "EmptyCatch", "MissingCasesInEnumSwitch", "OperatorPrecedence", "StaticAssignmentInConstructor", "ReferenceEquality", "EqualsHashCode", "EqualsGetClass", "TypeParameterUnusedInFormals", "StringSplitter", "InlineMeSuggester", "NULL_DEREFERENCE"]
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -85,6 +85,8 @@ tasks.named<ShadowJar>("shadowJar") {
    relocate("javax.annotation", "com.plotsquared.core.annotation")
    relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
    relocate("javax.inject", "com.plotsquared.core.annotation.inject")
+    relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
+    relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")

    // Get rid of all the libs which are 100% unused.
    minimize()
Author	SHA1	Message	Date
Alexander Brandes	cb0c1f6728	Merge branch 'v6' into build/v6/annotations	2022-05-15 15:39:02 +02:00
Alexander Brandes	8b1f295b6b	chore: Exclude .DS_Store files	2022-05-07 16:51:11 +02:00
Alexander Brandes	f366046e34	build: Revert relocation change of unpublished, shaded deps	2022-05-07 16:49:34 +02:00
Alexander Brandes	25c5d13597	Merge branch 'v6' into build/v6/annotations	2022-05-07 16:44:16 +02:00
Alexander Brandes	74fb56adbd	Merge branch 'v6' into build/v6/annotations	2022-04-30 14:17:41 +02:00
NotMyFault	edf0fe0dc9	Merge branch 'v6' into build/v6/annotations	2022-04-19 08:38:27 +02:00
Alex	74ee9e7f6d	Merge branch 'v6' into build/v6/annotations	2022-03-16 13:25:36 +01:00
NotMyFault	d04d900c13	build: Don't expose jcip and findbugs	2022-03-09 00:12:01 +01:00