diff --git a/circle.yml b/circle.yml index e7021eb..83ed992 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ machine: dependencies: pre: - - echo y | android update sdk --all --no-ui --force --filter "build-tools-19.0.3,platform-tools,android-18,addon-google_apis-google-18,android-19,extra-android-m2repository" + - echo y | android update sdk --all --no-ui --force --filter "build-tools-19.0.3,platform-tools,android-18,addon-google_apis-google-18,android-22,extra-android-m2repository" - ./install-android-jar.sh - ./install-support-jar.sh - mvn install -f lost/pom.xml -Dmaven.test.skip=true diff --git a/install-android-jar.sh b/install-android-jar.sh index b1c6db0..2fdc39c 100755 --- a/install-android-jar.sh +++ b/install-android-jar.sh @@ -12,14 +12,14 @@ # # Adapted from https://github.com/robolectric/robolectric/blob/master/scripts/install-support-jar.sh -jarLocation="$ANDROID_HOME/platforms/android-19/android.jar" +jarLocation="$ANDROID_HOME/platforms/android-22/android.jar" if [ ! -f "$jarLocation" ]; then - echo "android-19 artifact not found!"; + echo "android-22 artifact not found!"; exit 1; fi echo "Installing android:android from $jarLocation" mvn -q install:install-file -DgroupId=android -DartifactId=android \ - -Dversion=4.4.2_r3 -Dpackaging=jar -Dfile="$jarLocation" + -Dversion=5.1_r1 -Dpackaging=jar -Dfile="$jarLocation" echo "Done!" diff --git a/lost-sample/pom.xml b/lost-sample/pom.xml index 8862e88..d147e03 100644 --- a/lost-sample/pom.xml +++ b/lost-sample/pom.xml @@ -20,9 +20,9 @@ - com.google.android + android android - 4.1.1.4 + 5.1_r1 provided diff --git a/lost/pom.xml b/lost/pom.xml index 81e67d7..013a482 100644 --- a/lost/pom.xml +++ b/lost/pom.xml @@ -15,7 +15,7 @@ android android - 4.4.2_r3 + 5.1_r1 provided