From 7c50b17f8d06e5ea1b48859f909d047de74ee327 Mon Sep 17 00:00:00 2001 From: Luke Brandon Farrell Date: Thu, 21 Oct 2021 14:20:39 +0200 Subject: [PATCH 1/2] Added new Android Command Line Tools for MacOS 12+ and Java 9, 10, 11 --- src/commands/setup_macos_executor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/setup_macos_executor.yml b/src/commands/setup_macos_executor.yml index 3c42246..87c1151 100644 --- a/src/commands/setup_macos_executor.yml +++ b/src/commands/setup_macos_executor.yml @@ -15,8 +15,8 @@ steps: name: Configure Environment Variables command: | echo 'export PATH="$PATH:/usr/local/opt/node@<>/bin:~/.yarn/bin:~/project/node_modules/.bin:~/project/example/node_modules/.bin"' >> $BASH_ENV - echo 'export ANDROID_HOME="/usr/local/share/android-sdk"' >> $BASH_ENV - echo 'export ANDROID_SDK_ROOT="/usr/local/share/android-sdk"' >> $BASH_ENV + echo 'export ANDROID_HOME="/usr/local/share/android-commandlinetools"' >> $BASH_ENV + echo 'export ANDROID_SDK_ROOT="/usr/local/share/android-commandlinetools"' >> $BASH_ENV echo 'export PATH="$ANDROID_SDK_ROOT/emulator:$ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:$PATH"' >> $BASH_ENV echo 'export QEMU_AUDIO_DRV=none' >> $BASH_ENV echo 'export JAVA_HOME=$(/usr/libexec/java_home)' >> $BASH_ENV @@ -51,7 +51,7 @@ steps: HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask >/dev/null HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null - HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask android-sdk >/dev/null + HOMEBREW_NO_AUTO_UPDATE=1 brew install android-commandlinetools >/dev/null touch .watchmanconfig node -v From 3ff90bd4fc3b2b20714ce8a5b90add1b6b1cd892 Mon Sep 17 00:00:00 2001 From: Luke Brandon Farrell Date: Thu, 21 Oct 2021 15:42:21 +0200 Subject: [PATCH 2/2] fix(tooling): added brew update to get latest version of Android SDK tools --- src/commands/setup_macos_executor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/commands/setup_macos_executor.yml b/src/commands/setup_macos_executor.yml index 87c1151..96a1e5c 100644 --- a/src/commands/setup_macos_executor.yml +++ b/src/commands/setup_macos_executor.yml @@ -48,6 +48,7 @@ steps: - run: name: Configure Detox Environment command: | + brew update >/dev/null HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask >/dev/null HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null