Update the Android development enviornment setup

1. Update `ANDROID_SDK_ROOT` to `ANDROID_HOME`. The former variable is
   deprecated. (see https://developer.android.com/tools/variables#envar)
2. Remove `ANDROID_NDK_HOME` environment variable. This should allow the
   build script to work out of the box for more folks.
3. Check that Java is on the `PATH` as opposed to just installing it.
   `asdf` and other runtime management tools are pretty popular, and all
   we care about is that the Java version is accessible.
4. Remove calls to `sudo`. Check to see if CocoaPods exists, if it
   doesn't install it using Homebrew which doesn't require `sudo`.

dev-setup/setup_macos.sh

@@ -13,16 +13,16 @@ while true; do
     read -p "Did you install Android SDK? Y/N " response
     case $response in
         [yY] ) echo Checking android setup...;
-        # ensure ANDROID_SDK_ROOT is defined and exists
-        if [ -d "$ANDROID_SDK_ROOT" ]; then
-            echo '[X] $ANDROID_SDK_ROOT is defined and exists' 
+        # ensure ANDROID_HOME is defined and exists
+        if [ -d "$ANDROID_HOME" ]; then
+            echo '[X] $ANDROID_HOME is defined and exists'
         else
-            echo '$ANDROID_SDK_ROOT is not defined or does not exist'
+            echo '$ANDROID_HOME is not defined or does not exist'
             exit 1
         fi
 
         # ensure Android Command Line Tools exist
-        if [ -d "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" ]; then
+        if [ -d "$ANDROID_HOME/cmdline-tools/latest/bin" ]; then
             echo '[X] Android command line tools are installed' 
         else
             echo 'Android command line tools are not installed'
@@ -30,13 +30,14 @@ while true; do
         fi
 
         # ensure Android SDK packages are installed
-        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33
+        $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33
 
         # ensure ANDROID_NDK_HOME is defined and exists
+        ANDROID_NDK_HOME="$ANDROID_HOME/ndk/25.1.8937393"
         if [ -d "$ANDROID_NDK_HOME" ]; then
-            echo '[X] $ANDROID_NDK_HOME is defined and exists' 
+            echo '[X] Android NDK is defined and exists'
         else
-            echo '$ANDROID_NDK_HOME is not defined or does not exist'
+            echo 'Android NDK is not defined or does not exist'
             exit 1
         fi
 
@@ -49,7 +50,7 @@ while true; do
         fi
 
         # ensure cmake is installed
-        if [ -d "$ANDROID_SDK_ROOT/cmake" ]; then
+        if [ -d "$ANDROID_HOME/cmake" ]; then
             echo '[X] Android SDK CMake is installed' 
         else
             echo 'Android SDK CMake is not installed'
@@ -57,7 +58,7 @@ while true; do
         fi
 
         # ensure emulator is installed
-        if [ -d "$ANDROID_SDK_ROOT/emulator" ]; then
+        if [ -d "$ANDROID_HOME/emulator" ]; then
             echo '[X] Android SDK emulator is installed' 
         else
             echo 'Android SDK emulator is not installed'
@@ -119,26 +120,31 @@ else
     exit 1
 fi
 
+# ensure Java 17 is the active version
+JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d\" -f2)
+if [ "$JAVA_VERSION" == "17" ]; then
+    echo '[X] Java 17 is available in the path'
+else
+    echo 'Java 17 is not available in the path'
+    exit 1
+fi
+
 # ensure we have command line tools
 xcode-select --install 2> /dev/null || true 
 until [ -d /Library/Developer/CommandLineTools/usr/bin ]; do
     sleep 5;
 done
 
-# ensure packages are installed
-if [ "$BREW_USER" == "" ]; then
-    if [ -d /opt/homebrew ]; then
-        BREW_USER=`ls -lad /opt/homebrew/. | cut -d\  -f4`
-        echo "Must sudo to homebrew user \"$BREW_USER\" to install capnp package:"
-    elif [ -d /usr/local/Homebrew ]; then
-        BREW_USER=`ls -lad /usr/local/Homebrew/. | cut -d\  -f4`
-        echo "Must sudo to homebrew user \"$BREW_USER\" to install capnp package:"
-    else
-        echo "Homebrew is not installed in the normal place. Trying as current user"
-        BREW_USER=`whoami`
-    fi
+# install packages
+# if $BREW_USER is set, run brew as that user, otherwise run it regularly
+# this allows for developers who have brew installed as a different user to run this script
+if [ -z "$BREW_USER" ]; then
+    BREW_COMMAND="brew"
+else
+    BREW_COMMAND="sudo -H -u $BREW_USER brew"
 fi
-sudo -H -u $BREW_USER brew install capnp cmake wabt llvm openjdk@17 jq
+
+$BREW_COMMAND install capnp cmake wabt llvm jq
 
 # install targets
 rustup target add aarch64-apple-darwin aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
@@ -149,5 +155,9 @@ cargo install wasm-bindgen-cli wasm-pack cargo-edit
 # install pip packages
 pip3 install --upgrade bumpversion
 
-echo Installing cocoapods. This may take a while.
-sudo gem install cocoapods
+if command -v pod &> /dev/null; then
+    echo '[X] CocoaPods is available in the path'
+else
+    echo 'CocoaPods is not available in the path, installing it now'
+    $BREW_COMMAND install cocoapods
+fi