ci: update for espresso (#280)

* use java 11

* update

* remove

* cleanup

* remove

* auto

Author: KazuCocoa

ci-jobs/functional/run_appium.yml

@@ -16,6 +16,9 @@ steps:
     mkdir -p test/report
     nohup appium --relaxed-security --log-timestamp --log-no-colors > test/report/appium.out 2>&1 &
   displayName: Run Appium in background
+  env:
+    JAVA_HOME: $(JAVA_HOME_11_X64)
+    PATH: $(JAVA_HOME_11_X64)/bin:$(PATH)
 - script: |
     gem install bundler;
     bundle install --retry=3 --jobs=4 --path vendor/bundle;

ci-jobs/functional/start-emulator.sh

@@ -18,7 +18,7 @@ echo ${ANDROID_HOME}/emulator/emulator -list-avds
 echo "Starting emulator"
 
 # Start emulator in background
-nohup ${ANDROID_HOME}/emulator/emulator -avd testemulator -accel auto -no-boot-anim -no-snapshot > /dev/null 2>&1 &
+nohup ${ANDROID_HOME}/emulator/emulator -avd testemulator -accel auto -no-boot-anim -gpu auto -no-snapshot > /dev/null 2>&1 &
 ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
 
 ${ANDROID_HOME}/platform-tools/adb devices

ci-jobs/functional_test.yml

@@ -5,7 +5,6 @@ parameters:
   xcodeForIOS: 11.5
   xcodeForTVOS: 11.5
   androidSDK: 30
-  androidBuildToolsVersion: '28.0.3'
   appiumVersion: 'beta'
   ignoreVersionSkip: true
   CI: true
@@ -155,7 +154,6 @@ jobs:
       ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -177,7 +175,6 @@ jobs:
       ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -199,7 +196,6 @@ jobs:
       ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -221,7 +217,6 @@ jobs:
       ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -243,7 +238,6 @@ jobs:
       ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -266,7 +260,6 @@ jobs:
       AUTOMATION_NAME_DROID: espresso
       IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
       APPIUM_VERSION: ${{ parameters.appiumVersion }}
-      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
     strategy:
       matrix:
         uiautomator2:
@@ -289,7 +282,6 @@ jobs:
 #      ANDROID_SDK_VERSION: ${{ parameters.androidSDK }}
 #      IGNORE_VERSION_SKIP: ${{ parameters.ignoreVersionSkip }}
 #      APPIUM_VERSION: ${{ parameters.appiumVersion }}
-#      ANDROID_BUILD_TOOLS_VERSION: ${{ parameters.androidBuildToolsVersion }}
 #    strategy:
 #      matrix:
 #        uiautomator2:

test/test_helper.rb

@@ -270,8 +270,6 @@ def android(activity_name = nil)
         }
       }
 
-      cap[:desired_capabilities][:buildToolsVersion] = ENV['ANDROID_BUILD_TOOLS_VERSION'] if ENV['ANDROID_BUILD_TOOLS_VERSION']
-
       # settins in caps should work over Appium 1.13.0
       if cap[:desired_capabilities][:automationName] == 'uiautomator2' && AppiumLibCoreTest.appium_version == 'beta'
         cap[:desired_capabilities]['settings[trackScrollEvents]'] = false