Merge pull request #12 from JakeWharton/master

Android 3.2 and Compat Lib v13 Support
simpligility · Jul 18, 2011 · 5bcd86b · 5bcd86b
2 parents 00fd0cf + 482a565
commit 5bcd86b
Show file tree

Hide file tree

Showing 26 changed files with 256 additions and 28 deletions.
diff --git a/README.markdown b/README.markdown
@@ -56,6 +56,10 @@ folder have names like android-3, android-4 and so on. If you find names using t
 
     mvn install -P 3.0
 
+    mvn install -P 3.1
+
+    mvn install -P 3.2
+
 - as a result you should find the android.jar and maps.jar in various versions in your users local repository
   (~/.m2/repository/android and ~/.m2/repository/com/google/android/maps) and you can therefore use the following
   dependencies in your project
@@ -118,6 +122,13 @@ folder have names like android-3, android-4 and so on. If you find names using t
               <scope>provided</scope>
           </dependency>
 
+          <dependency>
+              <groupId>android</groupId>
+              <artifactId>android</artifactId>
+              <version>3.2_r1</version>
+              <scope>provided</scope>
+          </dependency>
+
     for the maps add ons
 
           <dependency>
@@ -176,6 +187,13 @@ folder have names like android-3, android-4 and so on. If you find names using t
               <scope>provided</scope>
           </dependency>
 
+          <dependency>
+              <groupId>com.google.android.maps</groupId>
+              <artifactId>maps</artifactId>
+              <version>13_r1</version>
+              <scope>provided</scope>
+          </dependency>
+
     for the compatibility extra (ATTENTION! Do NOT use provided scope!!)
 
           <dependency>
@@ -184,6 +202,12 @@ folder have names like android-3, android-4 and so on. If you find names using t
               <version>4</version>
           </dependency>
 
+          <dependency>
+              <groupId>android.support</groupId>
+              <artifactId>V13</artifactId>
+              <version>13</version>
+          </dependency>
+
 
 - to install only a specific module use
 

diff --git a/add-ons/google-apis-10/pom.xml b/add-ons/google-apis-10/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -59,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/add-ons/google-apis-11/pom.xml b/add-ons/google-apis-11/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -59,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/add-ons/google-apis-12/pom.xml b/add-ons/google-apis-12/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>

diff --git a/add-ons/google-apis-13/pom.xml b/add-ons/google-apis-13/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.simpligility.android.sdk-deployer</groupId>
+	<artifactId>google-apis-13</artifactId>
+	<packaging>pom</packaging>
+    <name>Android Add-On Google Platform 3.2 API 13</name>
+
+    <parent>
+        <groupId>com.simpligility.android.sdk-deployer</groupId>
+        <artifactId>android-add-ons</artifactId>
+        <version>0.3.4</version>
+    </parent>
+
+    <properties>
+        <jar.simpleVersion>13</jar.simpleVersion>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <goals><goal>install-file</goal></goals>
+                        <configuration>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
+                            <packaging>jar</packaging>
+                            <version>${jar.version}</version>
+                            <file>${jar.path}</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>a</id>
+                        <phase>deploy</phase>
+                        <goals><goal>deploy-file</goal></goals>
+                        <configuration>
+                            <groupId>${addon.googlemaps.groupid}</groupId>
+                            <artifactId>${addon.googlemaps.artifactid}</artifactId>
+                            <packaging>jar</packaging>
+                            <version>${jar.version}</version>
+                            <file>${jar.path}</file>
+                            <url>${repo.url}</url>
+                            <repositoryId>${repo.id}</repositoryId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/add-ons/google-apis-3/pom.xml b/add-ons/google-apis-3/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>

diff --git a/add-ons/google-apis-4/pom.xml b/add-ons/google-apis-4/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>

diff --git a/add-ons/google-apis-7/pom.xml b/add-ons/google-apis-7/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -59,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/add-ons/google-apis-8/pom.xml b/add-ons/google-apis-8/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -59,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/add-ons/google-apis-9/pom.xml b/add-ons/google-apis-9/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-add-ons</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -59,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/add-ons/pom.xml b/add-ons/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
 	    <artifactId>maven-android-sdk-deployer</artifactId>
-	    <version>0.3.3</version>
+	    <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -58,6 +58,7 @@
                 <module>google-apis-10</module>
                 <module>google-apis-11</module>
                 <module>google-apis-12</module>
+                <module>google-apis-13</module>
             </modules>
         </profile>
         <profile>
@@ -108,6 +109,12 @@
                 <module>google-apis-12</module>
             </modules>
         </profile>
+        <profile>
+            <id>3.2</id>
+            <modules>
+                <module>google-apis-13</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>
diff --git a/changelog b/changelog
@@ -1,6 +1,11 @@
 Changelog per release
 ---------------------
 
+0.3.4
+
+ - added support for platform 3.2, api 13
+ - added support for compatibility extras (v13) jar
+
 0.3.3
 
  - added support for platform 3.1, api 12

diff --git a/extras/compatibility-v13/pom.xml b/extras/compatibility-v13/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.simpligility.android.sdk-deployer</groupId>
+	<artifactId>compatibility-v13</artifactId>
+	<packaging>pom</packaging>
+    <name>Android Compatibility Extra V13</name>
+
+    <parent>
+        <groupId>com.simpligility.android.sdk-deployer</groupId>
+        <artifactId>android-extras</artifactId>
+        <version>0.3.4</version>
+    </parent>
+
+    <properties>
+        <jar.path>${sdk.extras.path}/android/compatibility/v13/android-support-v13.jar</jar.path>
+        <android.support.artifactid>V13</android.support.artifactid>
+        <jar.version>13</jar.version>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <goals><goal>install-file</goal></goals>
+                        <configuration>
+                            <groupId>${extras.compatibility.groupid}</groupId>
+                            <artifactId>${android.support.artifactid}</artifactId>
+                            <packaging>jar</packaging>
+                            <version>${jar.version}</version>
+                            <file>${jar.path}</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>a</id>
+                        <phase>deploy</phase>
+                        <goals><goal>deploy-file</goal></goals>
+                        <configuration>
+                            <groupId>${extras.compatibility.groupid}</groupId>
+                            <artifactId>${android.support.artifactid}</artifactId>
+                            <packaging>jar</packaging>
+                            <version>${jar.version}</version>
+                            <file>${jar.path}</file>
+                            <url>${repo.url}</url>
+                            <repositoryId>${repo.id}</repositoryId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extras/compatibility-v4/pom.xml b/extras/compatibility-v4/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-extras</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>
@@ -56,4 +56,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/extras/pom.xml b/extras/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>maven-android-sdk-deployer</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
     <profiles>
         <profile>
@@ -19,6 +19,7 @@
             </activation>
             <modules>
                 <module>compatibility-v4</module>
+                <module>compatibility-v13</module>
             </modules>
         </profile>
     </profiles>

diff --git a/platforms/android-10/pom.xml b/platforms/android-10/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-platforms</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>

diff --git a/platforms/android-11/pom.xml b/platforms/android-11/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-platforms</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>

diff --git a/platforms/android-12/pom.xml b/platforms/android-12/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.simpligility.android.sdk-deployer</groupId>
         <artifactId>android-platforms</artifactId>
-        <version>0.3.3</version>
+        <version>0.3.4</version>
     </parent>
 
     <properties>