Skip to content
Browse files

More pom updates for simplification.

  • Loading branch information...
1 parent 1cf63e6 commit 51ee9b177a1e7d0604366bcad00e1d8687759cf6 @JakeWharton committed
Showing with 13 additions and 143 deletions.
  1. BIN debug.keystore
  2. +13 −29 pom.xml
  3. +0 −22 samples/demos/pom.xml
  4. +0 −22 samples/fragments/pom.xml
  5. +0 −22 samples/known-bugs/pom.xml
  6. +0 −25 samples/roboguice/pom.xml
  7. +0 −23 samples/styled/pom.xml
View
BIN debug.keystore
Binary file not shown.
View
42 pom.xml
@@ -65,8 +65,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <apk.prefix>actionbarsherlock</apk.prefix>
-
<java.version>1.6</java.version>
<android.version>4.0.1.2</android.version>
<android.platform>14</android.platform>
@@ -91,7 +89,16 @@
<artifactId>support-v4</artifactId>
<version>${android-support.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.nineoldandroids</groupId>
+ <artifactId>library</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.rtyley</groupId>
+ <artifactId>roboguice-sherlock</artifactId>
+ <version>1.4</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -114,43 +121,20 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- </plugin>
-
- <plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
- <version>${android-maven.version}</version>
- <extensions>true</extensions>
+ <version>3.3.2</version>
<configuration>
<sdk>
<platform>${android.platform}</platform>
</sdk>
- <sign>
- <debug>false</debug>
- </sign>
- <undeployBeforeDeploy>true</undeployBeforeDeploy>
- <zipalign>
- <inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
- <outputApk>${project.build.directory}/${apk.prefix}-${project.artifactId}-${project.version}.apk</outputApk>
- </zipalign>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <archive>${project.build.directory}/${apk.prefix}-${project.artifactId}-${project.version}.apk</archive>
- <alias>ActionBarSherlock</alias>
- <keypass>ActionBarSherlock</keypass>
- <storepass>ActionBarSherlock</storepass>
- <!-- Is always run from samples/xxx/ directory. -->
- <keystore>../../debug.keystore</keystore>
- </configuration>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
</plugin>
<plugin>
View
22 samples/demos/pom.xml
@@ -31,34 +31,12 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>zipalign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
View
22 samples/fragments/pom.xml
@@ -31,34 +31,12 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>zipalign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
View
22 samples/known-bugs/pom.xml
@@ -31,34 +31,12 @@
<build>
<sourceDirectory>src</sourceDirectory>
- <finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>zipalign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
View
25 samples/roboguice/pom.xml
@@ -27,45 +27,20 @@
<version>${project.version}</version>
<type>apklib</type>
</dependency>
-
- <!-- https://github.com/rtyley/roboguice-sherlock -->
<dependency>
<groupId>com.github.rtyley</groupId>
<artifactId>roboguice-sherlock</artifactId>
- <version>1.4</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
- <finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>zipalign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
View
23 samples/styled/pom.xml
@@ -30,40 +30,17 @@
<dependency>
<groupId>com.nineoldandroids</groupId>
<artifactId>library</artifactId>
- <version>2.4.0</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
- <finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>zipalign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>

0 comments on commit 51ee9b1

Please sign in to comment.
Something went wrong with that request. Please try again.