Bump Proguard to 4.8 to make things work with Java 7.

This commit is contained in:
Michael Bayne
2012-12-04 16:23:03 -08:00
parent bb61a43a71
commit bfb4b06b30
2 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -111,7 +111,7 @@
</condition> </condition>
<!-- set up the proguard task --> <!-- set up the proguard task -->
<artifact:dependencies pathId="proguard.classpath"> <artifact:dependencies pathId="proguard.classpath">
<dependency groupId="net.sf.proguard" artifactId="proguard" version="4.4"/> <dependency groupId="net.sf.proguard" artifactId="proguard-anttask" version="4.8"/>
</artifact:dependencies> </artifact:dependencies>
<taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/> <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
+6 -5
View File
@@ -121,9 +121,10 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.pyx4me</groupId> <!-- TODO: return to stock groupId when they make it work with 4.5+: com.pyx4me -->
<groupId>com.github.wvengen</groupId>
<artifactId>proguard-maven-plugin</artifactId> <artifactId>proguard-maven-plugin</artifactId>
<version>2.0.4</version> <version>2.0.6</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@@ -133,13 +134,13 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.sf.proguard</groupId> <groupId>net.sf.proguard</groupId>
<artifactId>proguard</artifactId> <artifactId>proguard-base</artifactId>
<version>4.4</version> <version>4.8</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<proguardVersion>4.4</proguardVersion> <proguardVersion>4.8</proguardVersion>
<outputDirectory>${project.build.directory}</outputDirectory> <outputDirectory>${project.build.directory}</outputDirectory>
<outjar>${project.build.finalName}.jar</outjar> <outjar>${project.build.finalName}.jar</outjar>
<injar>${project.build.finalName}.jar</injar> <injar>${project.build.finalName}.jar</injar>