From a85f7540c7f4ac289abba1dc3aa71058bc820b05 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 8 Sep 2016 15:17:45 -0700 Subject: [PATCH] 6277 disable leak canary during instrumenation tests (#6294) * [android] - disable leak canary during instrumentation tests * update leak canary to beta2 --- platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 2b6cefb7b..f247b41b2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -88,8 +88,9 @@ dependencies { compile "com.android.support:recyclerview-v7:${supportLibVersion}" // Leak Canary - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta1' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1' + 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' // Mapbox Android Services compile('com.mapbox.mapboxsdk:mapbox-android-services:1.3.0@aar') { @@ -111,7 +112,6 @@ checkstyle { showViolations true } - def getAccessKeyDeviceFarm() { return hasProperty('AWS_ACCESS_KEY_ID_DEVICE_FARM') ? AWS_ACCESS_KEY_ID_DEVICE_FARM : "" } @@ -150,7 +150,6 @@ devicefarm { } } - android.applicationVariants.all { variant -> def name = variant.buildType.name def checkstyle = project.tasks.create "checkstyle${name.capitalize()}", Checkstyle @@ -162,6 +161,5 @@ android.applicationVariants.all { variant -> project.tasks.getByName("check").dependsOn checkstyle } - apply from: 'gradle-spoon.gradle'