Break out ProGuard to MassiveCoreXlibGuava, renames and tweaks

This commit is contained in:
Olof Larsson 2017-12-21 18:13:28 +01:00
parent 81f11443f7
commit 0742181a65

46
pom.xml
View File

@ -34,6 +34,8 @@
<massiveMavenCompilerPluginVersion>3.7.0</massiveMavenCompilerPluginVersion> <massiveMavenCompilerPluginVersion>3.7.0</massiveMavenCompilerPluginVersion>
<massiveMavenJarPluginVersion>3.0.2</massiveMavenJarPluginVersion> <massiveMavenJarPluginVersion>3.0.2</massiveMavenJarPluginVersion>
<massiveMavenShadePluginVersion>3.1.0</massiveMavenShadePluginVersion> <massiveMavenShadePluginVersion>3.1.0</massiveMavenShadePluginVersion>
<massiveMavenProGuardPluginVersion>2.0.14</massiveMavenProGuardPluginVersion>
<massiveMavenProGuardVersion>5.3.3</massiveMavenProGuardVersion>
<!-- ~~~~~~~~~~~~~~~~~ --> <!-- ~~~~~~~~~~~~~~~~~ -->
<!-- External Versions --> <!-- External Versions -->
@ -251,6 +253,32 @@
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>${massiveMavenShadePluginVersion}</version> <version>${massiveMavenShadePluginVersion}</version>
</plugin> </plugin>
<!-- ProGuard -->
<plugin>
<groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId>
<version>${massiveMavenProGuardPluginVersion}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>proguard</goal>
</goals>
</execution>
</executions>
<configuration>
<proguardVersion>${massiveMavenProGuardVersion}</proguardVersion>
<proguardInclude>${basedir}/proguard.conf</proguardInclude>
<dependencies>
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard-base</artifactId>
<version>${massiveMavenProGuardVersion}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</configuration>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
@ -805,6 +833,18 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.massivecraft.massivecore</groupId>
<artifactId>MassiveCoreXlib</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.massivecraft.massivecore</groupId>
<artifactId>MassiveCoreXlibGuava</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.massivecraft.massivedisguises</groupId> <groupId>com.massivecraft.massivedisguises</groupId>
<artifactId>MassiveDisguises</artifactId> <artifactId>MassiveDisguises</artifactId>
@ -973,12 +1013,6 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.massivecraft.massivecore</groupId>
<artifactId>MassiveXlib</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.massivecraft.vampire</groupId> <groupId>com.massivecraft.vampire</groupId>
<artifactId>Vampire</artifactId> <artifactId>Vampire</artifactId>