Skip to content

Commit

Permalink
upgrade to android-maven-plugin 3.2.0
Browse files Browse the repository at this point in the history 
This has been a long time coming - the proguard-handling changed with the
release of 3.0.0, and we've been stuck on an alpha-release ever since...
finally made it on to the modern version!

The exclusions are unfortunately necessary to avoid Dalvik verifier errors
as it freaks out over differently proguard-ed versions of the same class.
  • Loading branch information
@rtyley
rtyley committed May 21, 2012
1 parent b8166f0 commit 1222a40
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 51 deletions.
18 changes: 13 additions & 5 deletions agit-integration-tests/pom.xml
View file
Expand Up @@ -18,25 +18,37 @@
<artifactId>toy-ssh-agent</artifactId>
<!-- Needs to come before Agit -->
<version>1.6</version>
<scope>provided</scope>
<type>apk</type>
</dependency>
<dependency>
<groupId>com.madgag</groupId>
<artifactId>agit</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>apk</type>
</dependency>
<dependency>
<groupId>com.madgag</groupId>
<artifactId>agit</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<scope>provided</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.madgag</groupId>
<artifactId>agit-test-utils</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.madgag</groupId>
<artifactId>org.eclipse.jgit</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
Expand Down Expand Up @@ -108,10 +120,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.pyx4me</groupId>
<artifactId>proguard-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
Expand Down
4 changes: 0 additions & 4 deletions agit/pom.xml
View file
Expand Up @@ -150,10 +150,6 @@
</androidManifestFile>
</configuration>
</plugin>
<plugin>
<groupId>com.pyx4me</groupId>
<artifactId>proguard-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
44 changes: 2 additions & 42 deletions pom.xml
View file
Expand Up @@ -110,18 +110,13 @@
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.0.0-alpha-14</version>
<version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<dex>
<jvmArguments>
<jvmArgument>-Xms256m</jvmArgument>
<jvmArgument>-Xmx512m</jvmArgument>
</jvmArguments>
</dex>
<sdk>
<platform>14</platform>
</sdk>
<proguardConfig>../proguard.cfg</proguardConfig>
<zipalign>
<verbose>true</verbose>
</zipalign>
Expand All @@ -136,41 +131,6 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>com.pyx4me</groupId>
<artifactId>proguard-maven-plugin</artifactId>
<version>2.0.4</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>proguard</goal>
</goals>
</execution>
</executions>
<!-- we need to override the dependency of the plugin to get a newer version of proguard -->
<dependencies>
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard</artifactId>
<version>4.4</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<proguardVersion>4.4</proguardVersion>
<maxMemory>512m</maxMemory>
<injar>android-classes</injar>
<libs>
<lib>${rt.jar.path}</lib>
<lib>${jsse.jar.path}</lib>
</libs>
<obfuscate>false</obfuscate>
<addMavenDescriptor>false</addMavenDescriptor>
<proguardInclude>../proguard.cfg</proguardInclude>
<!-- sadly, relative to sub-modules -->
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down

0 comments on commit 1222a40

Please sign in to comment.