diff --git a/.gitignore b/.gitignore index 89f914522b..a597d9eb59 100644 --- a/.gitignore +++ b/.gitignore @@ -102,7 +102,7 @@ coverage mattermost-license.txt *.mattermost-license detox/artifacts -detox/detox_pixel_4_xl_api_30 +detox/detox_pixel_* # Bundle artifact *.jsbundle diff --git a/detox/.detoxrc.json b/detox/.detoxrc.json index fb7bc86c14..5a03db58c8 100644 --- a/detox/.detoxrc.json +++ b/detox/.detoxrc.json @@ -36,7 +36,7 @@ "android.emulator": { "type": "android.emulator", "device": { - "avdName": "detox_pixel_4_xl_api_30" + "avdName": "detox_pixel_4_xl_api_31" } } }, diff --git a/detox/android_emulator/config.ini b/detox/android_emulator/config.ini index bd7703f6f2..7cae4642b6 100644 --- a/detox/android_emulator/config.ini +++ b/detox/android_emulator/config.ini @@ -1,7 +1,7 @@ -AvdId = Detox_Pixel_4_XL_API_30 +AvdId = Detox_Pixel_4_XL_API_31 PlayStore.enabled = false -abi.type = x86 -avd.ini.displayname = Detox Pixel 4 XL API 30 +abi.type = x86_64 +avd.ini.displayname = Detox Pixel 4 XL API 31 avd.ini.encoding = UTF-8 disk.dataPartition.size = 6g fastboot.chosenSnapshotFile = @@ -16,7 +16,7 @@ hw.audioOutput = no hw.battery = yes hw.camera.back = virtualscene hw.camera.front = emulated -hw.cpu.arch = x86 +hw.cpu.arch = x86_64 hw.cpu.ncore = 4 hw.dPad = no hw.device.hash2 = MD5:80326cf5b53c08af25d4243cb231faa9 @@ -36,7 +36,7 @@ hw.sdCard = no hw.sensors.orientation = yes hw.sensors.proximity = yes hw.trackBall = no -image.sysdir.1 = system-images/android-30/google_apis/x86/ +image.sysdir.1 = system-images/android-31/google_apis/x86_64/ runtime.network.latency = none runtime.network.speed = full sdcard.size = 0 diff --git a/detox/create_android_emulator.sh b/detox/create_android_emulator.sh index 1bd6c909e0..380a1a24d5 100755 --- a/detox/create_android_emulator.sh +++ b/detox/create_android_emulator.sh @@ -3,13 +3,13 @@ set -ex set -o pipefail -NAME=detox_pixel_4_xl_api_30 +NAME=detox_pixel_4_xl_api_31 if emulator -list-avds | grep -q $NAME; then echo "'${NAME}' Android virtual device already exists." else - # Create virtual device in a relative "detox_pixel_4_xl_api_30" folder - avdmanager create avd -n $NAME -k 'system-images;android-30;google_apis;x86' -g google_apis -p $NAME -d 'pixel' + # Create virtual device in a relative "detox_pixel_4_xl_api_31" folder + avdmanager create avd -n $NAME -k 'system-images;android-31;google_apis;x86_64' -g google_apis -p $NAME -d 'pixel' # Copy predefined config and skin cp -r android_emulator/ $NAME/