diff --git a/README.md b/README.md index 85fc73f21..b9ce71496 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Pre-requisites - or this [supposedly easier to use repo](https://github.com/xcpretty/xcode-install) - **NOTE**: the basic xcode install on Catalina was messed up for me due to a prior installation of command line tools. [These workarounds helped](https://github.com/nodejs/node-gyp/blob/master/macOS_Catalina.md). - git -- Java 11. Tested with [OpenJDK 11 (Temurin) using AdoptOpenJDK](https://adoptopenjdk.net/releases.html). +- Java 17. Tested with [OpenJDK 17 (Temurin) using Adoptium](https://adoptium.net). - android SDK; install manually or use setup script below. Note that you only need to run this once **per computer**. ``` $ bash setup/prereq_android_sdk_install.sh diff --git a/setup/android_sdk_packages b/setup/android_sdk_packages index 5d3f6737b..a62d6b18a 100644 --- a/setup/android_sdk_packages +++ b/setup/android_sdk_packages @@ -1,15 +1,16 @@ build-tools;31.0.0 build-tools;32.0.0 build-tools;33.0.2 +build-tools;34.0.0 emulator extras;google;google_play_services -extras;intel;Hardware_Accelerated_Execution_Manager patcher;v4 platform-tools platforms;android-30 platforms;android-31 platforms;android-32 platforms;android-33 +platforms;android-34 system-images;android-22;google_apis;x86_64 system-images;android-23;google_apis;x86_64 system-images;android-24;google_apis_playstore;x86 @@ -24,3 +25,5 @@ system-images;android-32;google_apis;x86_64 system-images;android-32;google_apis_playstore;x86_64 system-images;android-33;google_apis;x86_64 system-images;android-33;google_apis_playstore;x86_64 +system-images;android-34;google_apis;x86_64 +system-images;android-34;google_apis_playstore;x86_64 diff --git a/setup/prereq_android_sdk_install.sh b/setup/prereq_android_sdk_install.sh index e9767eeff..bba391e34 100644 --- a/setup/prereq_android_sdk_install.sh +++ b/setup/prereq_android_sdk_install.sh @@ -1,4 +1,4 @@ -TOOLS_VERSION=9477386 +TOOLS_VERSION=10406996 TOOLS_ZIP_FILENAME=commandlinetools-mac-${TOOLS_VERSION}_latest.zip echo "Installing command line tools from $TOOLS_ZIP_FILENAME"