diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/boot-emulator.sh | 6 | ||||
| -rwxr-xr-x | scripts/setup-environment.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/boot-emulator.sh b/scripts/boot-emulator.sh index 910340f1..92a053f9 100755 --- a/scripts/boot-emulator.sh +++ b/scripts/boot-emulator.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Creates and boots a display-less emulator (defaulting to Android 8.1, our min SDK) +# Creates and boots a display-less emulator (defaulting to Android 12, our min SDK) set -euo pipefail @@ -9,8 +9,8 @@ set -euo pipefail exit 1 } -[ -n "${ANDROID_API_LEVEL:-}" ] || { echo "ANDROID_API_LEVEL not defined; defaulting to 26"; } -API_LEVEL="${ANDROID_API_LEVEL:-26}" +[ -n "${ANDROID_API_LEVEL:-}" ] || { echo "ANDROID_API_LEVEL not defined; defaulting to 31"; } +API_LEVEL="${ANDROID_API_LEVEL:-31}" ARCH="x86_64" if [[ "$(uname -m)" == "arm64" && "$(uname)" == "Darwin" ]]; then diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 30dd0c19..1acda93c 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Installs the latest command line tools and sets up the necessary packages for an Android emulator -# for API level $ANDROID_API_LEVEL, or API 30 if unspecified. +# for API level $ANDROID_API_LEVEL, or API 31 if unspecified. set -euo pipefail @@ -23,9 +23,9 @@ else exit 1 fi -[ -n "${ANDROID_API_LEVEL:-}" ] || { echo "ANDROID_API_LEVEL not defined; defaulting to 30"; } +[ -n "${ANDROID_API_LEVEL:-}" ] || { echo "ANDROID_API_LEVEL not defined; defaulting to 31"; } -API_LEVEL="${ANDROID_API_LEVEL:-30}" +API_LEVEL="${ANDROID_API_LEVEL:-31}" unzip -qo /tmp/tools.zip -d "${ANDROID_SDK_ROOT}/latest" mkdir -p "${ANDROID_SDK_ROOT}/cmdline-tools" @@ -39,4 +39,4 @@ export PATH="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${PATH}" sdkmanager --install 'build-tools;30.0.3' platform-tools "platforms;android-${API_LEVEL}" sdkmanager --install emulator -sdkmanager --install "system-images;android-${API_LEVEL};google_apis;x86" +sdkmanager --install "system-images;android-${API_LEVEL};google_apis;x86_64" |