From e7bfa7849e4ed7a80d27b63ac2f504660ecfb14b Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 26 Oct 2016 16:09:51 +0200 Subject: [PATCH] [android] - Update to Android Studio 2.2.2 with tools/dependencies (#6390) * [android] - update android gradle tools, update test app version number, update target sdk to nougat, update support lib versions to latest * new tools generated an aligned test apk, breaks CI integration * update to Nougat release 7.1, update related tooling, update version code test app to 5.0.0. * update wear module * update gradle.properties --- .../android/MapboxGLAndroidSDK/build.gradle | 2 +- .../MapboxGLAndroidSDK/gradle.properties | 8 ++++---- .../MapboxGLAndroidSDKTestApp/build.gradle | 18 +++++++++--------- .../MapboxGLAndroidSDKWearTestApp/build.gradle | 16 ++++++++-------- platform/android/bitrise.yml | 2 +- platform/android/build.gradle | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 3386bd81a..3f50f27d8 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -18,7 +18,7 @@ repositories { } ext { - supportLibVersion = '23.4.0' + supportLibVersion = '25.0.0' } dependencies { diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 6aab98529..b0fdcea7f 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=4.2.0-SNAPSHOT +VERSION_NAME=5.0.0-SNAPSHOT POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native @@ -13,9 +13,9 @@ POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox ANDROID_MIN_SDK=15 -ANDROID_BUILD_TARGET_SDK_VERSION=23 -ANDROID_BUILD_TOOLS_VERSION=23.0.3 -ANDROID_BUILD_SDK_VERSION=23 +ANDROID_BUILD_TARGET_SDK_VERSION=25 +ANDROID_BUILD_TOOLS_VERSION=25.0.0 +ANDROID_BUILD_SDK_VERSION=25 POM_NAME=Mapbox Android SDK POM_ARTIFACT_ID=mapbox-android-sdk diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index f5f4ec3f5..58b3b26b1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -23,19 +23,19 @@ gradle.projectsEvaluated { } ext { - supportLibVersion = '23.4.0' + supportLibVersion = '25.0.0' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.0" defaultConfig { applicationId "com.mapbox.mapboxsdk.testapp" minSdkVersion 15 - targetSdkVersion 23 - versionCode 9 - versionName "4.1.0" + targetSdkVersion 25 + versionCode 11 + versionName "5.0.0" // Specify AndroidJUnitRunner as the default test instrumentation runner testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -101,9 +101,9 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' androidTestCompile "com.android.support:support-annotations:${supportLibVersion}" - androidTestCompile 'com.android.support.test:runner:0.4.1' - androidTestCompile 'com.android.support.test:rules:0.4.1' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' + androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile 'com.android.support.test:rules:0.5' + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestCompile 'com.squareup.spoon:spoon-client:1.6.2' } diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle index 6bd1fac32..6955fa596 100644 --- a/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle @@ -20,15 +20,15 @@ gradle.projectsEvaluated { } android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion 25 + buildToolsVersion "25.0.0" defaultConfig { applicationId "com.mapbox.mapboxsdk.testapp" minSdkVersion 21 - targetSdkVersion 24 - versionCode 1 - versionName "1.0" + targetSdkVersion 25 + versionCode 11 + versionName "5.0.0" } buildTypes { @@ -45,9 +45,9 @@ dependencies { } // Leak Canary - androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' + debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' + releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' + testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.google.android.support:wearable:2.0.0-alpha3' diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index c168a9a6d..699f91c44 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -95,7 +95,7 @@ workflows: echo "Run tests on firebase:" gcloud auth activate-service-account --key-file secret.json --project android-gl-native gcloud beta test android devices list - gcloud beta test android run --type instrumentation --app platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk --test platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug-androidTest-unaligned.apk --device-ids shamu --os-version-ids 22 --locales en --orientations portrait --timeout 15m --test-targets "class com.mapbox.mapboxsdk.testapp.camera.RotateActivityTest" + gcloud beta test android run --type instrumentation --app platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk --test platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug-androidTest.apk --device-ids shamu --os-version-ids 22 --locales en --orientations portrait --timeout 15m --test-targets "class com.mapbox.mapboxsdk.testapp.camera.RotateActivityTest" echo "The details are made available as a zipped build artefact on top of this page." - script: title: Download Firebase results diff --git a/platform/android/build.gradle b/platform/android/build.gradle index aed761c83..05cebc23f 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070' classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2' classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1'