Shade javax.inject to fix possible startup issue on older Spigot vers…

…ions
kejonaMC · Jan 20, 2023 · b4cc151 · b4cc151
1 parent 1ed3766
commit b4cc151
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -39,9 +39,9 @@ dependencies {
     api("org.bstats:bstats-base:3.0.0")
 
     // Required because source and unshaded jars are all mixed up on the opencollab repo currently
-    val baseApi = "2.1.0-20221012.212632-20"
-    val geyserApi = "2.1.0-20221012.212634-20"
-    val geyserCore = "2.1.0-20221012.212644-20"
+    val baseApi = "2.1.0-20221211.182143-60"
+    val geyserApi = "2.1.0-20221211.182145-60"
+    val geyserCore = "2.1.0-20221211.182157-60"
 
     // dependencies for java16 sources (optionally used at runtime)
     java16Implementation("org.geysermc:api:$baseApi")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -33,7 +33,7 @@ dependencyResolutionManagement {
         maven("https://oss.sonatype.org/content/repositories/snapshots") // bungeecord, spigot
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // spigot
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // PlaceholderAPI
-        maven("https://repo.codemc.org/repository/maven-public/") // NBT api
+        maven("https://repo.codemc.io//repository/maven-public/") // NBT api
 
         maven("https://mvn.exceptionflug.de/repository/exceptionflug-public/") // protocolize for proxies
         maven("https://nexus.velocitypowered.com/repository/maven-public/") // velocity

diff --git a/spigot-legacy/build.gradle.kts b/spigot-legacy/build.gradle.kts
@@ -33,7 +33,6 @@ tasks.withType<ShadowJar> {
             (name.startsWith("com.google")
             && !name.startsWith("com.google.inject")
             && !name.startsWith("com.google.guava")) // contains package name of com.google.common
-            || name.startsWith("javax.inject")
         }
     }
 

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
@@ -28,7 +28,6 @@ tasks.withType<ShadowJar> {
             val name = e.name
             name.startsWith("org.yaml") // Available on Spigot
             || (name.startsWith("com.google") && !name.startsWith("com.google.inject"))
-            || name.startsWith("javax.inject")
         }
     }