diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-20 10:20:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 10:20:26 +0200 |
| commit | 76f91cc88d5e2c19bcac3e1421bd13b510e21979 (patch) | |
| tree | a18094f320d7894e9472fd83c5d53ede64878b82 | |
| parent | 61a534241f7b2a8e53825a5ed8474c11fea4ee04 (diff) | |
| download | qtlocation-mapboxgl-76f91cc88d5e2c19bcac3e1421bd13b510e21979.tar.gz | |
[android] - configures AWS Device farm plugin from testapp. (#6750)
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 20 | ||||
| -rw-r--r-- | platform/android/bitrise.yml | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 859740e212..f5f4ec3f54 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -113,11 +113,21 @@ checkstyle { } def getAccessKeyDeviceFarm() { - return hasProperty('AWS_ACCESS_KEY_ID_DEVICE_FARM') ? AWS_ACCESS_KEY_ID_DEVICE_FARM : "" + 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() { - return hasProperty('AWS_SECRET_ACCESS_KEY_DEVICE_FARM') ? AWS_SECRET_ACCESS_KEY_DEVICE_FARM : "" + 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 { @@ -130,10 +140,7 @@ devicefarm { secretKey getSecretAccessKeyDeviceFarm() } - // optional block, radios default to 'on' state, all parameters optional devicestate { - ///extraDataZipFile file("path/to/zip") // or ‘null’ if you have no extra data. Default is null. - //auxiliaryApps files(file("path/to/app"), file("path/to/app2")) // or ‘files()’ if you have no auxiliary apps. Default is an empty list. wifi "on" bluetooth "off" gps "on" @@ -142,9 +149,6 @@ devicefarm { longitude - 122.3491 // default } - // Instrumentation - // optional filter "my-filter" - // See AWS Developer docs instrumentation { } diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index 5fe160214b..9e4ffd60dd 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -130,9 +130,8 @@ workflows: curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash - sudo apt-get install -y pkg-config nodejs cmake - echo "AWS_ACCESS_KEY_ID_DEVICE_FARM=$AWS_ACCESS_KEY_ID_DEVICE_FARM - AWS_SECRET_ACCESS_KEY_DEVICE_FARM=$AWS_SECRET_ACCESS_KEY_DEVICE_FARM" - >> platform/android/MapboxGLAndroidSDK/gradle.properties + echo "AWS_ACCESS_KEY_ID_DEVICE_FARM=$AWS_ACCESS_KEY_ID_DEVICE_FARM" >> platform/android/MapboxGLAndroidSDKTestApp/gradle.properties + echo "AWS_SECRET_ACCESS_KEY_DEVICE_FARM=$AWS_SECRET_ACCESS_KEY_DEVICE_FARM" >> platform/android/MapboxGLAndroidSDKTestApp/gradle.properties export BUILDTYPE=Release make apackage |