tutorials/Android-Tutorial-Test-ShowCase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR#101 Add static adb fallback

Browse source
This commit is contained in:
Gergely Hegedus 2022-07-13 12:23:44 +03:00
parent ca2dff2304
commit 239f1dd21b
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gradlescripts/pull-screenshots.gradle
View file

@ -20,8 +20,8 @@ def findAdbFromLocal = {
def sdkDir = properties.getProperty('sdk.dir') def sdkDir = properties.getProperty('sdk.dir')
return "$sdkDir/platform-tools/adb" return "$sdkDir/platform-tools/adb"
} else { } else {
System.err.println("WARNING: SDK dir not found by local properties!") System.err.println("WARNING: SDK dir not found by local properties, returning static: $System.env.HOME/Library/Android/sdk/platform-tools/adb")
return null return "$System.env.HOME/Library/Android/sdk/platform-tools/adb"
} }
} }
@ -35,7 +35,11 @@ task pullScreenshots(type: Exec) {
def savePath = propertyOrNull("screenshotsSavePath") ?: "build/testscreenshots/" def savePath = propertyOrNull("screenshotsSavePath") ?: "build/testscreenshots/"
def adb = propertyOrNull("adbPath") ?: findAdbFromLocal() def adb = propertyOrNull("adbPath") ?: findAdbFromLocal()
commandLine "$adb", 'pull', "$fullPath", "$savePath/" try {
commandLine "$adb", 'pull', "$fullPath", "$savePath/"
} catch (Throwable throwable) {
throwable.printStackTrace()
}
} }
task removeScreenshotsFromDevice(type: Exec) { task removeScreenshotsFromDevice(type: Exec) {
@ -47,7 +51,11 @@ task removeScreenshotsFromDevice(type: Exec) {
def fullPath = "/sdcard/Android/data/$packageName/files/Pictures/$screenshotDirectory/" def fullPath = "/sdcard/Android/data/$packageName/files/Pictures/$screenshotDirectory/"
def adb = propertyOrNull("adbPath") ?: findAdbFromLocal() def adb = propertyOrNull("adbPath") ?: findAdbFromLocal()
commandLine "$adb", 'shell', 'rm', '-r', "$fullPath" try {
commandLine "$adb", 'shell', 'rm', '-r', "$fullPath"
} catch (Throwable throwable) {
throwable.printStackTrace()
}
} }
task removeLocalScreenshots(type: Delete) { task removeLocalScreenshots(type: Delete) {