From cda677397032eaa092007a4561b722937562e017 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 5 Nov 2013 23:59:59 -0600 Subject: [PATCH] Update sdk to 19 --- .travis.yml | 18 +++++++++--------- android-aac-enc/build.gradle | 6 +++--- android-aac-enc/project.properties | 2 +- api/build.gradle | 6 +++--- api/project.properties | 2 +- astrid/build.gradle | 8 ++++---- astrid/project.properties | 2 +- astrid/src/main/AndroidManifest.xml | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb418e0e3..91352ef29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,30 +2,30 @@ language: java jdk: oraclejdk7 env: 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: # Install base Android SDK - 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 - - wget http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz - - tar xzf android-sdk_r22.0.5-linux.tgz + - wget http://dl.google.com/android/android-sdk_r22.3-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 # install android build tools - - wget https://dl-ssl.google.com/android/repository/build-tools_r18.1.1-linux.zip - - unzip build-tools_r18.1.1-linux.zip -d $ANDROID_HOME + - wget https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip + - unzip build-tools_r19-linux.zip -d $ANDROID_HOME - 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. # 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 - 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 android-18 --no-ui --force > /dev/null - - echo yes | android update sdk --filter sysimg-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-19 --no-ui --force > /dev/null - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null # Create and start emulator diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle index b7c3d0d00..66395fef1 100644 --- a/android-aac-enc/build.gradle +++ b/android-aac-enc/build.gradle @@ -14,12 +14,12 @@ repositories { } android { - compileSdkVersion 18 - buildToolsVersion "18.1.1" + compileSdkVersion 19 + buildToolsVersion "19" defaultConfig { minSdkVersion 7 - targetSdkVersion 18 + targetSdkVersion 19 } } diff --git a/android-aac-enc/project.properties b/android-aac-enc/project.properties index 7002f279d..8e4bc5fdc 100644 --- a/android-aac-enc/project.properties +++ b/android-aac-enc/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-18 +target=android-19 android.library=true diff --git a/api/build.gradle b/api/build.gradle index b7c3d0d00..66395fef1 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -14,12 +14,12 @@ repositories { } android { - compileSdkVersion 18 - buildToolsVersion "18.1.1" + compileSdkVersion 19 + buildToolsVersion "19" defaultConfig { minSdkVersion 7 - targetSdkVersion 18 + targetSdkVersion 19 } } diff --git a/api/project.properties b/api/project.properties index 6905bdf0a..c57400d00 100644 --- a/api/project.properties +++ b/api/project.properties @@ -9,4 +9,4 @@ android.library=true # Project target. -target=android-18 +target=android-19 diff --git a/astrid/build.gradle b/astrid/build.gradle index 6967e9f77..f9c3fec8d 100644 --- a/astrid/build.gradle +++ b/astrid/build.gradle @@ -22,12 +22,12 @@ repositories { } android { - compileSdkVersion 18 - buildToolsVersion "18.1.1" + compileSdkVersion 19 + buildToolsVersion "19" defaultConfig { minSdkVersion 7 - targetSdkVersion 18 + targetSdkVersion 19 } signingConfigs { @@ -68,7 +68,7 @@ android.applicationVariants.all { variant -> } 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 'net.simonvt.menudrawer:menudrawer:3.0.4@aar' diff --git a/astrid/project.properties b/astrid/project.properties index 1e91dc057..3e8134ff4 100644 --- a/astrid/project.properties +++ b/astrid/project.properties @@ -10,7 +10,7 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-18 +target=android-19 apk-configurations= android.library.reference.1=../api android.library.reference.2=../android-aac-enc diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml index cd63d81da..dcb9f4b67 100644 --- a/astrid/src/main/AndroidManifest.xml +++ b/astrid/src/main/AndroidManifest.xml @@ -73,7 +73,7 @@