SAF-844 Removed BT targets from native iOS project (#1307)

* Removed BT targets from native iOS project and cleaned up project structure * Updated README, package.json, and workflows * Update workflows to run correctly by paths, and lints them (#1309) Co-authored-by: Jacob Jaffe <[email protected]>
Path-Check · Jul 22, 2020 · 09b6b8e · 09b6b8e
1 parent 372dcbb
commit 09b6b8e
Show file tree

Hide file tree

Showing 207 changed files with 345 additions and 4,532 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - gps-release
-     paths-ignore:
-      - 'package.json'
-      - 'CHANGELOG.md'
+    paths-ignore:
+      - "package.json"
+      - "CHANGELOG.md"
 
 jobs:
   version_bump:
-    name: 'Bump version'
+    name: "Bump version"
     runs-on: ubuntu-latest
 
     steps:
@@ -22,10 +22,10 @@ jobs:
         uses: TriPSs/conventional-changelog-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          git-message: 'chore(release): {version}'
-          preset: 'angular'
-          tag-prefix: ''
-          output-file: 'CHANGELOG.md'
+          git-message: "chore(release): {version}"
+          preset: "angular"
+          tag-prefix: ""
+          output-file: "CHANGELOG.md"
 
   deploy_android_gps:
     # gps-release branch only
@@ -118,21 +118,21 @@ jobs:
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
           GITHUB_RUN_NUMBER: ${{ github.run_number }}
         with:
-          lane: 'release_gps'
-          subdirectory: 'android'
-          bundle-install-path: 'vendor/bundle'
+          lane: "release_gps"
+          subdirectory: "android"
+          bundle-install-path: "vendor/bundle"
 
       - name: Upload to Google Play beta track
         uses: maierj/[email protected]
         with:
-          lane: 'play_store_gps'
-          subdirectory: 'android'
-          bundle-install-path: 'vendor/bundle'
+          lane: "play_store_gps"
+          subdirectory: "android"
+          bundle-install-path: "vendor/bundle"
 
   deploy_ios_gps:
     # gps-release branch only
     if: github.event_name == 'push' && github.ref == 'refs/heads/gps-release'
-    runs-on: macOS-latest
+    runs-on: macos-latest
     needs: version_bump
     steps:
       - uses: actions/checkout@master
@@ -197,9 +197,9 @@ jobs:
           MATCH_GIT_BASIC_AUTH: ${{ secrets.MATCH_GIT_BASIC_AUTH }}
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         with:
-          lane: 'release'
-          subdirectory: 'ios'
-          bundle-install-path: 'vendor/bundle'
+          lane: "release"
+          subdirectory: "ios"
+          bundle-install-path: "vendor/bundle"
 
       - name: Deploy to testflight
         uses: maierj/[email protected]
@@ -212,6 +212,6 @@ jobs:
           MATCH_GIT_BASIC_AUTH: ${{ secrets.MATCH_GIT_BASIC_AUTH }}
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         with:
-          lane: 'deploy'
-          subdirectory: 'ios'
-          bundle-install-path: 'vendor/bundle'
+          lane: "deploy"
+          subdirectory: "ios"
+          bundle-install-path: "vendor/bundle"
diff --git a/.github/workflows/dev_setup.yml b/.github/workflows/dev_setup.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches: [develop]
     paths:
-      - 'dev_setup.sh'
+      - "dev_setup.sh"
   pull_request:
     branches: [develop]
     paths:
-      - 'dev_setup.sh'
+      - "dev_setup.sh"
 
 jobs:
   test-ubuntu:
@@ -32,7 +32,7 @@ jobs:
         run: npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ --verbose
 
   test-mac:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   e2e-ios-build:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     # while this job doesn't depend on the previous job explicitly
     # this will force them not to run in parallel. If they're run in parallel,
     # the node_modules caches will conflict
@@ -66,10 +66,10 @@ jobs:
       - uses: actions/upload-artifact@v1
         with:
           name: e2e-ios-bin
-          path: ios/build/Build/Products/Release-GPS-iphonesimulator/GPS.app
+          path: ios/build/Build/Products/Release-iphonesimulator/GPS.app
 
   e2e-iphone-se:
-    runs-on: macOS-latest
+    runs-on: macos-latest
     needs: e2e-ios-build
     timeout-minutes: 15
     env:
@@ -104,7 +104,7 @@ jobs:
       - uses: actions/download-artifact@master
         with:
           name: e2e-ios-bin
-          path: ios/build/Build/Products/Release-GPS-iphonesimulator/GPS.app
+          path: ios/build/Build/Products/Release-iphonesimulator/GPS.app
 
       - run: yarn test:e2e:iphone-se
 

diff --git a/.github/workflows/test-ios.yml b/.github/workflows/test-ios.yml
@@ -4,18 +4,15 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - ios/**
   pull_request:
     branches:
       - develop
     paths:
-      - ios/**
+      - "ios/**"
 
 jobs:
-  unit-test-ios-gps:
-    runs-on: macOS-latest
-    needs: unit-test
+  unit-test-ios:
+    runs-on: macos-latest
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@master
@@ -53,8 +50,8 @@ jobs:
       - run: pod install --repo-update
         working-directory: ./ios
 
-       - run: |
+      - run: |
           xcodebuild test -workspace COVIDSafePaths.xcworkspace \
             -scheme GPS_Development \
             -destination 'platform=iOS Simulator,name=iPhone 8' \
-         working-directory: ./ios
+        working-directory: ./ios
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
@@ -4,16 +4,14 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - app/**
   pull_request:
     branches:
       - develop
     paths:
-      - app/**
+      - 'app/**'
 
 jobs:
-  unit-test:
+  unit-test-js:
     runs-on: ubuntu-latest
 
     steps:

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
       src="./assets/Safe_Paths_Logo.png"
     />
   </a>
-  
+
   <b>**https://pathcheck.org/**</b>
 </div>
 
@@ -19,32 +19,32 @@
 
 Help us stop COVID-19.
 
-COVID Safe Paths is a mobile app for digital contract tracing (DCT) sponsored by Path Check a nonprofit and developed by a growing global community of engineers, designers, and contributors. Safe Paths is based on research originally conducted at the MIT Media Lab. 
+COVID Safe Paths is a mobile app for digital contract tracing (DCT) sponsored by Path Check a nonprofit and developed by a growing global community of engineers, designers, and contributors. Safe Paths is based on research originally conducted at the MIT Media Lab.
 
-## Privacy Preserving 
+## Privacy Preserving
 
 What’s truly special about Safe Paths is our strong commitment to preserving the privacy of individual users. We're building an application that can help contain outbreaks of COVID-19 without forcing users to sacrifice their personal privacy. For example, if a user chooses to use Safe Paths to maintain a record of their locations use a time stamped GPS log, which stores 14 days of data in 5 minute increments. The location log is stored on the user's phone. The logged data only leaves the device if the user chooses to send the information to an authorized public health authority (PHA) as part of the contact tracing process.
 
 ## Multiple Capabilities
 
 Safe Paths is designed to support a range of DCT and public health use cases. Currently the main build uses GPS for location tracking. Our roadmap includes adding support for other location and proximity technologies, symptom tracking, and communication with PHAs.
 
-## Multiple Implementation Strategies 
+## Multiple Implementation Strategies
 
 The Safe Paths app is being developed to support a variety of build 'flavors' of the application around core health and tracing functionality. Reach out to our team to discuss creating a flavor for your use-case.
 
 ### Path Check Release of COVID Safe Paths
-Safe Paths is available as an app published by Path Check in the [Apple App Store](https://apps.apple.com/us/app/covid-safe-paths/id1508266966) and the [Google Play App Store](https://play.google.com/store/apps/details?id=org.pathcheck.covidsafepaths). Any authorized pubic health authority can use Safe Paths. 
+Safe Paths is available as an app published by Path Check in the [Apple App Store](https://apps.apple.com/us/app/covid-safe-paths/id1508266966) and the [Google Play App Store](https://play.google.com/store/apps/details?id=org.pathcheck.covidsafepaths). Any authorized pubic health authority can use Safe Paths.
 
-### Custom Builds 
+### Custom Builds
 
 We welcome public health authorities and other organizations implementing digital contact tracing strategies to create custom builds for their specific needs, incorporate Safe Paths features into their applications, or create downstream projects that stay linked to the Safe Paths project. If intending to fork the repository and develop off of it, be aware that this comes "at your own risk" for continued maintenance.
 
 ## End-to-End System
 
 Safe Paths is designed to work with Safe Places, a tool for contact tracing teams to work with location data in the course of contact tracing interviews and to publish points of concern. Without having to sharing their own location history, a Safe Paths user can download the points of concern from their PHA to identify if they have had risk of an exposure.
 
-## Broad Non-Developer Community 
+## Broad Non-Developer Community
 
 One of the important aspects of the Safe Paths open source project is that it's supported by a large community of volunteers in addition to the open source developer community. Spanning as diverse domains as product management, user research, cryptography, security, compliance, design, and videography more than 1,400 Path Check volunteers are working together to support Safe Paths and help drive adoption around the world.
 
@@ -54,7 +54,7 @@ One of the important aspects of the Safe Paths open source project is that it's
 
 [Apps Gone Rogue: Maintaining Personal Privacy in an Epidemic](https://drive.google.com/file/d/1nwOR4drE3YdkCkyy_HBd6giQPPhLEkRc/view?usp=sharing) - The original white paper.
 
-[COVID Safe Paths Slack](covidsafepaths.slack.com) - Where the community lives. 
+[COVID Safe Paths Slack](covidsafepaths.slack.com) - Where the community lives.
 
 [Path-Check/gaen-mobile](https://github.com/Path-Check/gaen-mobile) - PathCheck's GAEN based contract tracing solution.
 
@@ -117,7 +117,7 @@ Populate the following 2 `.env` files with the relevant urls for your GAEN serve
 #### Android (Windows, Linux, macOS)
 
 ```
-yarn run-android-gps ## for the location enabled app
+yarn run-android ## for the location enabled app
 ```
 
 Device storage can be cleared by long-pressing on the app icon in the simulator, clicking "App info", then "Storage", and lastly, "Clear Storage".
@@ -133,7 +133,7 @@ yarn install:pod ## only needs to be ran once
 Then, run the application:
 
 ```
-yarn run-ios-gps ## for the location enabled app
+yarn run-ios ## for the location enabled app
 ```
 
 Device storage can be cleared by clicking "Hardware" on the system toolbar, and then "Erase all content and settings".

diff --git a/ios/AppDelegate.m b/ios/AppDelegate.m