From e7c710a6576b43afa05b01a2880a9f36218d9031 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Tue, 17 Oct 2017 17:35:20 +0200 Subject: [android] - removed unused gradle plugins --- .../android/MapboxGLAndroidSDKTestApp/build.gradle | 3 -- .../gradle-device-farm.gradle | 43 ---------------------- .../MapboxGLAndroidSDKTestApp/gradle-spoon.gradle | 8 ---- platform/android/build.gradle | 2 - platform/android/dependencies.gradle | 1 - 5 files changed, 57 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/gradle-device-farm.gradle delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/gradle-spoon.gradle diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 67939b5144..0bac90d2c2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -70,7 +70,6 @@ dependencies { } // Testing dependencies - androidTestCompile rootProject.ext.dep.testSpoonRunner androidTestCompile rootProject.ext.dep.supportAnnotations androidTestCompile rootProject.ext.dep.testRunner androidTestCompile rootProject.ext.dep.testRules @@ -80,8 +79,6 @@ dependencies { apply from: 'gradle-make.gradle' apply from: 'gradle-config.gradle' -apply from: 'gradle-device-farm.gradle' -apply from: 'gradle-spoon.gradle' apply from: 'gradle-checkstyle.gradle' apply from: '../gradle-lint.gradle' diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-device-farm.gradle b/platform/android/MapboxGLAndroidSDKTestApp/gradle-device-farm.gradle deleted file mode 100644 index 5cb5d75bbb..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-device-farm.gradle +++ /dev/null @@ -1,43 +0,0 @@ -apply plugin: 'devicefarm' - -def getAccessKeyDeviceFarm() { - if (project.hasProperty('AWS_ACCESS_KEY_ID_DEVICE_FARM')) { - return AWS_ACCESS_KEY_ID_DEVICE_FARM - } else { - println("Could not locate AWS_ACCESS_KEY_ID_DEVICE_FARM in gradle.properties") - return "" - } -} - -def getSecretAccessKeyDeviceFarm() { - if (project.hasProperty('AWS_SECRET_ACCESS_KEY_DEVICE_FARM')) { - return AWS_SECRET_ACCESS_KEY_DEVICE_FARM - } else { - println("Could not locate AWS_SECRET_ACCESS_KEY_DEVICE_FARM in gradle.properties") - return "" - } -} - -devicefarm { - - projectName "Mapbox GL Android" // required: Must already exists. - devicePool "sanity" // optional: Defaults to "Top Devices" - - authentication { - accessKey getAccessKeyDeviceFarm() - secretKey getSecretAccessKeyDeviceFarm() - } - - devicestate { - wifi "on" - bluetooth "off" - gps "on" - nfc "on" - latitude 47.6204 // default - longitude - 122.3491 // default - } - - instrumentation { - - } -} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-spoon.gradle b/platform/android/MapboxGLAndroidSDKTestApp/gradle-spoon.gradle deleted file mode 100644 index 7a5b966443..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-spoon.gradle +++ /dev/null @@ -1,8 +0,0 @@ -println "configuring spoon" -apply plugin: 'spoon' -spoon { - // Spoon: distributes instrumentation tests to all your Androids - // for more options see https://github.com/stanfy/spoon-gradle-plugin - grantAllPermissions = true - debug = true -} diff --git a/platform/android/build.gradle b/platform/android/build.gradle index e298b84da8..f3301d0b5a 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -4,8 +4,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2' - classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1' } } diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index 521084559f..0a8278a7b7 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/dependencies.gradle @@ -27,7 +27,6 @@ ext { mockito : 'org.mockito:mockito-core:2.10.0', // instrumentation test - testSpoonRunner : 'com.squareup.spoon:spoon-client:1.7.1', testRunner : "com.android.support.test:runner:${testRunnerVersion}", testRules : "com.android.support.test:rules:${testRunnerVersion}", testEspressoCore : "com.android.support.test.espresso:espresso-core:${espressoVersion}", -- cgit v1.2.1