Build with Android API level 19.

openxc · Nov 23, 2013 · ffb15bc · ffb15bc
1 parent 18cafbe
commit ffb15bc
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,11 @@ before_install:
   - sudo apt-get update -qq
   - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
   - wget http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
-  - tar xzf android-sdk_r22.0.5-linux.tgz
+  - tar xzf android-sdk_r22.3-linux.tgz
   - export ANDROID_HOME=$PWD/android-sdk-linux
   - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-18 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter android-19,extra-android-support,extra-android-m2repository,platform-tools --no-ui --force > /dev/null
+  - cp -R $ANDROID_HOME/extras/android/m2repository/com ~/.m2/repository
 install:
   - mvn install -DskipTests=true
 notifications:

diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd
@@ -1,5 +1,9 @@
 # OpenXC Android Library Changelog
 
+## v5.1.2-dev
+
+* Building with Android API 19
+
 ## v5.1.1
 
 * Fix lifecycle issues with VehicleService from Enabler app.

diff --git a/README.mkd b/README.mkd
@@ -40,7 +40,7 @@ SDK's top-level directory (e.g. `/home/user/android-sdk`.
 You must manually copy the Maven artifacts from this folder to your local
 repository:
 
-    sdk/ $ cp -R extras/android/m2repository/com ~/.m2/repository
+    $ cp -R $ANDROID_HOME/extras/android/m2repository/com ~/.m2/repository
 
 After satisfying those requirements, the build is pretty simple:
 

diff --git a/enabler/AndroidManifest.xml b/enabler/AndroidManifest.xml
@@ -13,7 +13,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
   <uses-feature android:name="android.hardware.usb.host"
           android:required="true" />
-  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
+  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 
   <application android:label="@string/app_name" android:allowBackup="true"
             android:icon="@drawable/open_xc_launcher_icon_black"

diff --git a/enabler/project.properties b/enabler/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=../openxc
diff --git a/openxc-it/AndroidManifest.xml b/openxc-it/AndroidManifest.xml
@@ -15,7 +15,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
   <uses-feature android:name="android.hardware.usb.host"
           android:required="true" />
-  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
+  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 
   <application android:label="@string/app_name" android:allowBackup="false"
           android:debuggable="true">

diff --git a/openxc-it/project.properties b/openxc-it/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=../openxc
diff --git a/openxc/AndroidManifest.xml b/openxc/AndroidManifest.xml
@@ -9,5 +9,5 @@
           <action android:name="com.openxc.remote.VehicleServiceInterface" />
       </intent-filter>
   </service>
-  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
+  <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 </manifest>
diff --git a/openxc/libs/support-v4-18.0.0.jar → openxc/libs/support-v4-19.0.0.jar b/openxc/libs/support-v4-18.0.0.jar → openxc/libs/support-v4-19.0.0.jar
diff --git a/openxc/pom.xml b/openxc/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.android.support</groupId>
             <artifactId>support-v4</artifactId>
-            <version>18.0.0</version>
+            <version>19.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/openxc/project.properties b/openxc/project.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-18
+target=android-19
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <android.version>4.1.1.4</android.version>
-        <android.platform>18</android.platform>
+        <android.platform>19</android.platform>
 
         <java.version>1.6</java.version>
         <android-maven.version>3.8.0</android-maven.version>