Skip to content
This repository has been archived by the owner on Apr 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #20 from mapzen/chuck/udpate-android-sdk-version
Browse files Browse the repository at this point in the history
Updates Android SDK dependency to latest version (5.1)
  • Loading branch information
Baldur Gudbjornsson committed Mar 20, 2015
2 parents 83fde12 + eb4d4a0 commit 9447516
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions install-android-jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
4 changes: 2 additions & 2 deletions lost-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</dependency>

<dependency>
<groupId>com.google.android</groupId>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>4.1.1.4</version>
<version>5.1_r1</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion lost/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>4.4.2_r3</version>
<version>5.1_r1</version>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit 9447516

Please sign in to comment.