Update to Android API 23 for Android M

Closes #2104

5 files changed, 19 insertions, 22 deletions

diff --git a/.travis.yml b/.travis.yml
index 79f328e25b..b427353189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,28 +33,28 @@ matrix:
     - os: linux
       env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
       android:
-        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+        components: [ 'build-tools-23', 'android-23', 'extra' ]
       addons:
         apt:
           packages: [ 'lib32stdc++6' ]
     - os: linux
       env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug
       android:
-        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+        components: [ 'build-tools-23', 'android-23', 'extra' ]
       addons:
         apt:
           packages: [ 'lib32stdc++6' ]
     - os: linux
       env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release
       android:
-        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+        components: [ 'build-tools-23', 'android-23', 'extra' ]
       addons:
         apt:
           packages: [ 'lib32stdc++6' ]
     - os: linux
       env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release
       android:
-        components: [ 'build-tools-22.0.1', 'android-22', 'extra' ]
+        components: [ 'build-tools-23', 'android-23', 'extra' ]
       addons:
         apt:
           packages: [ 'lib32stdc++6' ]
diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index 197fa05dfe..b749765eb3 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
@@ -28,11 +28,11 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-annotations:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:support-annotations:23.0.0'
+    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:design:23.0.0'
     compile 'com.squareup.okhttp:okhttp:2.4.0'
     compile 'com.mapzen.android:lost:1.0.1'
-    compile 'com.android.support:design:22.2.1'
 }
 
 android {
diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties
index 8ba98ea4f1..a441dfd27c 100644
--- a/android/java/MapboxGLAndroidSDK/gradle.properties
+++ b/android/java/MapboxGLAndroidSDK/gradle.properties
@@ -13,9 +13,9 @@ POM_DEVELOPER_ID=mapbox
 POM_DEVELOPER_NAME=Mapbox
 
 ANDROID_MIN_SDK=8
-ANDROID_BUILD_TARGET_SDK_VERSION=22
-ANDROID_BUILD_TOOLS_VERSION=22.0.1
-ANDROID_BUILD_SDK_VERSION=22
+ANDROID_BUILD_TARGET_SDK_VERSION=23
+ANDROID_BUILD_TOOLS_VERSION=23
+ANDROID_BUILD_SDK_VERSION=23
 
 POM_NAME=Mapbox GL Android SDK
 POM_ARTIFACT_ID=mapbox-gl-android-sdk
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index 0231a8c6ea..0a9b19bc95 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
         classpath 'io.fabric.tools:gradle:1.+'
     }
@@ -38,8 +38,8 @@ gradle.projectsEvaluated {
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23"
 
     repositories {
         mavenCentral()
@@ -48,7 +48,7 @@ android {
     defaultConfig {
         applicationId "com.mapbox.mapboxgl.testapp"
         minSdkVersion 8
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 4
         versionName "0.1.3"
     }
@@ -82,10 +82,10 @@ dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
-    compile 'com.android.support:support-annotations:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile('com.crashlytics.sdk.android:crashlytics:2.5.0@aar') {
+    compile 'com.android.support:support-annotations:23.0.0'
+    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile('com.crashlytics.sdk.android:crashlytics:2.5.1@aar') {
         transitive = true;
     }
 }
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index fa21e4a121..f9514654da 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -2,9 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.mapboxgl.testapp">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
     <application
         android:allowBackup="false"
         android:icon="@drawable/icon_burned"