Use Android 5.0 SDK when building with Maven.

Fixed #205.
openxc · Nov 13, 2014 · 5701e61 · 5701e61
1 parent 4b6552c
commit 5701e61
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ android:
 before_install:
   - mkdir -p ~/.m2/repository
   - cp -R $ANDROID_HOME/extras/android/m2repository/com ~/.m2/repository
+  - git clone https://github.com/mosabua/maven-android-sdk-deployer.git
+  - pushd maven-android-sdk-deployer; mvn install -P 5.0; popd
 install:
   - mvn clean install -DskipTests=true -pl openxc -am
 script:

diff --git a/README.mkd b/README.mkd
@@ -48,11 +48,21 @@ emulator):
 
 The build requires [Maven](http://maven.apache.org/download.html)
 v3.0.3+ and the [Android SDK](http://developer.android.com/sdk/index.html)
-to be installed in your development environment. In addition you'll need to set
-the `ANDROID_HOME` environment variable to the location of your SDK:
+to be installed in your development environment.
+
+Set the `ANDROID_HOME` environment variable to the location of your SDK:
 
     export ANDROID_HOME=/opt/tools/android-sdk
 
+Clone the maven-android-sdk-deployer tool and install the SDK to your local
+Maven repository for the latest SDK:
+
+    $ git clone git@github.com:mosabua/maven-android-sdk-deployer.git
+    $ cd maven-android-sdk-deployer
+    $ mvn install -P 5.0
+
+### Support Library
+
 You also need the Android support library, but unfortunately Google doesn't
 deploy the latest versions of this to the the Central Maven repository. Instead,
 you must open the Android SDK manager and install the "Android Support

diff --git a/enabler/pom.xml b/enabler/pom.xml
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.android</groupId>
+            <groupId>android</groupId>
             <artifactId>android</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/openxc-it/pom.xml b/openxc-it/pom.xml
@@ -13,7 +13,7 @@
     <description>Instrumentation test suite for OpenXC library</description>
     <dependencies>
         <dependency>
-            <groupId>com.google.android</groupId>
+            <groupId>android</groupId>
             <artifactId>android</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/openxc/pom.xml b/openxc/pom.xml
@@ -18,7 +18,7 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.android</groupId>
+            <groupId>android</groupId>
             <artifactId>android</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <android.version>4.1.1.4</android.version>
+        <android.version>5.0_r1</android.version>
         <android.platform>21</android.platform>
 
         <java.version>1.7</java.version>
@@ -48,14 +48,14 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.google.android</groupId>
+                <groupId>android</groupId>
                 <artifactId>android</artifactId>
                 <version>${android.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.android</groupId>
                 <artifactId>android-test</artifactId>
-                <version>${android.version}</version>
+                <version>4.1.1.4</version>
             </dependency>
           <dependency>
               <groupId>com.google.guava</groupId>