Skip to content

Commit

Permalink
fixed maps install and deployment
Browse files Browse the repository at this point in the history 
added revisions support for maps artifacts
updated documentation in README to all artifacts and correct versions

 Please enter the commit message for your changes. Lines starting
  • Loading branch information
@mosabua
mosabua committed Dec 7, 2009
1 parent 73f8efb commit 821e1c4
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 52 deletions.
29 changes: 20 additions & 9 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,35 @@ How to Use
<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>1.1</version>
<version>1.1_r1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>1.5</version>
<version>1.5_r3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>1.6</version>
<version>1.6_r2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>2.0</version>
<version>2.0_r1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>2.0.1_r1</version>
<scope>provided</scope>
</dependency>

Expand All @@ -52,24 +59,30 @@ How to Use
<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>3-r03</version>
<version>3_r3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>4-r01</version>
<version>4_r1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>5-r01</version>
<version>5_r1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.android.maps</groupId>
<artifactId>maps</artifactId>
<version>6_r1</version>
<scope>provided</scope>
</dependency>

How To Use for Deploying Onto Remote Server
-------------------------------------------
Expand Down Expand Up @@ -104,8 +117,6 @@ For more information about this stuff look at the documentation for the maven-de
Potential todo items
--------------------

- configure clean plugin calls to delete files in local repository, if deemed useful by users

- add automatic download and install of SDK into .m2/repository somewhere, could then use dependency plugin to
pull into target and use from there, problem SDK license agreement

Expand Down
12 changes: 8 additions & 4 deletions add-ons/google-apis-3-r03/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</parent>

<properties>
<jar.path>${sdk.addons.path}/google_apis-3-r03/libs/maps.jar</jar.path>
<jar.version>3-r03</jar.version>
<jar.simpleVersion>3</jar.simpleVersion>
<addon.directory>google_apis-3-r03</addon.directory>
</properties>

<build>
Expand Down Expand Up @@ -43,8 +43,8 @@
<phase>deploy</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${platform.android.groupid}</groupId>
<artifactId>${platform.android.artifactid}</artifactId>
<groupId>${addon.googlemaps.groupid}</groupId>
<artifactId>${addon.googlemaps.artifactid}</artifactId>
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
Expand All @@ -54,6 +54,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
12 changes: 8 additions & 4 deletions add-ons/google-apis-4-r01/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</parent>

<properties>
<jar.path>${sdk.addons.path}/google_apis-4-r01/libs/maps.jar</jar.path>
<jar.version>4-r01</jar.version>
<jar.simpleVersion>4</jar.simpleVersion>
<addon.directory>google_apis-4-r01</addon.directory>
</properties>

<build>
Expand Down Expand Up @@ -43,8 +43,8 @@
<phase>deploy</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${platform.android.groupid}</groupId>
<artifactId>${platform.android.artifactid}</artifactId>
<groupId>${addon.googlemaps.groupid}</groupId>
<artifactId>${addon.googlemaps.artifactid}</artifactId>
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
Expand All @@ -54,6 +54,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
12 changes: 8 additions & 4 deletions add-ons/google-apis-5-r01/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</parent>

<properties>
<jar.simpleVersion>5</jar.simpleVersion>
<!-- careful, path has underscore as nice inconsistency -->
<jar.path>${sdk.addons.path}/google_apis-5_r01/libs/maps.jar</jar.path>
<jar.version>5-r01</jar.version>
<addon.directory>google_apis-5_r01</addon.directory>
</properties>

<build>
Expand Down Expand Up @@ -44,8 +44,8 @@
<phase>deploy</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${platform.android.groupid}</groupId>
<artifactId>${platform.android.artifactid}</artifactId>
<groupId>${addon.googlemaps.groupid}</groupId>
<artifactId>${addon.googlemaps.artifactid}</artifactId>
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
Expand All @@ -55,6 +55,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
12 changes: 8 additions & 4 deletions add-ons/google-apis-6-r01/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</parent>

<properties>
<jar.simpleVersion>6</jar.simpleVersion>
<!-- careful, path has underscore as nice inconsistency -->
<jar.path>${sdk.addons.path}/google_apis-6_r01/libs/maps.jar</jar.path>
<jar.version>6-r01</jar.version>
<addon.directory>google_apis-6_r01</addon.directory>
</properties>

<build>
Expand Down Expand Up @@ -44,8 +44,8 @@
<phase>deploy</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<groupId>${platform.android.groupid}</groupId>
<artifactId>${platform.android.artifactid}</artifactId>
<groupId>${addon.googlemaps.groupid}</groupId>
<artifactId>${addon.googlemaps.artifactid}</artifactId>
<packaging>jar</packaging>
<version>${jar.version}</version>
<file>${jar.path}</file>
Expand All @@ -55,6 +55,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
30 changes: 30 additions & 0 deletions add-ons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,36 @@
<artifactId>maven-android-sdk-deployer</artifactId>
<version>0.3</version>
</parent>

<properties>
<jar.path>${sdk.addons.path}/${addon.directory}/libs/maps.jar</jar.path>
<jar.version>${jar.simpleVersion}_r${Pkg.Revision}</jar.version>
</properties>

<build>
<pluginManagement>
<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.addons.path}/${addon.directory}/source.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>google-apis-3-r03</module>
Expand Down
27 changes: 26 additions & 1 deletion platforms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,32 @@
<jar.path>${jar.directory}/android.jar</jar.path>
<jar.version>${jar.simpleVersion}_r${Pkg.Revision}</jar.version>
</properties>


<build>
<pluginManagement>
<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>${jar.directory}/source.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>android-1.1</module>
<module>android-1.5</module>
Expand Down
26 changes: 0 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,4 @@
<module>platforms</module>
<module>add-ons</module>
</modules>

<build>
<pluginManagement>
<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>${jar.directory}/source.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>

0 comments on commit 821e1c4

Please sign in to comment.