Merge branch 'master' of github.com:AltBeacon/android-beacon-library

AltBeacon · Sep 30, 2016 · 01e5e7d · 01e5e7d
2 parents d1cef03 + a82f2fb
commit 01e5e7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Android Beacon Library
 =======================
 
-[![Build Status](https://snap-ci.com/AltBeacon/android-beacon-library/branch/master/build_image)](https://snap-ci.com/AltBeacon/android-beacon-library/branch/master)
+[![Build Status](https://circleci.com/gh/AltBeacon/android-beacon-library.png?circle-token=4e11fb0dccaa8b98bc67fdbe38b179e4a7d07c27)](https://circleci.com/gh/AltBeacon/android-beacon-library)
 
 An Android library providing APIs to interact with beacons.  Please visit the
 [project website](http://altbeacon.github.io/android-beacon-library/) for how to use this library.

diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,7 @@
+machine:
+  java:
+    version: openjdk8
+dependencies:
+  pre:
+    - echo y | android update sdk --no-ui --all --filter "tools,android-24,build-tools-24.0.2,platform-tools,extra-android-m2repository,extra-google-m2repository"
+