Enhance compatibility with newer spigot/paper versions.

dumptruckman · dumptruckman · commit 004479cf1c08 · 2025-02-03T11:35:34.000-05:00
diff --git a/src/main/groovy/org.mvplugins.jpms.spigot-api.gradle b/src/main/groovy/org.mvplugins.jpms.spigot-api.gradle
@@ -5,10 +5,12 @@ plugins {
 extraJavaModuleInfo {
     module('com.google.code.findbugs:jsr305', 'javax.annotation')
     module('com.google.guava:failureaccess', 'com.google.guava.failureaccess') {
+        overrideModuleName()
         exportAllPackages()
     }
     module('com.google.guava:listenablefuture', 'com.google.guava.listenablefuture')
     module('com.google.j2objc:j2objc-annotations', 'com.google.j2objc.annotations') {
+        preserveExisting()
         exportAllPackages()
     }
     module('com.google.guava:guava', 'com.google.guava') {

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,12 @@ plugins {`
`5`	`5`	`extraJavaModuleInfo {`
`6`	`6`	`module('com.google.code.findbugs:jsr305', 'javax.annotation')`
`7`	`7`	`module('com.google.guava:failureaccess', 'com.google.guava.failureaccess') {`
	`8`	`+ overrideModuleName()`
`8`	`9`	`exportAllPackages()`
`9`	`10`	`}`
`10`	`11`	`module('com.google.guava:listenablefuture', 'com.google.guava.listenablefuture')`
`11`	`12`	`module('com.google.j2objc:j2objc-annotations', 'com.google.j2objc.annotations') {`
	`13`	`+ preserveExisting()`
`12`	`14`	`exportAllPackages()`
`13`	`15`	`}`
`14`	`16`	`module('com.google.guava:guava', 'com.google.guava') {`