Upgraded rciti

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

@@ -0,0 +1,82 @@
+name: osx-install-android-sdk-automated
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    paths:
+      - 'setup/prereq_android_sdk_install.sh'
+  pull_request:
+    paths:
+      - 'setup/prereq_android_sdk_install.sh'
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '5 4 * * 0'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  install:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    env:
+      NEW_ANDROID_SDK_ROOT: /tmp/new-install/Android/sdk
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Print the current SDK root and version
+      run: |
+        echo "SDK root before install $ANDROID_SDK_ROOT"
+        cat $ANDROID_SDK_ROOT/cmdline-tools/latest/source.properties
+        echo "Existing installed packages"
+        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed
+
+    - name: Install to a new SDK root
+      run: |
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        echo "New SDK root $ANDROID_SDK_ROOT"
+        printf "Y\nY\nY\nY\nY\n" | bash setup/prereq_android_sdk_install.sh
+
+    - name: Verify that all packages are as expected
+      shell: bash -l {0}
+      run: |
+        echo "Comparing $ANDROID_SDK_ROOT and $NEW_ANDROID_SDK_ROOT"
+        $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed > /tmp/existing_packages
+        $NEW_ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --list_installed > /tmp/new_packages
+        diff -uw /tmp/existing_packages /tmp/new_packages
+        echo "Expected differences; emulators, SDK versions, tool versions"
+
+    - name: Verify that directory structure is consistent
+      shell: bash -l -x {0}
+      run: |
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        echo "New SDK root $ANDROID_SDK_ROOT"
+        ls -al $ANDROID_SDK_ROOT
+        if [ ! -d $ANDROID_SDK_ROOT/emulator ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/build-tools ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/patcher ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/extras ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/platforms ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/platform-tools ]; then exit 1; fi
+        if [ ! -d $ANDROID_SDK_ROOT/system-images ]; then exit 1; fi
+
+    - name: Ensure that the path is correct and installed programs are runnable
+      shell: bash -l {0}
+      run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        echo "New SDK root $ANDROID_SDK_ROOT"
+        $ANDROID_SDK_ROOT/emulator/emulator -list-avds
+
+    - name: Ensure that the path is correct and the project can be activated
+      shell: bash -l {0}
+      run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
+        export ANDROID_SDK_ROOT=$NEW_ANDROID_SDK_ROOT
+        echo "New SDK root $ANDROID_SDK_ROOT"
+        source setup/activate_native.sh

.github/workflows/android-build.yml

@@ -26,22 +26,32 @@ jobs:
     - uses: actions/checkout@v2
 
     # Runs a single command using the runners shell
-    - name: Print the java version
-      run: java -version
+    - name: Print the java and gradle versions
+      run: |
+        echo "Default java version"
+        java -version
+        echo "Setting to Java 11 instead"
+        export JAVA_HOME=$JAVA_HOME_11_X64
+        java -version
+        echo "Checking gradle"
+        which gradle
+        gradle -version
 
     - name: Tries to figure out where android is installed
       run: |
-        echo "Android listed at $ANDROID_HOME"
+        echo "Android listed at $ANDROID_SDK_ROOT"
         ls -al /opt/
 
     - name: Setup the cordova environment
       shell: bash -l {0}
       run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
         bash setup/setup_android_native.sh
 
     - name: Check tool versions
       shell: bash -l {0}
       run: |
+        export JAVA_HOME=$JAVA_HOME_11_X64
         source setup/activate_native.sh
         echo "cordova version"
         npx cordova -version
@@ -59,6 +69,7 @@ jobs:
         gradle -version
         echo "Let's rerun the activation"
         source setup/activate_native.sh
+        export JAVA_HOME=$JAVA_HOME_11_X64
         echo $PATH
         which gradle
         gradle --version

README.md

@@ -84,8 +84,8 @@ One advantage of using `skip` authentication in development mode is that any use
 
 Updating the e-mission-\* plugins or adding new plugins
 ---
-[![osx-build-ios](https://github.com/e-mission/e-mission-phone/workflows/osx-build-ios/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-ubuntu-build-android)
-[![osx-ubuntu-build-android](https://github.com/e-mission/e-mission-phone/workflows/osx-ubuntu-build-android/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-build-ios)
+[![osx-build-ios](https://github.com/e-mission/e-mission-phone/actions/workflows/ios-build.yml/badge.svg)](https://github.com/e-mission/e-mission-phone/actions/workflows/ios-build.yml)
+[![osx-build-android](https://github.com/e-mission/e-mission-phone/actions/workflows/android-build.yml/badge.svg)](https://github.com/e-mission/e-mission-phone/actions/workflows/android-build.yml)
 
 Pre-requisites
 ---
@@ -94,10 +94,32 @@ 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
-- the most recent version of android studio
-    - **NOTE**: although Catalina has a `/usr/bin/java`, trying to run it gives the error `No Java runtime present, requesting install.`. Installed [OpenJDK 1.8 using AdoptOpenJDK](https://adoptopenjdk.net/releases.html) to be consistent with the CI.
-    - NOTE: The setup script below will modify this install to workaround
-        https://github.com/actions/virtual-environments/issues/3757
+- Java 11. Tested with [OpenJDK 11 (Temurin) using AdoptOpenJDK](https://adoptopenjdk.net/releases.html).
+- 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
+    ```
+
+    <details><summary>Expected output</summary>
+
+    ```
+    Downloading the command line tools for mac
+      % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                     Dload  Upload   Total   Spent    Left  Speed
+    100  114M  100  114M    0     0  8092k      0  0:00:14  0:00:14 --:--:-- 8491k
+    Found downloaded file at /tmp/commandlinetools-mac-8092744_latest.zip
+    Installing the command line tools
+    Archive:  /tmp/commandlinetools-mac-8092744_latest.zip
+    ...
+    Downloading the android SDK. This will take a LONG time and will require you to agree to lots of licenses.
+    Do you wish to continue? (Y/N)Y
+    ...
+    Accept? (y/N): Y
+    ...
+    [======                                 ] 17% Downloading x86_64-23_r33.zip... s
+    ```
+
+    </details>
 
 Important
 ---
@@ -136,9 +158,17 @@ $ cp ..... www/json/connectionConfig.json
 $ source setup/activate_native.sh
 ```
 
+### Activation (after install, and in every new shell)
+
+If connecting to a development server over http, make sure to turn on http support on android
 
+```
+    <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
+        <application android:usesCleartextTraffic="true"/>
+    </edit-config>
+```
 
-Run in the emulator
+### Run in the emulator
 
 ```
 $ npx cordova emulate ios

bin/sign_and_align_keys.sh

@@ -11,6 +11,7 @@ fi
 # Sign and release the L+ version
 # Make sure the highest supported version has the biggest version code
 npx cordova build android --release -- --minSdkVersion=22
-cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk androidproductionkey
-~/Library/Android/sdk/build-tools/30.0.1/zipalign -v 4 platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk $1-build-$2.apk
+# cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.aab platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
+jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/bundle/release/app-release.aab androidproductionkey
+cp platforms/android/app/build/outputs/bundle/release/app-release.aab $1-build-$2.aab
+# ~/Library/Android/sdk/build-tools/30.0.1/zipalign -v 4 platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk $1-build-$2.apk

config.cordovabuild.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="41" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="41" version="3.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="46" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="44" version="3.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>emission</name>
     <description>
         A commute pattern tracker and carbon footprint estimator.
@@ -46,7 +46,7 @@
     <platform name="android">
         <hook src="hooks/before_build/android/android_copy_locales.js" type="before_build" />
         <preference name="android-minSdkVersion" value="22" />
-        <preference name="android-targetSdkVersion" value="29" />
+        <preference name="android-targetSdkVersion" value="30" />
         <preference name="AndroidXEnabled" value="true" />
         <resource-file src="google-services.json" target="app/google-services.json" />
         <hook src="hooks/before_build/android/android_set_provider.js" type="before_build" />

package.cordovabuild.json

@@ -1,6 +1,6 @@
 {
   "name": "edu.berkeley.eecs.emission",
-  "version": "3.0.0",
+  "version": "3.2.3",
   "displayName": "emission",
   "license": "BSD-3-Clause",
   "repository": {
@@ -18,22 +18,27 @@
       "ios"
     ],
     "plugins": {
-      "phonegap-plugin-push": {
-        "FCM_VERSION": "17.0.0"
+      "@havesource/cordova-plugin-push": {
+        "ANDROID_SUPPORT_V13_VERSION": "28.0.0",
+        "FCM_VERSION": "18.+",
+        "IOS_FIREBASE_MESSAGING_VERSION": "~> 6.32.2"
       },
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-app-version": {},
       "cordova-plugin-file": {},
       "cordova-plugin-device": {},
       "cordova-plugin-customurlscheme": {
-        "URL_SCHEME": "emission"
+        "URL_SCHEME": "emission",
+        "ANDROID_SCHEME": " ",
+        "ANDROID_HOST": " ",
+        "ANDROID_PATHPREFIX": "/"
       },
       "cordova-plugin-email-composer": {
         "ANDROID_SUPPORT_V4_VERSION": "27.+"
       },
       "cordova-plugin-x-socialsharing": {
-        "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
+        "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to share photos on social media.",
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to share photos on social media."
       },
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-local-notification": {},
@@ -48,49 +53,50 @@
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       },
-      "cordova-plugin-whitelist": {},
       "cordova-plugin-em-jwt-auth": {
-        "AUTH_VERSION": "17.0.0"
+        "AUTH_VERSION": "19.2.0"
       },
       "cordova-plugin-em-server-communication": {},
       "cordova-plugin-em-datacollection": {
-        "LOCATION_VERSION": "17.0.0"
+        "LOCATION_VERSION": "18.0.0",
+        "ANDROIDX_CORE_VERSION": "1.7.0"
       },
       "cordova-plugin-em-serversync": {},
       "cordova-plugin-em-settings": {},
       "cordova-plugin-em-transition-notify": {},
       "cordova-plugin-em-unifiedlogger": {},
       "cordova-plugin-em-usercache": {},
-      "cordova-plugin-androidx-adapter": {}
+      "cordova-plugin-androidx-adapter": {},
+      "phonegap-plugin-barcodescanner": {}
     }
   },
   "dependencies": {
-    "cordova-android": "9.0.0",
-    "cordova-ios": "6.1.0",
-    "cordova-plugin-advanced-http": "3.0.0",
+    "cordova-android": "10.1.0",
+    "cordova-ios": "6.2.0",
+    "cordova-plugin-advanced-http": "3.2.2",
     "cordova-plugin-androidx-adapter": "git+https://github.com/dpa99c/cordova-plugin-androidx-adapter.git",
-    "cordova-plugin-app-version": "0.1.9",
-    "cordova-plugin-customurlscheme": "5.0.1",
-    "cordova-plugin-device": "2.0.1",
-    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.6.0",
-    "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.4",
+    "cordova-plugin-app-version": "0.1.12",
+    "cordova-plugin-customurlscheme": "5.0.2",
+    "cordova-plugin-device": "2.0.3",
+    "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.2",
+    "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.5",
     "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.3",
-    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.5",
+    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.8",
     "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.2",
-    "cordova-plugin-em-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git#v1.2.6",
-    "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.3",
-    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.3",
+    "cordova-plugin-em-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git#v1.2.7",
+    "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.5",
+    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.5",
     "cordova-plugin-email-composer": "0.9.2",
     "cordova-plugin-file": "6.0.2",
-    "cordova-plugin-inappbrowser": "4.0.0",
-    "cordova-plugin-ionic": "5.4.7",
+    "cordova-plugin-inappbrowser": "5.0.0",
+    "cordova-plugin-ionic": "5.5.1",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "5.0.0",
-    "cordova-plugin-local-notification": "0.9.0-beta.3",
-    "cordova-plugin-whitelist": "~1.3.3",
-    "cordova-plugin-x-socialsharing": "6.0.0",
+    "cordova-plugin-local-notification": "https://github.com/timkellypa/cordova-plugin-local-notifications.git#083ccca0f4eee8fbec0cde1edd32207c286d2a04",
+    "cordova-plugin-x-socialsharing": "6.0.3",
     "fs-extra": "^9.0.1",
     "klaw-sync": "^6.0.0",
-    "phonegap-plugin-push": "=2.3.0"
+    "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner#v8.1.0",
+    "@havesource/cordova-plugin-push": "2.0.0"
   }
 }

setup/activate_native.sh

@@ -13,5 +13,8 @@ fi
 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
+
 echo "Configuring the repo for building native code"
 ./bin/configure_xml_and_json.js cordovabuild

setup/android_sdk_packages

@@ -0,0 +1,22 @@
+build-tools;30.0.1                                    
+build-tools;30.0.2                                    
+build-tools;30.0.3                                    
+build-tools;31.0.0                                    
+emulator                                              
+extras;google;google_play_services                    
+extras;intel;Hardware_Accelerated_Execution_Manager   
+patcher;v4                                            
+platform-tools                                        
+platforms;android-30                                  
+platforms;android-31                                  
+system-images;android-22;google_apis;x86_64           
+system-images;android-23;google_apis;x86_64           
+system-images;android-24;google_apis_playstore;x86    
+system-images;android-25;google_apis_playstore;x86    
+system-images;android-26;google_apis_playstore;x86    
+system-images;android-27;google_apis_playstore;x86    
+system-images;android-28;google_apis_playstore;x86_64 
+system-images;android-29;google_apis_playstore;x86    
+system-images;android-29;google_apis_playstore;x86_64 
+system-images;android-30;google_apis_playstore;x86    
+system-images;android-30;google_apis_playstore;x86_64 

setup/export_shared_dep_versions.sh

@@ -1,9 +1,9 @@
-export NVM_VERSION=0.36.0
-export NODE_VERSION=14.7.0
-export NPM_VERSION=6.14.8
+export NVM_VERSION=0.39.0
+export NODE_VERSION=14.18.1
+export NPM_VERSION=6.14.15
 export RUBY_VERSION=2.6.0
-export COCOAPODS_VERSION=1.10.0
-export GRADLE_VERSION=6.7
+export COCOAPODS_VERSION=1.11.2
+export GRADLE_VERSION=7.1.1
 
 export NVM_DIR="$HOME/.nvm"
 export RUBY_PATH=$HOME/.gem/ruby/$RUBY_VERSION/bin