Merge branch 'master' of https://github.com/e-mission/e-mission-phone

Author: ICIA

.github/workflows/android-automated-sdk-install.yml

@@ -6,9 +6,11 @@ on:
   push:
     paths:
       - 'setup/prereq_android_sdk_install.sh'
+      - '.github/workflows/android-automated-sdk-install.yml'
   pull_request:
     paths:
       - 'setup/prereq_android_sdk_install.sh'
+      - '.github/workflows/android-automated-sdk-install.yml'
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '5 4 * * 0'
@@ -71,7 +73,17 @@ jobs:
         export JAVA_HOME=$JAVA_HOME_11_X64
         export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
         echo "New SDK root $ANDROID_SDK_ROOT"
+        echo "About to run the emulator at $ANDROID_SDK_ROOT/emulator/emulator"
         $ANDROID_SDK_ROOT/emulator/emulator -list-avds
+        echo "About to run the avdmanager at $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/avdmanager"
+        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/avdmanager list avds
+
+    - name: Setup the cordova environment
+      shell: bash -l {0}
+      run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        bash setup/setup_android_native.sh
 
     - name: Ensure that the path is correct and the project can be activated
       shell: bash -l {0}
@@ -80,3 +92,5 @@ jobs:
         export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
         echo "New SDK root $ANDROID_SDK_ROOT"
         source setup/activate_native.sh
+        echo "About to run the avdmanager from the path" `which avdmanager`
+        avdmanager list avd

.github/workflows/ios-build.yml

@@ -32,6 +32,11 @@ jobs:
     - name: Print the xcode setup
       run: xcodebuild -version -sdk
 
+    - name: Print the brew and ruby versions
+      run: |
+        echo "brew version is "`brew --version`
+        echo "ruby version is" `ruby --version`
+
     - name: Print applications through dmg
       run: ls /Applications
 

README.md

@@ -120,6 +120,10 @@ Pre-requisites
     ```
 
     </details>
+- if you are not on the most recent version of OSX, `homebrew`
+    - this allows us to install the current version of cocoapods without
+      running into ruby incompatibilities - e.g.
+      https://github.com/CocoaPods/CocoaPods/issues/11763
 
 Important
 ---

setup/activate_native.sh

@@ -14,7 +14,7 @@ echo "Activating sdkman, and by default, gradle"
 source ~/.sdkman/bin/sdkman-init.sh
 
 echo "Ensuring that we use the most recent version of the command line tools"
-export PATH=$ANDROID_SDK_ROOT/sdk/cmdline-tools/bin:$ANDROID_SDK_ROOT/emulator:$PATH
+export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/emulator:$PATH
 
 echo "Configuring the repo for building native code"
 ./bin/configure_xml_and_json.js cordovabuild

setup/export_shared_dep_versions.sh

@@ -1,9 +1,14 @@
 export NVM_VERSION=0.39.0
 export NODE_VERSION=14.18.1
 export NPM_VERSION=6.14.15
-export RUBY_VERSION=2.6.0
+# make sure that this is a stable version from
+# so that https://github.com/postmodern/ruby-versions
+# ideally, this would be the same version as the CI
+# Looks like brew supports only major and minor, not patch version
+export RUBY_VERSION=2.7
 export COCOAPODS_VERSION=1.11.2
 export GRADLE_VERSION=7.1.1
+export OSX_EXP_VERSION=12
 
 export NVM_DIR="$HOME/.nvm"
-export RUBY_PATH=$HOME/.gem/ruby/$RUBY_VERSION/bin
+export RUBY_PATH=$HOME/.gem/ruby/$RUBY_VERSION.0/bin

setup/setup_android_native.sh

@@ -13,7 +13,6 @@ JAVA_VERSION=`javac -version`
 echo "Found java in the path with version $JAVA_VERSION"
 
 echo "Setting up SDK environment"
-ANDROID_BUILD_TOOLS_VERSION=27.0.3
 MIN_SDK_VERSION=21
 TARGET_SDK_VERSION=28
 

setup/setup_ios_native.sh

@@ -4,8 +4,34 @@ set -e
 # Setup the development environment
 source setup/setup_shared.sh
 
-echo "Installing cocoapods"
+OSX_MAJOR_VERSION=`sw_vers | grep ProductVersion | cut -d ':' -f 2 | cut -d '.' -f 1`
+echo "Found OSX major version" $OSX_MAJOR_VERSION
+
+CURR_RUBY_VERSION=`ruby --version | cut -d ' ' -f 2 | cut -d '.' -f 1-2`
+echo "Found ruby version "$CURR_RUBY_VERSION
+
+if [ $CURR_RUBY_VERSION == $RUBY_VERSION ]; then
+    echo "Found ruby version "$CURR_RUBY_VERSION" expected "$RUBY_VERSION" no need to upgrade"
+else
+    if [ -x /usr/local/bin/brew ]; then
+        echo "Found brew installation with version" `/usr/local/bin/brew --version`
+        echo "Installing ruby version to brew" $RUBY_VERSION
+        brew install ruby@$RUBY_VERSION
+    else
+        if [ $OSX_MAJOR_VERSION -ge $OSX_EXP_VERSION ]; then
+            echo "No brew installation found, but OSX major version "$OSX_MAJOR_VERSION" and expected version "$OSX_EXP_VERSION" so CocoaPods should work"
+        else
+            echo "No brew installation found, but OSX major version "$OSX_MAJOR_VERSION" != expected version "$OSX_EXP_VERSION" CocoaPods install will likely fail"
+            echo "Found ruby version "`ruby --version`
+            exit 1
+        fi
+    fi
+fi
+
+echo "Adding $RUBY_PATH to the path before the install"
 export PATH=$RUBY_PATH:$PATH
-gem install --no-document --user-install cocoapods -v $COCOAPODS_VERSION
+
+echo "Installing cocoapods"
+/usr/local/opt/ruby@$RUBY_VERSION/bin/gem install --no-document --user-install cocoapods -v $COCOAPODS_VERSION
 
 source setup/setup_shared_native.sh