Update and clean up api dependencies (#10018)
This commit is contained in:
		
					parent
					
						
							
								3a2229c5f3
							
						
					
				
			
			
				commit
				
					
						4d968b5fe5
					
				
			
		
					 5 changed files with 13 additions and 10 deletions
				
			
		| 
						 | 
					@ -32,7 +32,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
     api("com.google.guava:guava:32.1.2-jre")
 | 
					     api("com.google.guava:guava:32.1.2-jre")
 | 
				
			||||||
     api("com.google.code.gson:gson:2.10.1")
 | 
					     api("com.google.code.gson:gson:2.10.1")
 | 
				
			||||||
-    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 | 
					-    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
 | 
				
			||||||
+    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
 | 
					+    // Paper start - adventure
 | 
				
			||||||
 | 
					+    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") {
 | 
				
			||||||
 | 
					+        exclude("com.google.guava", "guava")
 | 
				
			||||||
 | 
					+    }
 | 
				
			||||||
 | 
					+    // Paper - adventure
 | 
				
			||||||
     api("org.yaml:snakeyaml:2.2")
 | 
					     api("org.yaml:snakeyaml:2.2")
 | 
				
			||||||
     api("org.joml:joml:1.10.5")
 | 
					     api("org.joml:joml:1.10.5")
 | 
				
			||||||
     // Paper start
 | 
					     // Paper start
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
 val annotationsVersion = "24.0.1"
 | 
					 val annotationsVersion = "24.0.1"
 | 
				
			||||||
 val bungeeCordChatVersion = "1.20-R0.1"
 | 
					 val bungeeCordChatVersion = "1.20-R0.1"
 | 
				
			||||||
 val adventureVersion = "4.14.0"
 | 
					 val adventureVersion = "4.14.0"
 | 
				
			||||||
+val slf4jVersion = "1.8.0-beta4"
 | 
					+val slf4jVersion = "2.0.9"
 | 
				
			||||||
+val log4jVersion = "2.17.1"
 | 
					+val log4jVersion = "2.17.1"
 | 
				
			||||||
 val apiAndDocs: Configuration by configurations.creating {
 | 
					 val apiAndDocs: Configuration by configurations.creating {
 | 
				
			||||||
     attributes {
 | 
					     attributes {
 | 
				
			||||||
| 
						 | 
					@ -33,8 +33,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
+    api("org.apache.logging.log4j:log4j-api:$log4jVersion")
 | 
					+    api("org.apache.logging.log4j:log4j-api:$log4jVersion")
 | 
				
			||||||
+    api("org.slf4j:slf4j-api:$slf4jVersion")
 | 
					+    api("org.slf4j:slf4j-api:$slf4jVersion")
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
     implementation("org.ow2.asm:asm:9.4")
 | 
					     implementation("org.ow2.asm:asm:9.5")
 | 
				
			||||||
     implementation("org.ow2.asm:asm-commons:9.4")
 | 
					     implementation("org.ow2.asm:asm-commons:9.5")
 | 
				
			||||||
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
 | 
					@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
 | 
				
			||||||
         "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
 | 
					         "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
 | 
				
			||||||
         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
 | 
					         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,7 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
					     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-connector-basic:1.7.3")
 | 
				
			||||||
     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http: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:$annotationsVersion"
 | 
					-    val annotations = "org.jetbrains:annotations-java5:$annotationsVersion"
 | 
				
			||||||
+    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
 | 
					+    val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
 | 
				
			||||||
| 
						 | 
					@ -29,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
     testCompileOnly(annotations)
 | 
					     testCompileOnly(annotations)
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
+    // Paper start - add checker
 | 
					+    // Paper start - add checker
 | 
				
			||||||
+    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
 | 
					+    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
 | 
				
			||||||
+    compileOnlyApi(checkerQual)
 | 
					+    compileOnlyApi(checkerQual)
 | 
				
			||||||
+    testCompileOnly(checkerQual)
 | 
					+    testCompileOnly(checkerQual)
 | 
				
			||||||
+    // Paper end
 | 
					+    // Paper end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,14 +9,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
--- a/build.gradle.kts
 | 
					--- a/build.gradle.kts
 | 
				
			||||||
+++ b/build.gradle.kts
 | 
					+++ b/build.gradle.kts
 | 
				
			||||||
@@ -0,0 +0,0 @@ dependencies {
 | 
					@@ -0,0 +0,0 @@ dependencies {
 | 
				
			||||||
     implementation("org.ow2.asm:asm-commons:9.4")
 | 
					     implementation("org.ow2.asm:asm-commons:9.5")
 | 
				
			||||||
     // Paper end
 | 
					     // Paper end
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
-    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
					-    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
				
			||||||
+    api("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
					+    api("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-connector-basic:1.7.3")
 | 
				
			||||||
     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http: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
 | 
					 
 | 
				
			||||||
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
 | 
					@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
 | 
				
			||||||
         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
 | 
					         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
 | 
				
			||||||
         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 | 
					         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
     apiAndDocs("net.kyori:adventure-text-serializer-plain")
 | 
					     apiAndDocs("net.kyori:adventure-text-serializer-plain")
 | 
				
			||||||
     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 | 
					     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 | 
				
			||||||
+
 | 
					+
 | 
				
			||||||
+    implementation("org.ow2.asm:asm:9.4")
 | 
					+    implementation("org.ow2.asm:asm:9.5")
 | 
				
			||||||
+    implementation("org.ow2.asm:asm-commons:9.4")
 | 
					+    implementation("org.ow2.asm:asm-commons:9.5")
 | 
				
			||||||
     // Paper end
 | 
					     // Paper end
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
					     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue