From c1bad723dbda2d350b3d513c1623ea6f42d984f5 Mon Sep 17 00:00:00 2001
From: "Manfred Moser (mosabua)" <manfred@mosabuam.com>
Date: Sun, 17 Jul 2011 23:46:56 -0700
Subject: [PATCH] changed GAV coordinates for compatibility extras to better
 reflect usage    and also added reading of properties file so that GAV can
 use revision as    package number

---
 README.markdown                  | 297 ++++++++++++++++---------------
 changelog                        |   3 +
 extras/compatibility-v13/pom.xml |   4 +-
 extras/compatibility-v4/pom.xml  |   4 +-
 extras/pom.xml                   |  22 +++
 pom.xml                          |   1 +
 6 files changed, 180 insertions(+), 151 deletions(-)

diff --git a/README.markdown b/README.markdown
index 752fde3e..69421571 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,10 +3,11 @@ Maven Android SDK Deployer
 
 Author: Manfred Moser manfred@simpligility.com  at [simpligility technologies inc](http://www.simpligility.com)
 
-
 ATTENTION!
-Currently android.jar artifacts are available in Maven central and unless you use maps related dependencies or insist on
-using the original jar files from the local SDK install, you will not need this tool anymore.
+Currently android.jar artifacts are available in Maven central and unless you
+ use maps related dependencies or the compatibility library jar files or
+ insist on using the original jar files from the local SDK install,
+ you will not need this tool anymore.
 
 You will however need this tool to access the latest Android 2.3 release or to work around bugs like missing JSON libraries
 in some older artifacts deployed to Maven central. If you  use this tool make sure your dependencies are as documented here.
@@ -60,153 +61,154 @@ folder have names like android-3, android-4 and so on. If you find names using t
 
     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
+- 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 ) and you can therefore use the
+  following dependencies in your project
 
   for the core platforms
 
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>1.5_r4</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>1.6_r3</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>2.1_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>2.2_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>2.3.1_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>2.3.3_r1</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>3.0_r1</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>android</groupId>
-              <artifactId>android</artifactId>
-              <version>3.1_r1</version>
-              <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>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>3_r3</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>4_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>7_r1</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>8_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>9_r2</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>10_r1</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>11_r1</version>
-              <scope>provided</scope>
-          </dependency>
-
-          <dependency>
-              <groupId>com.google.android.maps</groupId>
-              <artifactId>maps</artifactId>
-              <version>12_r1</version>
-              <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>
-              <groupId>android.support</groupId>
-              <artifactId>V4</artifactId>
-              <version>4</version>
-          </dependency>
-
-          <dependency>
-              <groupId>android.support</groupId>
-              <artifactId>V13</artifactId>
-              <version>13</version>
-          </dependency>
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>1.5_r4</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>1.6_r3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>2.1_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>2.2_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>2.3.1_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>2.3.3_r1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>3.0_r1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>android</groupId>
+      <artifactId>android</artifactId>
+      <version>3.1_r2</version>
+      <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>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>3_r3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>4_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>7_r1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>8_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>9_r2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>10_r1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>11_r1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.android.maps</groupId>
+      <artifactId>maps</artifactId>
+      <version>12_r1</version>
+      <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>
+      <groupId>android.support</groupId>
+      <artifactId>compatibility-v4</artifactId>
+      <version>r3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>android.support</groupId>
+      <artifactId>compatibility-v13</artifactId>
+      <version>r3</version>
+    </dependency>
 
 
 - to install only a specific module use
@@ -307,3 +309,4 @@ Additional Contributors
 -----------------------
 
 Hugo Josefson <hugo@josefson.org> - properties plugin usage
+Jake Wharton <jakewharton@gmail.com> - 3.2 and compatibility v13 support
diff --git a/changelog b/changelog
index 7c57f7a8..0abd94cd 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ Changelog per release
 
  - added support for platform 3.2, api 13
  - added support for compatibility extras (v13) jar
+ - changed GAV coordinates for compatibility extras to better reflect usage
+   and also added reading of properties file so that GAV can use revision as
+   package number
 
 0.3.3
 
diff --git a/extras/compatibility-v13/pom.xml b/extras/compatibility-v13/pom.xml
index 38fbe4a8..9e49a581 100644
--- a/extras/compatibility-v13/pom.xml
+++ b/extras/compatibility-v13/pom.xml
@@ -14,8 +14,8 @@
 
     <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>
+        <android.support.artifactid>compatibility-v13</android.support.artifactid>
+        <jar.version>r${Pkg.Revision}</jar.version>
     </properties>
     <build>
         <plugins>
diff --git a/extras/compatibility-v4/pom.xml b/extras/compatibility-v4/pom.xml
index e84bd3a2..26b86713 100644
--- a/extras/compatibility-v4/pom.xml
+++ b/extras/compatibility-v4/pom.xml
@@ -14,8 +14,8 @@
 
     <properties>
         <jar.path>${sdk.extras.path}/android/compatibility/v4/android-support-v4.jar</jar.path>
-        <android.support.artifactid>V4</android.support.artifactid>
-        <jar.version>4</jar.version>
+        <android.support.artifactid>compatibility-v4</android.support.artifactid>
+        <jar.version>r${Pkg.Revision}</jar.version>
     </properties>
     <build>
         <plugins>
diff --git a/extras/pom.xml b/extras/pom.xml
index cf2fd63b..dc03c3f2 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -11,6 +11,28 @@
         <artifactId>maven-android-sdk-deployer</artifactId>
         <version>0.3.4</version>
     </parent>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <version>1.0-alpha-2</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>read-project-properties</goal>
+            </goals>
+            <configuration>
+              <files>
+                <file>${sdk.extras.compatibility.path}/source.properties</file>
+              </files>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
     <profiles>
         <profile>
             <id>all</id>
diff --git a/pom.xml b/pom.xml
index 816a2347..222d2a6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
         <sdk.platforms.path>${android.sdk.path}/platforms</sdk.platforms.path>
         <sdk.addons.path>${android.sdk.path}/add-ons</sdk.addons.path>
         <sdk.extras.path>${android.sdk.path}/extras</sdk.extras.path>
+        <sdk.extras.compatibility.path>${sdk.extras.path}/android/compatibility</sdk.extras.compatibility.path>
         <platform.android.groupid>android</platform.android.groupid>
         <platform.android.artifactid>android</platform.android.artifactid>
         <addon.googlemaps.groupid>com.google.android.maps</addon.googlemaps.groupid>