From b543b763201431a275e203d4834d75011dad2168 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 27 May 2018 01:02:01 +0100
Subject: Build a universal plugin jar

---
 bungeecord/pom.xml                       | 30 +-----------------------------
 bungeecord/src/main/resources/bungee.yml |  5 +++++
 bungeecord/src/main/resources/plugin.yml |  5 -----
 3 files changed, 6 insertions(+), 34 deletions(-)
 create mode 100644 bungeecord/src/main/resources/bungee.yml
 delete mode 100644 bungeecord/src/main/resources/plugin.yml

(limited to 'bungeecord')

diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml
index c43a510..a8c2db9 100644
--- a/bungeecord/pom.xml
+++ b/bungeecord/pom.xml
@@ -31,34 +31,6 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${shade.version}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <relocations>
-                                <!-- shaded dependencies -->
-                                <relocation>
-                                    <pattern>okio</pattern>
-                                    <shadedPattern>me.lucko.spark.lib.okio</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>okhttp3</pattern>
-                                    <shadedPattern>me.lucko.spark.lib.okhttp3</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -68,7 +40,7 @@
             <groupId>me.lucko</groupId>
             <artifactId>spark-common</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <!-- BungeeCord -->
diff --git a/bungeecord/src/main/resources/bungee.yml b/bungeecord/src/main/resources/bungee.yml
new file mode 100644
index 0000000..d5aede0
--- /dev/null
+++ b/bungeecord/src/main/resources/bungee.yml
@@ -0,0 +1,5 @@
+name: spark
+version: ${project.version}
+description: ${project.description}
+author: Luck, sk89q
+main: me.lucko.spark.bungeecord.SparkBungeeCordPlugin
diff --git a/bungeecord/src/main/resources/plugin.yml b/bungeecord/src/main/resources/plugin.yml
deleted file mode 100644
index d5aede0..0000000
--- a/bungeecord/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: spark
-version: ${project.version}
-description: ${project.description}
-author: Luck, sk89q
-main: me.lucko.spark.bungeecord.SparkBungeeCordPlugin
-- 
cgit