Update sdk to 19

pull/46/merge
Alex Baker 11 years ago
parent bf654a8de4
commit cda6773970

@ -2,30 +2,30 @@ language: java
jdk: oraclejdk7 jdk: oraclejdk7
env: env:
matrix: matrix:
- ANDROID_SDKS=android-18,sysimg-18 ANDROID_TARGET=android-18 ANDROID_ABI=armeabi-v7a - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
before_install: before_install:
# Install base Android SDK # Install base Android SDK
- sudo apt-get update -qq - 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 > /dev/null; fi - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
- wget http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz - wget http://dl.google.com/android/android-sdk_r22.3-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 ANDROID_HOME=$PWD/android-sdk-linux
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
# install android build tools # install android build tools
- wget https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-linux.zip - wget https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip
- unzip build-tools_r18.1.1-linux.zip -d $ANDROID_HOME - unzip build-tools_r19-linux.zip -d $ANDROID_HOME
- mkdir -p $ANDROID_HOME/build-tools/ - mkdir -p $ANDROID_HOME/build-tools/
- mv $ANDROID_HOME/android-4.3.1 $ANDROID_HOME/build-tools/18.1.1 - mv $ANDROID_HOME/android-4.4 $ANDROID_HOME/build-tools/19
# Install required components. # Install required components.
# For a full list, run `android list sdk -a --extended` # For a full list, run `android list sdk -a --extended`
# Note that sysimg-18 downloads the ARM, x86 and MIPS images (we should optimize this). # Note that sysimg-19 downloads the ARM, x86 and MIPS images (we should optimize this).
# Other relevant API's # Other relevant API's
- echo yes | android update sdk --filter tools --no-ui --force > /dev/null - echo yes | android update sdk --filter tools --no-ui --force > /dev/null
- echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null - 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 --no-ui --force > /dev/null
- echo yes | android update sdk --filter sysimg-18 --no-ui --force > /dev/null - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
- echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
# Create and start emulator # Create and start emulator

@ -14,12 +14,12 @@ repositories {
} }
android { android {
compileSdkVersion 18 compileSdkVersion 19
buildToolsVersion "18.1.1" buildToolsVersion "19"
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
} }

@ -8,5 +8,5 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-18 target=android-19
android.library=true android.library=true

@ -14,12 +14,12 @@ repositories {
} }
android { android {
compileSdkVersion 18 compileSdkVersion 19
buildToolsVersion "18.1.1" buildToolsVersion "19"
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
} }

@ -9,4 +9,4 @@
android.library=true android.library=true
# Project target. # Project target.
target=android-18 target=android-19

@ -22,12 +22,12 @@ repositories {
} }
android { android {
compileSdkVersion 18 compileSdkVersion 19
buildToolsVersion "18.1.1" buildToolsVersion "19"
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
signingConfigs { signingConfigs {
@ -68,7 +68,7 @@ android.applicationVariants.all { variant ->
} }
dependencies { dependencies {
compile 'com.android.support:support-v4:18.0.0' compile 'com.android.support:support-v4:19.0.+'
compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
compile 'net.simonvt.menudrawer:menudrawer:3.0.4@aar' compile 'net.simonvt.menudrawer:menudrawer:3.0.4@aar'

@ -10,7 +10,7 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-18 target=android-19
apk-configurations= apk-configurations=
android.library.reference.1=../api android.library.reference.1=../api
android.library.reference.2=../android-aac-enc android.library.reference.2=../android-aac-enc

@ -73,7 +73,7 @@
<!-- ========================================================== Metadata = --> <!-- ========================================================== Metadata = -->
<uses-sdk <uses-sdk
android:targetSdkVersion="18" android:targetSdkVersion="19"
android:minSdkVersion="7" /> android:minSdkVersion="7" />
<supports-screens <supports-screens

Loading…
Cancel
Save