From 19fc34b5f43cf3baf6b32403a932940266ddcd69 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 25 Apr 2020 21:03:34 +0100
Subject: Exclude module-info.class from shadowed jar file

Should fix issues with loading on old Forge versions.
---
 spark-fabric/build.gradle    | 4 ++++
 spark-forge/build.gradle     | 4 ++++
 spark-universal/build.gradle | 4 ++++
 spark-velocity/build.gradle  | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 7bee24d..959a6c5 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -43,6 +43,10 @@ shadowJar {
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
 }
 
 task remappedShadowJar(type: RemapJarTask) {
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index 0a3fa8f..c47408b 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -51,6 +51,10 @@ shadowJar {
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
 }
 
 artifacts {
diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle
index 10c6e69..cd5278d 100644
--- a/spark-universal/build.gradle
+++ b/spark-universal/build.gradle
@@ -18,6 +18,10 @@ shadowJar {
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
 }
 
 artifacts {
diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle
index 51c0be8..02286c7 100644
--- a/spark-velocity/build.gradle
+++ b/spark-velocity/build.gradle
@@ -23,6 +23,10 @@ shadowJar {
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
 }
 
 artifacts {
-- 
cgit