Skip to content

Commit

Permalink
consistent android version for sdk platform, dependencies and maps, p…
Browse files Browse the repository at this point in the history
…lugin updates
  • Loading branch information
mosabua committed Oct 9, 2012
1 parent 59da5bf commit 11b17fc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
10 changes: 5 additions & 5 deletions astroboy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<version>2.2.1</version>
<version>2.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -64,7 +64,7 @@
<dependency> <!-- needed to prevent warnings in robolectric tests -->
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>8_r2</version>
<version>7_r1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand All @@ -82,7 +82,7 @@
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
<sdk>
<platform>9</platform>
<platform>7</platform>
</sdk>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
Expand All @@ -91,7 +91,7 @@

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Expand All @@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<version>1.4</version>
<configuration>
<useAgent>true</useAgent>
<executable>gpg2</executable>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<version>1.4</version>
<configuration>
<useAgent>true</useAgent>
<executable>gpg2</executable>
Expand Down
17 changes: 8 additions & 9 deletions roboguice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version>
<version>1.4</version>
<configuration>
<useAgent>true</useAgent>
<executable>gpg2</executable>
Expand All @@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Expand All @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<version>2.4</version>
<executions>
<execution>
<goals>
Expand All @@ -83,12 +83,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-9</version>
<version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
<version>2.2</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -100,26 +100,25 @@
</executions>
</plugin>
</plugins>

</build>

<dependencies>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<version>2.1_r1</version>
<version>2.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
<version>2.1_r1</version>
<version>2.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>8_r2</version>
<version>7_r1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down

0 comments on commit 11b17fc

Please sign in to comment.