Merge pull request #5068 from GoogleCloudPlatform/2.0.11-Release-Cand…

…idate 2.0.11 release to Master
GoogleCloudPlatform · Oct 28, 2022 · 7f3ea83 · 7f3ea83
2 parents b6aa7ad + 11f90d8
commit 7f3ea83
Show file tree

Hide file tree

Showing 659 changed files with 66,927 additions and 11,390 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/build-iOS.yml b/.github/workflows/build-iOS.yml
@@ -10,21 +10,21 @@ jobs:
     runs-on: macOS-latest
     strategy:
         matrix:
-          destination: ['platform=iOS Simulator,OS=15.0,name=iPhone 11']
+          destination: ['platform=iOS Simulator,OS=16.0,name=iPhone 11']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Force XCode 13.0
-        run: sudo xcode-select -switch /Applications/Xcode_13.0.app
+      - name: Force XCode 14.0
+        run: sudo xcode-select -switch /Applications/Xcode_14.0.app
       - name: Build
         run: |
           cd iOS/MyStudies
           xcodebuild clean build -workspace MyStudies.xcworkspace -scheme MyStudies -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=YES
-        env: 
+        env:
          destination: ${{ matrix.destination }}
       - name: Test
         run: |
           cd iOS/MyStudies
           xcodebuild test -workspace MyStudies.xcworkspace -scheme MyStudies -destination "${destination}"
-        env: 
+        env:
          destination: ${{ matrix.destination }}
diff --git a/.github/workflows/build-participant-manager.yml b/.github/workflows/build-participant-manager.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -25,7 +25,3 @@ jobs:
         run: |
           npm ci
           npm run build:ci
-
-      - name: npm run test
-        run: |
-          npm run test:ci
diff --git a/.gitignore b/.gitignore
diff --git a/Android/README.md b/Android/README.md
@@ -32,8 +32,9 @@ The **FDA MyStudies** mobile application fetches all study, schedule, activity,
     -    Go to the [Firebase console](https://console.firebase.google.com/) and select the project you configured for Cloud Firestore during [`Response datastore`](/response-datastore/) deployment 
     -    [Register your Android app](https://firebase.google.com/docs/android/setup) in the Cloud Messaging section of the Firebase console (the `Android package name` is the `applicationID` value in the [`Android/app/build.gradle`](app/build.gradle) file)
     -    Download the `google-services.json` file from the [Firebase project settings](https://console.firebase.google.com/project/_/settings/general/) page and replace [`Android/app/src/fda/google-services.json`](app/src/fda/google-services.json) (you do not need to update either of your `build.gradle` files, even if prompted)
+    -    To enable Google Analytics, go to the Firebase console, click on the dashboard under Analytics section from the side menu and click on enable Google Analytics button to view the events triggered from the mobile
 1. Configure your [`Participant datastore`](/participant-datastore/) instance to interface with your mobile application (skip this step if following the semi-automated [deployment guide](/deployment/README.md) - you will complete an automated version of this task when you return to that guide)
-    -    Make a copy of the [`participant-datastore/sqlscript/mystudies_app_info_update_db_script.sql`](../participant-datastore/sqlscript/mystudies_app_info_update_db_script.sql) and update the values to match your Android configuration
+    -    Make a copy of the [`mystudies_participant_datastore_db_script.sql`](../participant-datastore/sqlscript/mystudies_app_info_update_db_script.sql) and update the values to match your Android configuration
     -   Optionally, configure the iOS fields to match your iOS configuration (not necessary if you are not configuring an iOS application)
     -    Run your updated [`mystudies_app_info_update_db_script.sql`](../participant-datastore/sqlscript/mystudies_app_info_update_db_script.sql) script on the `mystudies_participant_datastore` database that you created during [`Participant datastore`](/participant-datastore/) deployment  ([instructions](https://cloud.google.com/sql/docs/mysql/import-export/importing#importing_a_sql_dump_file))
 1. *Optional.* Customize images and text

diff --git a/Android/app/src/androidTest/java/com/harvard/ExampleInstrumentedTest.java b/Android/app/src/androidTest/java/com/harvard/ExampleInstrumentedTest.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

diff --git a/Android/app/src/androidTest/java/com/harvard/usermodule/ErrorTest.java b/Android/app/src/androidTest/java/com/harvard/usermodule/ErrorTest.java
@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;

diff --git a/Android/app/src/androidTest/java/com/harvard/usermodule/ForgotPasswordActivityTest.java b/Android/app/src/androidTest/java/com/harvard/usermodule/ForgotPasswordActivityTest.java
@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;

diff --git a/Android/app/src/androidTest/java/com/harvard/usermodule/LoginCallbackActivityTest.java b/Android/app/src/androidTest/java/com/harvard/usermodule/LoginCallbackActivityTest.java
@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;

diff --git a/Android/app/src/androidTest/java/com/harvard/usermodule/SignupActivityTest.java b/Android/app/src/androidTest/java/com/harvard/usermodule/SignupActivityTest.java
@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;

diff --git a/Android/app/src/androidTest/java/com/harvard/usermodule/TermsPrivacyPolicyActivityTest.java b/Android/app/src/androidTest/java/com/harvard/usermodule/TermsPrivacyPolicyActivityTest.java
@@ -16,6 +16,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 

diff --git a/Android/app/src/androidTest/java/com/harward/fda/ExampleInstrumentedTest.java b/Android/app/src/androidTest/java/com/harward/fda/ExampleInstrumentedTest.java
@@ -17,7 +17,6 @@
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

diff --git a/Android/app/src/fda/java/com/harvard/gatewaymodule/GatewayPagerAdapter.java b/Android/app/src/fda/java/com/harvard/gatewaymodule/GatewayPagerAdapter.java
@@ -31,7 +31,6 @@
 import com.harvard.utils.AppController;
 import com.harvard.utils.CustomFirebaseAnalytics;
 import com.harvard.utils.Logger;
-
 import io.realm.Realm;
 
 public class GatewayPagerAdapter extends PagerAdapter {