downgrade android support libs into v23

8 files changed, 37 insertions, 26 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 018294d462..3e52440b3c 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 
 dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile rootProject.ext.dep.supportAppcompatV7
     compile rootProject.ext.dep.supportAnnotations
     compile rootProject.ext.dep.supportV4
     compile rootProject.ext.dep.supportDesign
@@ -9,25 +11,27 @@ dependencies {
     compile(rootProject.ext.dep.lost) {
         exclude group: 'com.google.guava'
     }
-
     // Mapbox Android Services (GeoJSON support)
     compile(rootProject.ext.dep.mapboxJavaGeoJSON) {
         transitive = true
     }
-
-    // Mapbox Android Services (Telemetry support)
-    compile(rootProject.ext.dep.mapboxAndroidTelemetry) {
-        transitive = true
+//     Mapbox Android Services (Telemetry support)
+//        compile(rootProject.ext.dep.mapboxAndroidTelemetry) {
+//            transitive = true
+//        }
+    compile(name: 'libandroid-telemetry', ext: 'aar'){
+        transitive=true
     }
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion 23
+    buildToolsVersion '19.1.0'
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "GIT_REVISION_SHORT", String.format("\"%s\"", getGitRevision())
         buildConfigField "String", "MAPBOX_VERSION_STRING", String.format("\"Mapbox/%s\"", project.VERSION_NAME)
         buildConfigField "String", "MAPBOX_EVENTS_USER_AGENT", String.format("\"MapboxEventsAndroid/%s\"", project.VERSION_NAME)
@@ -106,6 +110,9 @@ android {
     sourceSets {
         // limit amount of exposed library resources
         main.res.srcDirs += 'src/main/res-public'
+        main {
+            jni.srcDirs = []
+        }
     }
 
     compileOptions {
diff --git a/platform/android/MapboxGLAndroidSDK/libs/libandroid-telemetry.aar b/platform/android/MapboxGLAndroidSDK/libs/libandroid-telemetry.aar
new file mode 100644
index 0000000000..3fba63929b
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDK/libs/libandroid-telemetry.aar
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 56b537e2a2..f2af84c9e0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion 23
+    buildToolsVersion '19.1.0'
 
     defaultConfig {
         applicationId "com.mapbox.mapboxsdk.testapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        vectorDrawables.useSupportLibrary = true
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -59,21 +60,17 @@ dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
-
     // Support libraries
     compile rootProject.ext.dep.supportAppcompatV7
     compile rootProject.ext.dep.supportRecyclerView
-
     // Leak Canary
     debugCompile rootProject.ext.dep.leakCanaryDebug
     releaseCompile rootProject.ext.dep.leakCanaryRelease
     testCompile rootProject.ext.dep.leakCanaryTest
-
     // Mapbox Android Services (Java component)
     compile(rootProject.ext.dep.mapboxJavaServices) {
         transitive = true
     }
-
     // Testing dependencies
     testCompile rootProject.ext.dep.junit
     testCompile rootProject.ext.dep.mockito
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 1a70e4548a..5bd2d832f9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -11,7 +11,6 @@
         android:fullBackupContent="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
index 6ac8961421..aecb86333d 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion 23
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "com.mapbox.mapboxsdk.testapp"
@@ -25,22 +25,23 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
-
     // Wear
     compile rootProject.ext.dep.wearCompile
     provided rootProject.ext.dep.wearProvided
-
     // Leak Canary
     debugCompile rootProject.ext.dep.leakCanaryDebug
     releaseCompile rootProject.ext.dep.leakCanaryRelease
     testCompile rootProject.ext.dep.leakCanaryTest
-
     // Testing dependencies
     testCompile rootProject.ext.dep.junit
     testCompile rootProject.ext.dep.mockito
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index bc90896812..d6dd73f79b 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2'
         classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1'
     }
@@ -12,12 +13,18 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        mavenLocal()
         maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url 'https://maven.google.com' }
+        mavenCentral()
+        flatDir {
+            dirs project(':MapboxGLAndroidSDK').file('libs')
+        }
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.2.1'
+    gradleVersion = '2.14.1'
 }
 
 apply from: rootProject.file('dependencies.gradle')
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 5fd2ec3716..698da680d1 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -1,14 +1,14 @@
 ext {
     minSdkVersion = 15
-    targetSdkVersion = 25
-    compileSdkVersion = 25
-    buildToolsVersion = "25.0.2"
+    targetSdkVersion = 23
+    compileSdkVersion = 23
+    buildToolsVersion = "19.1.0"
 
     versionCode = 11
     versionName = "5.0.0"
 
     mapboxServicesVersion = "2.2.0"
-    supportLibVersion = "25.3.1"
+    supportLibVersion = "23.4.0"
     wearableVersion = '2.0.0'
     espressoVersion = '2.2.2'
     testRunnerVersion = '0.5'
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index 1d35abd7b2..78342859a5 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
\ No newline at end of file