diff --git a/.env.bte b/.env.bt similarity index 71% rename from .env.bte rename to .env.bt index b294b7bf38..39efe9e88f 100644 --- a/.env.bte +++ b/.env.bt @@ -1,4 +1,4 @@ -# This is the BTE debug/dev .env file. Any debug or non-release-signed build will +# This is the BT debug/dev .env file. Any debug or non-release-signed build will # use these flags. # About flags: @@ -7,4 +7,4 @@ # For now, only true/1 is parsed, everything else will be interpretted as false # flags must begin with flag_ and are case sensitive -TRACING_STRATEGY=bte +TRACING_STRATEGY=bt diff --git a/.env.bte.release b/.env.bt.release similarity index 72% rename from .env.bte.release rename to .env.bt.release index 31b4067c7b..1a43f7836f 100644 --- a/.env.bte.release +++ b/.env.bt.release @@ -2,6 +2,6 @@ # only prod ready feature flags should be enabled here. # # For Android, this file is automatically used for any release build. iOS should -# prepend ENVFILE=.env.bte.release before any build commands. +# prepend ENVFILE=.env.bt.release before any build commands. -TRACING_STRATEGY=bte +TRACING_STRATEGY=bt diff --git a/.env.bte.staging b/.env.bt.staging similarity index 67% rename from .env.bte.staging rename to .env.bt.staging index 214f392581..b5ea6ef707 100644 --- a/.env.bte.staging +++ b/.env.bt.staging @@ -2,10 +2,10 @@ # Flags that are ready for testing/staging should be enabled here. # When making any Staging channel build on both iOS or Android, prepend the build -# command with ENVFILE=.env.bte.staging +# command with ENVFILE=.env.bt.staging # # e.g. # -# ENVFILE=.env.bte.staging ./gradlew assembleRelease +# ENVFILE=.env.bt.staging ./gradlew assembleRelease -TRACING_STRATEGY=bte +TRACING_STRATEGY=bt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9ab485c57..bdedfe4b6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: name: app-gps-staging path: android/app/build/outputs/apk/gps/staging/app-gps-staging.apk - build_staging_android_bte: + build_staging_android_bt: runs-on: ubuntu-latest steps: - name: Checkout code @@ -137,15 +137,15 @@ jobs: - name: Build android Staging artifact uses: maierj/fastlane-action@v1.4.0 with: - lane: 'staging_bte' + lane: 'staging_bt' subdirectory: 'android' bundle-install-path: 'vendor/bundle' - name: Upload APK uses: actions/upload-artifact@v1 with: - name: app-bte-staging - path: android/app/build/outputs/apk/bte/staging/app-bte-staging.apk + name: app-bt-staging + path: android/app/build/outputs/apk/bt/staging/app-bt-staging.apk build_staging_ios_gps: # Deliberately turned off the pull request logic here @@ -222,7 +222,7 @@ jobs: name: COVIDSafePaths-staging-gps path: ios/COVIDSafePaths-staging.ipa - build_staging_ios_bte: + build_staging_ios_bt: # Deliberately turned off the pull request logic here # because GitHub Actions explicitly turns off secrets for pull requests coming from a forked repo if: github.event_name == 'push' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') @@ -279,7 +279,7 @@ jobs: ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.MATCH_SSH_CERT }}" - - name: Build BTE iOS Production artifact for devices + - name: Build BT iOS Production artifact for devices uses: maierj/fastlane-action@v1.4.0 env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} @@ -287,12 +287,12 @@ jobs: MATCH_GIT_BASIC_AUTH: ${{ secrets.MATCH_GIT_BASIC_AUTH }} SSH_AUTH_SOCK: /tmp/ssh_agent.sock with: - lane: 'staging_bte' + lane: 'staging_bt' subdirectory: 'ios' bundle-install-path: 'vendor/bundle' - name: Upload Artifact uses: actions/upload-artifact@v1 with: - name: COVIDSafePaths-staging-bte - path: ios/COVIDSafePaths-bte-staging.ipa + name: COVIDSafePaths-staging-bt + path: ios/COVIDSafePaths-bt-staging.ipa diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 70b9347aca..74c6cb17ac 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,7 +4,7 @@ on: push: branches: - gps-release - - bte-release + - bt-release paths-ignore: - 'package.json' - 'CHANGELOG.md' @@ -205,9 +205,9 @@ jobs: subdirectory: 'ios' bundle-install-path: 'vendor/bundle' - deploy_ios_bte: - # bte-release branch only - if: github.event_name == 'push' && github.ref == 'refs/heads/bte-release' + deploy_ios_bt: + # bt-release branch only + if: github.event_name == 'push' && github.ref == 'refs/heads/bt-release' runs-on: macOS-latest needs: version_bump steps: @@ -273,7 +273,7 @@ jobs: MATCH_GIT_BASIC_AUTH: ${{ secrets.MATCH_GIT_BASIC_AUTH }} SSH_AUTH_SOCK: /tmp/ssh_agent.sock with: - lane: 'release_bte' + lane: 'release_bt' subdirectory: 'ios' bundle-install-path: 'vendor/bundle' @@ -292,9 +292,9 @@ jobs: subdirectory: 'ios' bundle-install-path: 'vendor/bundle' - deploy_android_bte: - # bte-release branch only - if: github.event_name == 'push' && github.ref == 'refs/heads/bte-release' + deploy_android_bt: + # bt-release branch only + if: github.event_name == 'push' && github.ref == 'refs/heads/bt-release' runs-on: ubuntu-latest steps: - name: Checkout code @@ -370,13 +370,13 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} GITHUB_RUN_NUMBER: ${{ github.run_number }} with: - lane: 'release_bte' + lane: 'release_bt' subdirectory: 'android' bundle-install-path: 'vendor/bundle' - name: Upload to Google Play beta track uses: maierj/fastlane-action@v1.4.0 with: - lane: 'play_store_bte' + lane: 'play_store_bt' subdirectory: 'android' bundle-install-path: 'vendor/bundle' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f3dfdb7c2..4daaa8c692 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,13 @@ on: branches: - develop - master - - bte-release + - bt-release - gps-release pull_request: branches: - develop - master - - bte-release + - bt-release - gps-release jobs: @@ -59,11 +59,11 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} restore-keys: | ${{ runner.os }}-gradle- - - name: ./gradlew :app:connectedGpsDebugAndroidTest :app:connectedBteDebugAndroidTest --no-daemon + - name: ./gradlew :app:connectedGpsDebugAndroidTest :app:connectedBtDebugAndroidTest --no-daemon uses: reactivecircus/android-emulator-runner@v2 with: api-level: 28 - script: ./gradlew :app:connectedGpsDebugAndroidTest :app:connectedBteDebugAndroidTest --no-daemon + script: ./gradlew :app:connectedGpsDebugAndroidTest :app:connectedBtDebugAndroidTest --no-daemon working-directory: ./android unit-test-ios: diff --git a/.gitignore b/.gitignore index 6a88aaa94a..bcf4079b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -83,13 +83,13 @@ ios/COVIDSafePaths-staging.ipa ios/COVIDSafePaths-staging.app ios/COVIDSafePaths-staging.app.dSYM.zip -ios/COVIDSafePaths-bte.ipa -ios/COVIDSafePaths-bte.app -ios/COVIDSafePaths-bte.app.dSYM.zip +ios/COVIDSafePaths-bt.ipa +ios/COVIDSafePaths-bt.app +ios/COVIDSafePaths-bt.app.dSYM.zip -ios/COVIDSafePaths-staging-bte.ipa -ios/COVIDSafePaths-staging-bte.app -ios/COVIDSafePaths-stating-bte.app.dSYM.zip +ios/COVIDSafePaths-staging-bt.ipa +ios/COVIDSafePaths-staging-bt.app +ios/COVIDSafePaths-stating-bt.app.dSYM.zip # Local Android build artifacts android/app/src/main/assets/index.android.bundle diff --git a/README.md b/README.md index 278abae84c..01b292cadd 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ dev_setup.bat ``` yarn run-android-gps ## for the location enabled app -yarn run-android-bte ## for the bluetooth enabled app +yarn run-android-bt ## for the bluetooth 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". @@ -142,7 +142,7 @@ Then, run the application: ``` yarn run-ios-gps ## for the location enabled app -yarn run-ios-bte ## for the bluetooth enabled app +yarn run-ios-bt ## for the bluetooth enabled app ``` Device storage can be cleared by clicking "Hardware" on the system toolbar, and then "Erase all content and settings". diff --git a/android/app/build.gradle b/android/app/build.gradle index 318a1092f8..13a2d3021b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -5,9 +5,9 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'realm-android' project.ext.envConfigFiles = [ - btedebug: ".env.bte", - btestaging: ".env.bte.staging", - bterelease: ".env.bte.release", + btdebug: ".env.bt", + btstaging: ".env.bt.staging", + btrelease: ".env.bt.release", gpsdebug: ".env.gps", gpsstaging: ".env.gps.staging", @@ -94,11 +94,11 @@ import com.android.build.OutputFile project.ext.react = [ entryFile: "index.js", bundleInGpsDebug: false, - bundleInBteDebug: false, + bundleInBtDebug: false, bundleInGpsStaging: true, - bundleInBteStaging: true, + bundleInBtStaging: true, devDisabledInGpsStaging: true, - devDisabledInBteStaging: true, + devDisabledInBtStaging: true, enableHermes: false, // clean and rebuild if changing ] @@ -212,8 +212,8 @@ android { applicationId 'org.pathcheck.covidsafepaths' dimension "version" } - bte { - applicationId 'org.pathcheck.covidsafepathsBte' + bt { + applicationId 'org.pathcheck.covidsafepathsBt' dimension "version" } } diff --git a/android/app/src/bte/AndroidManifest.xml b/android/app/src/bt/AndroidManifest.xml similarity index 79% rename from android/app/src/bte/AndroidManifest.xml rename to android/app/src/bt/AndroidManifest.xml index 4d28a59049..752aec7397 100644 --- a/android/app/src/bte/AndroidManifest.xml +++ b/android/app/src/bt/AndroidManifest.xml @@ -4,6 +4,6 @@ - + diff --git a/android/app/src/bte/ic_launcher-playstore.png b/android/app/src/bt/ic_launcher-playstore.png similarity index 100% rename from android/app/src/bte/ic_launcher-playstore.png rename to android/app/src/bt/ic_launcher-playstore.png diff --git a/android/app/src/bte/java/covidsafepaths/bte/MainApplication.java b/android/app/src/bt/java/covidsafepaths/bt/MainApplication.java similarity index 98% rename from android/app/src/bte/java/covidsafepaths/bte/MainApplication.java rename to android/app/src/bt/java/covidsafepaths/bt/MainApplication.java index 777be4709c..5e578a3abc 100644 --- a/android/app/src/bte/java/covidsafepaths/bte/MainApplication.java +++ b/android/app/src/bt/java/covidsafepaths/bt/MainApplication.java @@ -1,4 +1,4 @@ -package covidsafepaths.bte; +package covidsafepaths.bt; import android.app.Application; import android.content.Context; diff --git a/android/app/src/bte/res/drawable/background_splash.xml b/android/app/src/bt/res/drawable/background_splash.xml similarity index 100% rename from android/app/src/bte/res/drawable/background_splash.xml rename to android/app/src/bt/res/drawable/background_splash.xml diff --git a/android/app/src/bte/res/drawable/ic_splash_circles.xml b/android/app/src/bt/res/drawable/ic_splash_circles.xml similarity index 100% rename from android/app/src/bte/res/drawable/ic_splash_circles.xml rename to android/app/src/bt/res/drawable/ic_splash_circles.xml diff --git a/android/app/src/bte/res/drawable/ic_splash_logo.xml b/android/app/src/bt/res/drawable/ic_splash_logo.xml similarity index 100% rename from android/app/src/bte/res/drawable/ic_splash_logo.xml rename to android/app/src/bt/res/drawable/ic_splash_logo.xml diff --git a/android/app/src/bte/res/drawable/ic_splash_text.xml b/android/app/src/bt/res/drawable/ic_splash_text.xml similarity index 100% rename from android/app/src/bte/res/drawable/ic_splash_text.xml rename to android/app/src/bt/res/drawable/ic_splash_text.xml diff --git a/android/app/src/bte/res/drawable/launcher_background.xml b/android/app/src/bt/res/drawable/launcher_background.xml similarity index 100% rename from android/app/src/bte/res/drawable/launcher_background.xml rename to android/app/src/bt/res/drawable/launcher_background.xml diff --git a/android/app/src/bte/res/layout/launch_screen.xml b/android/app/src/bt/res/layout/launch_screen.xml similarity index 100% rename from android/app/src/bte/res/layout/launch_screen.xml rename to android/app/src/bt/res/layout/launch_screen.xml diff --git a/android/app/src/bte/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/bt/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from android/app/src/bte/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/bt/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/android/app/src/bte/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/bt/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/app/src/bte/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/bt/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/app/src/bte/res/mipmap-hdpi/ic_launcher.png b/android/app/src/bt/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from android/app/src/bte/res/mipmap-hdpi/ic_launcher.png rename to android/app/src/bt/res/mipmap-hdpi/ic_launcher.png diff --git a/android/app/src/bte/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/bt/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from android/app/src/bte/res/mipmap-hdpi/ic_launcher_foreground.png rename to android/app/src/bt/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/android/app/src/bte/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/bt/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/bte/res/mipmap-hdpi/ic_launcher_round.png rename to android/app/src/bt/res/mipmap-hdpi/ic_launcher_round.png diff --git a/android/app/src/bte/res/mipmap-mdpi/ic_launcher.png b/android/app/src/bt/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from android/app/src/bte/res/mipmap-mdpi/ic_launcher.png rename to android/app/src/bt/res/mipmap-mdpi/ic_launcher.png diff --git a/android/app/src/bte/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/bt/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from android/app/src/bte/res/mipmap-mdpi/ic_launcher_foreground.png rename to android/app/src/bt/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/android/app/src/bte/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/bt/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/bte/res/mipmap-mdpi/ic_launcher_round.png rename to android/app/src/bt/res/mipmap-mdpi/ic_launcher_round.png diff --git a/android/app/src/bte/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/bt/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from android/app/src/bte/res/mipmap-xhdpi/ic_launcher.png rename to android/app/src/bt/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/app/src/bte/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/bt/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from android/app/src/bte/res/mipmap-xhdpi/ic_launcher_foreground.png rename to android/app/src/bt/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/android/app/src/bte/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/bt/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/bte/res/mipmap-xhdpi/ic_launcher_round.png rename to android/app/src/bt/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/android/app/src/bte/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/bt/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/src/bt/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/app/src/bte/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/bt/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to android/app/src/bt/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/android/app/src/bte/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/bt/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxhdpi/ic_launcher_round.png rename to android/app/src/bt/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/bte/res/mipmap-xxxhdpi/ic_launcher_round.png rename to android/app/src/bt/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/android/app/src/bte/res/values-ar/strings.xml b/android/app/src/bt/res/values-ar/strings.xml similarity index 100% rename from android/app/src/bte/res/values-ar/strings.xml rename to android/app/src/bt/res/values-ar/strings.xml diff --git a/android/app/src/bte/res/values-da/strings.xml b/android/app/src/bt/res/values-da/strings.xml similarity index 100% rename from android/app/src/bte/res/values-da/strings.xml rename to android/app/src/bt/res/values-da/strings.xml diff --git a/android/app/src/bte/res/values-es-rPR/strings.xml b/android/app/src/bt/res/values-es-rPR/strings.xml similarity index 100% rename from android/app/src/bte/res/values-es-rPR/strings.xml rename to android/app/src/bt/res/values-es-rPR/strings.xml diff --git a/android/app/src/bte/res/values-es/strings.xml b/android/app/src/bt/res/values-es/strings.xml similarity index 100% rename from android/app/src/bte/res/values-es/strings.xml rename to android/app/src/bt/res/values-es/strings.xml diff --git a/android/app/src/bte/res/values-ht/strings.xml b/android/app/src/bt/res/values-ht/strings.xml similarity index 100% rename from android/app/src/bte/res/values-ht/strings.xml rename to android/app/src/bt/res/values-ht/strings.xml diff --git a/android/app/src/bte/res/values-it/strings.xml b/android/app/src/bt/res/values-it/strings.xml similarity index 100% rename from android/app/src/bte/res/values-it/strings.xml rename to android/app/src/bt/res/values-it/strings.xml diff --git a/android/app/src/bte/res/values-ml/strings.xml b/android/app/src/bt/res/values-ml/strings.xml similarity index 100% rename from android/app/src/bte/res/values-ml/strings.xml rename to android/app/src/bt/res/values-ml/strings.xml diff --git a/android/app/src/bte/res/values-nl/strings.xml b/android/app/src/bt/res/values-nl/strings.xml similarity index 100% rename from android/app/src/bte/res/values-nl/strings.xml rename to android/app/src/bt/res/values-nl/strings.xml diff --git a/android/app/src/bte/res/values-pl/strings.xml b/android/app/src/bt/res/values-pl/strings.xml similarity index 100% rename from android/app/src/bte/res/values-pl/strings.xml rename to android/app/src/bt/res/values-pl/strings.xml diff --git a/android/app/src/bte/res/values-pt-rBR/strings.xml b/android/app/src/bt/res/values-pt-rBR/strings.xml similarity index 100% rename from android/app/src/bte/res/values-pt-rBR/strings.xml rename to android/app/src/bt/res/values-pt-rBR/strings.xml diff --git a/android/app/src/bte/res/values-ru/strings.xml b/android/app/src/bt/res/values-ru/strings.xml similarity index 100% rename from android/app/src/bte/res/values-ru/strings.xml rename to android/app/src/bt/res/values-ru/strings.xml diff --git a/android/app/src/bte/res/values-sk/strings.xml b/android/app/src/bt/res/values-sk/strings.xml similarity index 100% rename from android/app/src/bte/res/values-sk/strings.xml rename to android/app/src/bt/res/values-sk/strings.xml diff --git a/android/app/src/bte/res/values/colors.xml b/android/app/src/bt/res/values/colors.xml similarity index 100% rename from android/app/src/bte/res/values/colors.xml rename to android/app/src/bt/res/values/colors.xml diff --git a/android/app/src/bte/res/values/ic_launcher_background.xml b/android/app/src/bt/res/values/ic_launcher_background.xml similarity index 100% rename from android/app/src/bte/res/values/ic_launcher_background.xml rename to android/app/src/bt/res/values/ic_launcher_background.xml diff --git a/android/app/src/bte/res/values/strings.xml b/android/app/src/bt/res/values/strings.xml similarity index 100% rename from android/app/src/bte/res/values/strings.xml rename to android/app/src/bt/res/values/strings.xml diff --git a/android/app/src/bte/res/values/styles.xml b/android/app/src/bt/res/values/styles.xml similarity index 100% rename from android/app/src/bte/res/values/styles.xml rename to android/app/src/bt/res/values/styles.xml diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index d054895cc1..a0ec343c04 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -68,15 +68,15 @@ platform :android do end desc "Build a Staging AAB" - lane :staging_bte do + lane :staging_bt do gradle( - task: "clean assembleBteStaging", + task: "clean assembleBtStaging", print_command: false, ) end desc "Build a Release AAB" - lane :release_bte do + lane :release_bt do build_number = ENV["GITHUB_RUN_NUMBER"] @@ -87,7 +87,7 @@ platform :android do gradle( task: "bundle", - build_type: "bteRelease", + build_type: "btRelease", print_command: false, properties: { "android.injected.signing.store.password" => ENV["KEY_STORE_PASSWORD"], @@ -99,7 +99,7 @@ platform :android do end desc "Upload to google play store beta track" - lane :play_store_bte do + lane :play_store_bt do validate_play_store_json_key( json_key: "app/json_key.json", @@ -109,8 +109,8 @@ platform :android do track: 'beta', release_status: 'draft', skip_upload_apk: true, - package_name: 'org.pathcheck.covidsafepathsBte', - aab: "app/build/outputs/bundle/bteRelease/app.aab" + package_name: 'org.pathcheck.covidsafepathsBt', + aab: "app/build/outputs/bundle/btRelease/app.aab" ) end diff --git a/android/fastlane/README.md b/android/fastlane/README.md index 047d3aade2..292bc10dda 100644 --- a/android/fastlane/README.md +++ b/android/fastlane/README.md @@ -36,19 +36,19 @@ Build a Release APK and AAB fastlane android play_store ``` Upload to google play store beta track -### android staging_bte +### android staging_bt ``` -fastlane android staging_bte +fastlane android staging_bt ``` Build a Staging APK and AAB -### android release_bte +### android release_bt ``` -fastlane android release_bte +fastlane android release_bt ``` Build a Release APK and AAB -### android play_store_bte +### android play_store_bt ``` -fastlane android play_store_bte +fastlane android play_store_bt ``` Upload to google play store beta track diff --git a/app/locales/pull.sh b/app/locales/pull.sh index 8cbc6082ce..0662985775 100755 --- a/app/locales/pull.sh +++ b/app/locales/pull.sh @@ -48,14 +48,14 @@ lokalise2 file download \ --export-sort=a_z \ --config .lokalise.yml --token=$LOKALISE_TOKEN -echo "Downloading Android BTE strings.xml" +echo "Downloading Android BT strings.xml" lokalise2 file download \ --add-newline-eof \ --export-empty-as skip \ --format xml \ --include-description \ --original-filenames \ - --unzip-to=android/app/src/bte/res \ + --unzip-to=android/app/src/bt/res \ --export-sort=a_z \ --config .lokalise.yml --token=$LOKALISE_TOKEN diff --git a/app/locales/push.sh b/app/locales/push.sh index 21484bd12b..2c09a9cfe4 100755 --- a/app/locales/push.sh +++ b/app/locales/push.sh @@ -28,7 +28,7 @@ fi echo "Uploading English base files" lokalise2 file upload \ - --file=app/locales/en.json,ios/en.lproj/InfoPlist.strings,ios/en.lproj/Localizable.strings,android/app/src/gps/res/values/strings.xml,android/app/src/bte/res/values/strings.xml \ + --file=app/locales/en.json,ios/en.lproj/InfoPlist.strings,ios/en.lproj/Localizable.strings,android/app/src/gps/res/values/strings.xml,android/app/src/bt/res/values/strings.xml \ --lang-iso=en \ --cleanup-mode \ --replace-modified \ diff --git a/ios/AppDelegate.m b/ios/AppDelegate.m index d4588f32cf..d12300a283 100644 --- a/ios/AppDelegate.m +++ b/ios/AppDelegate.m @@ -1,6 +1,6 @@ // // AppDelegate.m -// BTE +// BT // // Created by John Schoeman on 5/28/20. // Copyright © 2020 Path Check Inc. All rights reserved. @@ -15,7 +15,7 @@ #import #import #import -#import +#import @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions diff --git a/ios/BTE/API/APIClient.swift b/ios/BT/API/APIClient.swift similarity index 100% rename from ios/BTE/API/APIClient.swift rename to ios/BT/API/APIClient.swift diff --git a/ios/BTE/API/APIRequest.swift b/ios/BT/API/APIRequest.swift similarity index 100% rename from ios/BTE/API/APIRequest.swift rename to ios/BT/API/APIRequest.swift diff --git a/ios/BTE/API/JSON.swift b/ios/BT/API/JSON.swift similarity index 100% rename from ios/BTE/API/JSON.swift rename to ios/BT/API/JSON.swift diff --git a/ios/BTE/API/Model/Exposure.swift b/ios/BT/API/Model/Exposure.swift similarity index 100% rename from ios/BTE/API/Model/Exposure.swift rename to ios/BT/API/Model/Exposure.swift diff --git a/ios/BTE/API/Model/ExposureConfiguration.swift b/ios/BT/API/Model/ExposureConfiguration.swift similarity index 100% rename from ios/BTE/API/Model/ExposureConfiguration.swift rename to ios/BT/API/Model/ExposureConfiguration.swift diff --git a/ios/BTE/API/Model/ExposureKey.swift b/ios/BT/API/Model/ExposureKey.swift similarity index 100% rename from ios/BTE/API/Model/ExposureKey.swift rename to ios/BT/API/Model/ExposureKey.swift diff --git a/ios/BTE/API/Model/TestResult.swift b/ios/BT/API/Model/TestResult.swift similarity index 100% rename from ios/BTE/API/Model/TestResult.swift rename to ios/BT/API/Model/TestResult.swift diff --git a/ios/BTE/API/Model/UserState.swift b/ios/BT/API/Model/UserState.swift similarity index 100% rename from ios/BTE/API/Model/UserState.swift rename to ios/BT/API/Model/UserState.swift diff --git a/ios/BTE/API/Requests/DiagnosisKeyRequests.swift b/ios/BT/API/Requests/DiagnosisKeyRequests.swift similarity index 100% rename from ios/BTE/API/Requests/DiagnosisKeyRequests.swift rename to ios/BT/API/Requests/DiagnosisKeyRequests.swift diff --git a/ios/BTE/API/Requests/DiagnosisKeyUrlRequests.swift b/ios/BT/API/Requests/DiagnosisKeyUrlRequests.swift similarity index 100% rename from ios/BTE/API/Requests/DiagnosisKeyUrlRequests.swift rename to ios/BT/API/Requests/DiagnosisKeyUrlRequests.swift diff --git a/ios/BTE/API/Requests/ExposureConfigurationRequests.swift b/ios/BT/API/Requests/ExposureConfigurationRequests.swift similarity index 100% rename from ios/BTE/API/Requests/ExposureConfigurationRequests.swift rename to ios/BT/API/Requests/ExposureConfigurationRequests.swift diff --git a/ios/BTE/API/Result.swift b/ios/BT/API/Result.swift similarity index 100% rename from ios/BTE/API/Result.swift rename to ios/BT/API/Result.swift diff --git a/ios/BTE/API/StructuredError.swift b/ios/BT/API/StructuredError.swift similarity index 100% rename from ios/BTE/API/StructuredError.swift rename to ios/BT/API/StructuredError.swift diff --git a/ios/BTE/API/TypeAliases.swift b/ios/BT/API/TypeAliases.swift similarity index 100% rename from ios/BTE/API/TypeAliases.swift rename to ios/BT/API/TypeAliases.swift diff --git a/ios/BTE/BTE-Bridging-Header.h b/ios/BT/BT-Bridging-Header.h similarity index 83% rename from ios/BTE/BTE-Bridging-Header.h rename to ios/BT/BT-Bridging-Header.h index 4a72490b7b..f750d23f73 100644 --- a/ios/BTE/BTE-Bridging-Header.h +++ b/ios/BT/BT-Bridging-Header.h @@ -1,6 +1,6 @@ // -// BTE-Bridging-Header.h -// BTE +// BT-Bridging-Header.h +// BT // // Created by John Schoeman on 6/1/20. // Copyright © 2020 Path Check Inc. All rights reserved. diff --git a/ios/BTE/COVIDSafePaths.entitlements b/ios/BT/COVIDSafePaths.entitlements similarity index 100% rename from ios/BTE/COVIDSafePaths.entitlements rename to ios/BT/COVIDSafePaths.entitlements diff --git a/ios/BTE/DebugAction.swift b/ios/BT/DebugAction.swift similarity index 100% rename from ios/BTE/DebugAction.swift rename to ios/BT/DebugAction.swift diff --git a/ios/BTE/ExposureManager.swift b/ios/BT/ExposureManager.swift similarity index 89% rename from ios/BTE/ExposureManager.swift rename to ios/BT/ExposureManager.swift index 1d66c1b812..e6522cf2c8 100644 --- a/ios/BTE/ExposureManager.swift +++ b/ios/BT/ExposureManager.swift @@ -69,14 +69,14 @@ final class ExposureManager: NSObject { } else { switch result { case let .success((newExposures, nextDiagnosisKeyFileIndex)): - BTESecureStorage.shared.nextDiagnosisKeyFileIndex = nextDiagnosisKeyFileIndex - BTESecureStorage.shared.dateLastPerformedExposureDetection = Date() - BTESecureStorage.shared.exposureDetectionErrorLocalizedDescription = .default - BTESecureStorage.shared.exposures.append(objectsIn: newExposures) + BTSecureStorage.shared.nextDiagnosisKeyFileIndex = nextDiagnosisKeyFileIndex + BTSecureStorage.shared.dateLastPerformedExposureDetection = Date() + BTSecureStorage.shared.exposureDetectionErrorLocalizedDescription = .default + BTSecureStorage.shared.exposures.append(objectsIn: newExposures) detectingExposures = false completionHandler?(true) case let .failure(error): - BTESecureStorage.shared.exposureDetectionErrorLocalizedDescription = error.localizedDescription + BTSecureStorage.shared.exposureDetectionErrorLocalizedDescription = error.localizedDescription // Consider posting a user notification that an error occured detectingExposures = false completionHandler?(false) @@ -85,7 +85,7 @@ final class ExposureManager: NSObject { } - BTESecureStorage.shared.getUserState { userState in + BTSecureStorage.shared.getUserState { userState in APIClient.shared.request(DiagnosisKeyUrlListRequest.get(userState.nextDiagnosisKeyFileIndex), requestType: .get) { result in let dispatchGroup = DispatchGroup() @@ -207,23 +207,23 @@ final class ExposureManager: NSObject { } } case .simulateExposureDetectionError: - BTESecureStorage.shared.exposureDetectionErrorLocalizedDescription = "Unable to connect to server." - completion([NSNull(), "Exposure deteaction error message: \(BTESecureStorage.shared.exposureDetectionErrorLocalizedDescription)"]) + BTSecureStorage.shared.exposureDetectionErrorLocalizedDescription = "Unable to connect to server." + completion([NSNull(), "Exposure deteaction error message: \(BTSecureStorage.shared.exposureDetectionErrorLocalizedDescription)"]) case .simulateExposure: let exposure = Exposure(id: UUID().uuidString, date: Date() - TimeInterval.random(in: 1...4) * 24 * 60 * 60, duration: TimeInterval(Int.random(in: 1...5) * 60 * 5), totalRiskScore: .random(in: 1...8), transmissionRiskLevel: .random(in: 0...7)) - BTESecureStorage.shared.exposures.append(exposure) - completion([NSNull(), "Exposures: \(BTESecureStorage.shared.exposures)"]) + BTSecureStorage.shared.exposures.append(exposure) + completion([NSNull(), "Exposures: \(BTSecureStorage.shared.exposures)"]) case .simulatePositiveDiagnosis: let testResult = TestResult(id: UUID().uuidString, isAdded: true, dateAdministered: Date() - TimeInterval.random(in: 0...4) * 24 * 60 * 60, isShared: .random()) - BTESecureStorage.shared.testResults.append(testResult) - completion([NSNull(), "Test results: \(BTESecureStorage.shared.testResults)"]) + BTSecureStorage.shared.testResults.append(testResult) + completion([NSNull(), "Test results: \(BTSecureStorage.shared.testResults)"]) case .disableExposureNotifications: manager.setExposureNotificationEnabled(false) { error in if let error = error { @@ -233,11 +233,11 @@ final class ExposureManager: NSObject { } } case .resetExposureDetectionError: - BTESecureStorage.shared.exposureDetectionErrorLocalizedDescription = .default + BTSecureStorage.shared.exposureDetectionErrorLocalizedDescription = .default completion([NSNull(), "Exposure Detection Error: "]) case .resetUserENState: - BTESecureStorage.shared.resetUserState { userState in + BTSecureStorage.shared.resetUserState { userState in completion([NSNull(), "New UserState: \(userState)"]) } case .getAndPostDiagnosisKeys: diff --git a/ios/BTE/Extensions/ENTemporaryExposureKey+Extensions.swift b/ios/BT/Extensions/ENTemporaryExposureKey+Extensions.swift similarity index 100% rename from ios/BTE/Extensions/ENTemporaryExposureKey+Extensions.swift rename to ios/BT/Extensions/ENTemporaryExposureKey+Extensions.swift diff --git a/ios/BT/Extensions/Notification+Extensions.swift b/ios/BT/Extensions/Notification+Extensions.swift new file mode 100644 index 0000000000..1aed5ebcc2 --- /dev/null +++ b/ios/BT/Extensions/Notification+Extensions.swift @@ -0,0 +1,7 @@ +extension Notification.Name { + public static let StorageTestResultsDidChange = Notification.Name(rawValue: "BTSecureStorageTestResultsDidChange") + public static let StorageExposureDetectionErrorLocalizedDescriptionDidChange = Notification.Name(rawValue: "BTSecureStorageExposureDetectionErrorLocalizedDescriptionDidChange") + public static let DateLastPerformedExposureDetectionDidChange = Notification.Name(rawValue: "BTSecureStorageDateLastPerformedExposureDetectionDidChange") + public static let ExposuresDidChange = Notification.Name(rawValue: "BTSecureStorageExposuresDidChange") + public static let NextDiagnosisKeyFileIndexDidChange = Notification.Name(rawValue: "BTSecureStorageNextDiagnosisKeyFileIndexDidChange") +} diff --git a/ios/BTE/Extensions/String+Extensions.swift b/ios/BT/Extensions/String+Extensions.swift similarity index 100% rename from ios/BTE/Extensions/String+Extensions.swift rename to ios/BT/Extensions/String+Extensions.swift diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/BT/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 67% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/Contents.json rename to ios/BT/Images.xcassets/AppIcon.appiconset/Contents.json index ae159b8c53..f3cbfbed15 100644 --- a/ios/BTE/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/BT/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,55 +1,55 @@ { "images" : [ { - "filename" : "bte-ios-icon-20@2x.png", + "filename" : "bt-ios-icon-20@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "bte-ios-icon-20@3x.png", + "filename" : "bt-ios-icon-20@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "bte-ios-icon-29@2x.png", + "filename" : "bt-ios-icon-29@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "bte-ios-icon-29@3x.png", + "filename" : "bt-ios-icon-29@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "bte-ios-icon-40@2x.png", + "filename" : "bt-ios-icon-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "bte-ios-icon-40@3x.png", + "filename" : "bt-ios-icon-40@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "bte-ios-icon-60@2x.png", + "filename" : "bt-ios-icon-60@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "bte-ios-icon-60@3x.png", + "filename" : "bt-ios-icon-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "bte-ios-icon-1024@1x.png", + "filename" : "bt-ios-icon-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-1024@1x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-1024@1x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-1024@1x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-1024@1x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-20@2x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-20@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-20@2x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-20@2x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-20@3x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-20@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-20@3x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-20@3x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-29@2x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-29@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-29@2x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-29@2x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-29@3x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-29@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-29@3x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-29@3x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-40@2x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-40@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-40@2x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-40@2x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-40@3x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-40@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-40@3x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-40@3x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-60@2x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-60@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-60@2x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-60@2x.png diff --git a/ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-60@3x.png b/ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-60@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/AppIcon.appiconset/bte-ios-icon-60@3x.png rename to ios/BT/Images.xcassets/AppIcon.appiconset/bt-ios-icon-60@3x.png diff --git a/ios/BTE/Images.xcassets/BgImage.imageset/Contents.json b/ios/BT/Images.xcassets/BgImage.imageset/Contents.json similarity index 100% rename from ios/BTE/Images.xcassets/BgImage.imageset/Contents.json rename to ios/BT/Images.xcassets/BgImage.imageset/Contents.json diff --git a/ios/BTE/Images.xcassets/BgImage.imageset/bgImage.png b/ios/BT/Images.xcassets/BgImage.imageset/bgImage.png similarity index 100% rename from ios/BTE/Images.xcassets/BgImage.imageset/bgImage.png rename to ios/BT/Images.xcassets/BgImage.imageset/bgImage.png diff --git a/ios/BTE/Images.xcassets/BgImage.imageset/bgImage@2x.png b/ios/BT/Images.xcassets/BgImage.imageset/bgImage@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/BgImage.imageset/bgImage@2x.png rename to ios/BT/Images.xcassets/BgImage.imageset/bgImage@2x.png diff --git a/ios/BTE/Images.xcassets/BgImage.imageset/bgImage@3x.png b/ios/BT/Images.xcassets/BgImage.imageset/bgImage@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/BgImage.imageset/bgImage@3x.png rename to ios/BT/Images.xcassets/BgImage.imageset/bgImage@3x.png diff --git a/ios/BTE/Images.xcassets/Contents.json b/ios/BT/Images.xcassets/Contents.json similarity index 100% rename from ios/BTE/Images.xcassets/Contents.json rename to ios/BT/Images.xcassets/Contents.json diff --git a/ios/BTE/Images.xcassets/logoImage.imageset/Contents.json b/ios/BT/Images.xcassets/logoImage.imageset/Contents.json similarity index 68% rename from ios/BTE/Images.xcassets/logoImage.imageset/Contents.json rename to ios/BT/Images.xcassets/logoImage.imageset/Contents.json index 246d509e16..fc1189127b 100644 --- a/ios/BTE/Images.xcassets/logoImage.imageset/Contents.json +++ b/ios/BT/Images.xcassets/logoImage.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "bte-logo-512.png", + "filename" : "bt-logo-512.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "bte-logo-512@2x.png", + "filename" : "bt-logo-512@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "bte-logo-512@3x.png", + "filename" : "bt-logo-512@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512.png b/ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512.png similarity index 100% rename from ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512.png rename to ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512.png diff --git a/ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512@2x.png b/ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512@2x.png similarity index 100% rename from ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512@2x.png rename to ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512@2x.png diff --git a/ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512@3x.png b/ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512@3x.png similarity index 100% rename from ios/BTE/Images.xcassets/logoImage.imageset/bte-logo-512@3x.png rename to ios/BT/Images.xcassets/logoImage.imageset/bt-logo-512@3x.png diff --git a/ios/BTE/Info.plist b/ios/BT/Info.plist similarity index 100% rename from ios/BTE/Info.plist rename to ios/BT/Info.plist diff --git a/ios/BTE/Storage/BTESecureStorage.swift b/ios/BT/Storage/BTSecureStorage.swift similarity index 96% rename from ios/BTE/Storage/BTESecureStorage.swift rename to ios/BT/Storage/BTSecureStorage.swift index 4cff8d9f10..735badbdd0 100644 --- a/ios/BTE/Storage/BTESecureStorage.swift +++ b/ios/BT/Storage/BTSecureStorage.swift @@ -2,9 +2,9 @@ import ExposureNotification import Foundation import RealmSwift -final class BTESecureStorage: SafePathsSecureStorage { +final class BTSecureStorage: SafePathsSecureStorage { - static let shared = BTESecureStorage() + static let shared = BTSecureStorage() override var keychainIdentifier: String { "org.pathcheck.bt.realm" diff --git a/ios/BTE/Storage/Persisted.swift b/ios/BT/Storage/Persisted.swift similarity index 87% rename from ios/BTE/Storage/Persisted.swift rename to ios/BT/Storage/Persisted.swift index cce93e5ce3..5ff736d2a4 100644 --- a/ios/BTE/Storage/Persisted.swift +++ b/ios/BT/Storage/Persisted.swift @@ -15,8 +15,8 @@ class Persisted { var wrappedValue: Value { didSet { - BTESecureStorage.shared.getUserState { userState in - guard let realmConfig = BTESecureStorage.shared.getRealmConfig() else { + BTSecureStorage.shared.getUserState { userState in + guard let realmConfig = BTSecureStorage.shared.getRealmConfig() else { return } let realm = try! Realm(configuration: realmConfig) diff --git a/ios/BTE/bridge/DebugMenuModule.m b/ios/BT/bridge/DebugMenuModule.m similarity index 99% rename from ios/BTE/bridge/DebugMenuModule.m rename to ios/BT/bridge/DebugMenuModule.m index 3d96eddc3b..62416627aa 100644 --- a/ios/BTE/bridge/DebugMenuModule.m +++ b/ios/BT/bridge/DebugMenuModule.m @@ -1,6 +1,6 @@ #import #import -#import "BTE-Swift.h" +#import "BT-Swift.h" @interface DebugMenuModule: NSObject @end diff --git a/ios/BTE/bridge/PTCExposureManagerModule.m b/ios/BT/bridge/PTCExposureManagerModule.m similarity index 94% rename from ios/BTE/bridge/PTCExposureManagerModule.m rename to ios/BT/bridge/PTCExposureManagerModule.m index 884450c352..b1273831e4 100644 --- a/ios/BTE/bridge/PTCExposureManagerModule.m +++ b/ios/BT/bridge/PTCExposureManagerModule.m @@ -1,6 +1,6 @@ #import #import -#import "BTE-Swift.h" +#import "BT-Swift.h" @interface PTCExposureManagerModule: NSObject @end diff --git a/ios/BTE/main.m b/ios/BT/main.m similarity index 97% rename from ios/BTE/main.m rename to ios/BT/main.m index 23128981cf..7c770c7014 100644 --- a/ios/BTE/main.m +++ b/ios/BT/main.m @@ -1,6 +1,6 @@ // // main.m -// BTE +// BT // // Created by John Schoeman on 5/28/20. // Copyright © 2020 Path Check Inc. All rights reserved. diff --git a/ios/BTE/Extensions/Notification+Extensions.swift b/ios/BTE/Extensions/Notification+Extensions.swift deleted file mode 100644 index ba9b8c9fe5..0000000000 --- a/ios/BTE/Extensions/Notification+Extensions.swift +++ /dev/null @@ -1,7 +0,0 @@ -extension Notification.Name { - public static let StorageTestResultsDidChange = Notification.Name(rawValue: "BTESecureStorageTestResultsDidChange") - public static let StorageExposureDetectionErrorLocalizedDescriptionDidChange = Notification.Name(rawValue: "BTESecureStorageExposureDetectionErrorLocalizedDescriptionDidChange") - public static let DateLastPerformedExposureDetectionDidChange = Notification.Name(rawValue: "BTESecureStorageDateLastPerformedExposureDetectionDidChange") - public static let ExposuresDidChange = Notification.Name(rawValue: "BTESecureStorageExposuresDidChange") - public static let NextDiagnosisKeyFileIndexDidChange = Notification.Name(rawValue: "BTESecureStorageNextDiagnosisKeyFileIndexDidChange") -} diff --git a/ios/BTETestsInfo.plist b/ios/BTTestsInfo.plist similarity index 100% rename from ios/BTETestsInfo.plist rename to ios/BTTestsInfo.plist diff --git a/ios/COVIDSafePaths.xcodeproj/project.pbxproj b/ios/COVIDSafePaths.xcodeproj/project.pbxproj index e667238681..e8a84e3273 100644 --- a/ios/COVIDSafePaths.xcodeproj/project.pbxproj +++ b/ios/COVIDSafePaths.xcodeproj/project.pbxproj @@ -44,7 +44,7 @@ 522B6187A48A4AF3A676D5A0 /* IBMPlexSans-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1423A22FF9E04F88BEEE42D6 /* IBMPlexSans-Thin.ttf */; }; 527CA705E5514AF9BEAC9A2F /* IBMPlexMono-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6C8CF282C4264C88A4ED8ABF /* IBMPlexMono-Medium.ttf */; }; 57693D8BEF8A40C289F7168A /* IBMPlexSans-ExtraLightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3A582C62ABAC478BBD976037 /* IBMPlexSans-ExtraLightItalic.ttf */; }; - 626DB8AB8AF9D02B9E411601 /* libPods-BTE.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 48FB16255EA745CC27C638A1 /* libPods-BTE.a */; }; + 626DB8AB8AF9D02B9E411601 /* libPods-BT.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 48FB16255EA745CC27C638A1 /* libPods-BT.a */; }; 6858E21561F14E61A6A85280 /* IBMPlexSans-SemiBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 747AA5DBBC684319A8273F2C /* IBMPlexSans-SemiBoldItalic.ttf */; }; 688D1F3F24858B7900AD21AE /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68EFB214248570C2003D84F3 /* Log.swift */; }; 68D8970624809AA50091A254 /* Scrypt in Frameworks */ = {isa = PBXBuildFile; productRef = 68D8970524809AA50091A254 /* Scrypt */; }; @@ -72,7 +72,7 @@ B2A58219244CE80C000F39A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B2A5821B244CE80C000F39A6 /* InfoPlist.strings */; }; B52D88C0248F0FC00071ED51 /* SafePathsSecureStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271881BF2461AF76001DE067 /* SafePathsSecureStorage.swift */; }; B52D88C2248F0FD90071ED51 /* GPSSecureStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52D88C1248F0FD90071ED51 /* GPSSecureStorage.swift */; }; - B52D88C4248F10FD0071ED51 /* BTESecureStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52D88C3248F10FD0071ED51 /* BTESecureStorage.swift */; }; + B52D88C4248F10FD0071ED51 /* BTSecureStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52D88C3248F10FD0071ED51 /* BTSecureStorage.swift */; }; B596C0722488127D00943B79 /* PTCExposureManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = B596C0712488127D00943B79 /* PTCExposureManagerModule.m */; }; B5FB3B43248BD61A001DB1D5 /* DebugMenuModule.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FB3B42248BD61A001DB1D5 /* DebugMenuModule.m */; }; B5FBB0BD2490339900433980 /* DiagnosisKeyUrlRequests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FBB0BC2490339900433980 /* DiagnosisKeyUrlRequests.swift */; }; @@ -149,7 +149,7 @@ D43E27B6F1E045D798270A11 /* IBMPlexSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4904B061CC24439783E20928 /* IBMPlexSans-SemiBold.ttf */; }; D668C3DAB08B4FCBB01E8C2D /* IBMPlexMono-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E5C8EDCCEFCE4874A747E404 /* IBMPlexMono-Light.ttf */; }; D7E714F18C9C4172BC01ADF8 /* IBMPlexMono-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BF6254720C1D4A3288ECE351 /* IBMPlexMono-SemiBold.ttf */; }; - DC5AA89EE2128B33D9D6BE1F /* libPods-BTETests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DC95F63E93B2BB75824CCB3 /* libPods-BTETests.a */; }; + DC5AA89EE2128B33D9D6BE1F /* libPods-BTTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DC95F63E93B2BB75824CCB3 /* libPods-BTTests.a */; }; DED6BB86437B4610B1CD3302 /* IBMPlexSans-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FF7D8132928346A2904ED363 /* IBMPlexSans-ThinItalic.ttf */; }; E815ED8FD59D4635AD64CCB3 /* IBMPlexMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE25A1CE9ED048DC83FAE7B0 /* IBMPlexMono-Bold.ttf */; }; F3B14B1B97834BBC886F10D5 /* IBMPlexSans-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C6CBA4DBBF104AC1AB920555 /* IBMPlexSans-BoldItalic.ttf */; }; @@ -178,7 +178,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = C53FD07D24719AD1006D3268; - remoteInfo = BTE; + remoteInfo = BT; }; C5C850E024804A0300A494CA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -215,12 +215,12 @@ 08445F6524284A42008754AC /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 08445F6724284A52008754AC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 08F2A97BB10A459D962AB877 /* IBMPlexMono.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = IBMPlexMono.ttf; path = ../shared/assets/fonts/IBMPlexMono.ttf; sourceTree = ""; }; - 0AA00174D067CC708D445BC1 /* Pods-BTETests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTETests.debug.xcconfig"; path = "Target Support Files/Pods-BTETests/Pods-BTETests.debug.xcconfig"; sourceTree = ""; }; + 0AA00174D067CC708D445BC1 /* Pods-BTTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTTests.debug.xcconfig"; path = "Target Support Files/Pods-BTTests/Pods-BTTests.debug.xcconfig"; sourceTree = ""; }; 0AB0A08F38494307BF6F0EBC /* IBMPlexMono-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-ThinItalic.ttf"; path = "../app/assets/fonts/IBMPlexMono-ThinItalic.ttf"; sourceTree = ""; }; 0DA5F38AAA9DAD3DC7E25DFE /* Pods-COVIDSafePathsTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePathsTests.release.xcconfig"; path = "Target Support Files/Pods-COVIDSafePathsTests/Pods-COVIDSafePathsTests.release.xcconfig"; sourceTree = ""; }; - 0DC95F63E93B2BB75824CCB3 /* libPods-BTETests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BTETests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0DC95F63E93B2BB75824CCB3 /* libPods-BTTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BTTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 0DD29292C60B45029B7823D6 /* IBMPlexSans-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-ExtraLight.ttf"; path = "../app/assets/fonts/IBMPlexSans-ExtraLight.ttf"; sourceTree = ""; }; - 1360DEA45F2DC8248DFD3B91 /* Pods-BTETests.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTETests.beta.xcconfig"; path = "Target Support Files/Pods-BTETests/Pods-BTETests.beta.xcconfig"; sourceTree = ""; }; + 1360DEA45F2DC8248DFD3B91 /* Pods-BTTests.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTTests.beta.xcconfig"; path = "Target Support Files/Pods-BTTests/Pods-BTTests.beta.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* GPS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GPS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = COVIDSafePaths/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -230,7 +230,7 @@ 1423A22FF9E04F88BEEE42D6 /* IBMPlexSans-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-Thin.ttf"; path = "../shared/assets/fonts/IBMPlexSans-Thin.ttf"; sourceTree = ""; }; 167DF82F84E242A39CBEB042 /* IBMPlexMono-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-ExtraLightItalic.ttf"; path = "../shared/assets/fonts/IBMPlexMono-ExtraLightItalic.ttf"; sourceTree = ""; }; 1ACA74BACC8C2004F373876F /* Pods-GPSTests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPSTests.staging.xcconfig"; path = "Target Support Files/Pods-GPSTests/Pods-GPSTests.staging.xcconfig"; sourceTree = ""; }; - 1C73DA2257D3A75481B746C2 /* Pods-BTETests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTETests.release.xcconfig"; path = "Target Support Files/Pods-BTETests/Pods-BTETests.release.xcconfig"; sourceTree = ""; }; + 1C73DA2257D3A75481B746C2 /* Pods-BTTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTTests.release.xcconfig"; path = "Target Support Files/Pods-BTTests/Pods-BTTests.release.xcconfig"; sourceTree = ""; }; 20E5EE8E6065465F9558DCDB /* IBMPlexMono-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-SemiBoldItalic.ttf"; path = "../app/assets/fonts/IBMPlexMono-SemiBoldItalic.ttf"; sourceTree = ""; }; 210E5F50B07048118538B796 /* IBMPlexSans-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-Italic.ttf"; path = "../shared/assets/fonts/IBMPlexSans-Italic.ttf"; sourceTree = ""; }; 271089AF24698720009AC76F /* LocationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationTests.swift; sourceTree = ""; }; @@ -243,9 +243,9 @@ 2E9077612439A903005C98DE /* SplashScreen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SplashScreen.xcodeproj; path = "../node_modules/react-native-splash-screen/ios/SplashScreen.xcodeproj"; sourceTree = ""; }; 3053DF05D78949A09366B85D /* IBMPlexMono-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-ExtraLight.ttf"; path = "../shared/assets/fonts/IBMPlexMono-ExtraLight.ttf"; sourceTree = ""; }; 3492B066E2C0B51DB382B59D /* libPods-GPS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GPS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3545C7084259A2C3DE79A3F8 /* Pods-BTE.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTE.debug.xcconfig"; path = "Target Support Files/Pods-BTE/Pods-BTE.debug.xcconfig"; sourceTree = ""; }; + 3545C7084259A2C3DE79A3F8 /* Pods-BT.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BT.debug.xcconfig"; path = "Target Support Files/Pods-BT/Pods-BT.debug.xcconfig"; sourceTree = ""; }; 36B22BAB357B44949D2E168C /* IBMPlexSans-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-ExtraLight.ttf"; path = "../shared/assets/fonts/IBMPlexSans-ExtraLight.ttf"; sourceTree = ""; }; - 38AC1D8427675AE31E01A657 /* Pods-BTE.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTE.release.xcconfig"; path = "Target Support Files/Pods-BTE/Pods-BTE.release.xcconfig"; sourceTree = ""; }; + 38AC1D8427675AE31E01A657 /* Pods-BT.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BT.release.xcconfig"; path = "Target Support Files/Pods-BT/Pods-BT.release.xcconfig"; sourceTree = ""; }; 3918820E06534ED8B0C3323C /* IBMPlexMono-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-ThinItalic.ttf"; path = "../shared/assets/fonts/IBMPlexMono-ThinItalic.ttf"; sourceTree = ""; }; 3A582C62ABAC478BBD976037 /* IBMPlexSans-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-ExtraLightItalic.ttf"; path = "../shared/assets/fonts/IBMPlexSans-ExtraLightItalic.ttf"; sourceTree = ""; }; 3CADAF81F25CF0AEB8EE6F82 /* Pods-COVIDSafePaths.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePaths.beta.xcconfig"; path = "Target Support Files/Pods-COVIDSafePaths/Pods-COVIDSafePaths.beta.xcconfig"; sourceTree = ""; }; @@ -254,7 +254,7 @@ 425FC7942F9E4A7282551030 /* IBMPlexMono-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-BoldItalic.ttf"; path = "../app/assets/fonts/IBMPlexMono-BoldItalic.ttf"; sourceTree = ""; }; 43AEA0E0E250167239F96DA4 /* Pods-GPS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPS.release.xcconfig"; path = "Target Support Files/Pods-GPS/Pods-GPS.release.xcconfig"; sourceTree = ""; }; 450B58D199444B7D8DEE6A0A /* IBMPlexSans-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-Italic.ttf"; path = "../app/assets/fonts/IBMPlexSans-Italic.ttf"; sourceTree = ""; }; - 48FB16255EA745CC27C638A1 /* libPods-BTE.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BTE.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 48FB16255EA745CC27C638A1 /* libPods-BT.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BT.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4904B061CC24439783E20928 /* IBMPlexSans-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-SemiBold.ttf"; path = "../shared/assets/fonts/IBMPlexSans-SemiBold.ttf"; sourceTree = ""; }; 5210A8DD90D9EAFD1A73B024 /* Pods-GPSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPSTests.debug.xcconfig"; path = "Target Support Files/Pods-GPSTests/Pods-GPSTests.debug.xcconfig"; sourceTree = ""; }; 53A0C1C57CED4660822FE560 /* IBMPlexMono-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-Medium.ttf"; path = "../app/assets/fonts/IBMPlexMono-Medium.ttf"; sourceTree = ""; }; @@ -279,7 +279,7 @@ 71D1C872DB0CCC3BBC3D907E /* Pods-COVIDSafePaths.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePaths.debug.xcconfig"; path = "Target Support Files/Pods-COVIDSafePaths/Pods-COVIDSafePaths.debug.xcconfig"; sourceTree = ""; }; 71F26FBF5BDA423184286546 /* IBMPlexMono-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-MediumItalic.ttf"; path = "../shared/assets/fonts/IBMPlexMono-MediumItalic.ttf"; sourceTree = ""; }; 747AA5DBBC684319A8273F2C /* IBMPlexSans-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-SemiBoldItalic.ttf"; path = "../shared/assets/fonts/IBMPlexSans-SemiBoldItalic.ttf"; sourceTree = ""; }; - 795EB96E2CB0CB5162881486 /* Pods-BTE.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTE.beta.xcconfig"; path = "Target Support Files/Pods-BTE/Pods-BTE.beta.xcconfig"; sourceTree = ""; }; + 795EB96E2CB0CB5162881486 /* Pods-BT.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BT.beta.xcconfig"; path = "Target Support Files/Pods-BT/Pods-BT.beta.xcconfig"; sourceTree = ""; }; 7E34F61FD4EF1001B4517900 /* Pods-COVIDSafePaths.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePaths.staging.xcconfig"; path = "Target Support Files/Pods-COVIDSafePaths/Pods-COVIDSafePaths.staging.xcconfig"; sourceTree = ""; }; 86BC12080FD7AC01C8D8206B /* Pods-GPS.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPS.beta.xcconfig"; path = "Target Support Files/Pods-GPS/Pods-GPS.beta.xcconfig"; sourceTree = ""; }; 89D241005D9647C4B0586127 /* IBMPlexSans.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = IBMPlexSans.ttf; path = ../shared/assets/fonts/IBMPlexSans.ttf; sourceTree = ""; }; @@ -289,7 +289,7 @@ 9B4A262ECA724F9CAB9A2C70 /* IBMPlexMono-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-BoldItalic.ttf"; path = "../shared/assets/fonts/IBMPlexMono-BoldItalic.ttf"; sourceTree = ""; }; 9FA39802441F3BE7A66ECEDB /* Pods-COVIDSafePaths-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePaths-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-COVIDSafePaths-tvOSTests/Pods-COVIDSafePaths-tvOSTests.release.xcconfig"; sourceTree = ""; }; A57577D96B89452694B53982 /* IBMPlexSans-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-MediumItalic.ttf"; path = "../shared/assets/fonts/IBMPlexSans-MediumItalic.ttf"; sourceTree = ""; }; - A57EBADB9939F6264CFDDCC3 /* Pods-BTE.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTE.staging.xcconfig"; path = "Target Support Files/Pods-BTE/Pods-BTE.staging.xcconfig"; sourceTree = ""; }; + A57EBADB9939F6264CFDDCC3 /* Pods-BT.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BT.staging.xcconfig"; path = "Target Support Files/Pods-BT/Pods-BT.staging.xcconfig"; sourceTree = ""; }; AA3F8B702AA869F663C4CB5C /* Pods-GPS.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPS.staging.xcconfig"; path = "Target Support Files/Pods-GPS/Pods-GPS.staging.xcconfig"; sourceTree = ""; }; AD17896CB8387148B1D74914 /* Pods-GPS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GPS.debug.xcconfig"; path = "Target Support Files/Pods-GPS/Pods-GPS.debug.xcconfig"; sourceTree = ""; }; AE25A1CE9ED048DC83FAE7B0 /* IBMPlexMono-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-Bold.ttf"; path = "../shared/assets/fonts/IBMPlexMono-Bold.ttf"; sourceTree = ""; }; @@ -319,7 +319,7 @@ B3297E1A39360171CB7CC3C8 /* libPods-GPSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GPSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B3D0B8224679467D85423742 /* IBMPlexMono-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-Italic.ttf"; path = "../app/assets/fonts/IBMPlexMono-Italic.ttf"; sourceTree = ""; }; B52D88C1248F0FD90071ED51 /* GPSSecureStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPSSecureStorage.swift; sourceTree = ""; }; - B52D88C3248F10FD0071ED51 /* BTESecureStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTESecureStorage.swift; sourceTree = ""; }; + B52D88C3248F10FD0071ED51 /* BTSecureStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTSecureStorage.swift; sourceTree = ""; }; B596C0712488127D00943B79 /* PTCExposureManagerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PTCExposureManagerModule.m; sourceTree = ""; }; B5FB3B42248BD61A001DB1D5 /* DebugMenuModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DebugMenuModule.m; sourceTree = ""; }; B5FBB0BC2490339900433980 /* DiagnosisKeyUrlRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiagnosisKeyUrlRequests.swift; sourceTree = ""; }; @@ -343,13 +343,13 @@ B5FC37F5248A9968006474EB /* ENTemporaryExposureKey+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ENTemporaryExposureKey+Extensions.swift"; sourceTree = ""; }; BF6254720C1D4A3288ECE351 /* IBMPlexMono-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-SemiBold.ttf"; path = "../shared/assets/fonts/IBMPlexMono-SemiBold.ttf"; sourceTree = ""; }; C42F32AF52974EE8ADEE67B5 /* IBMPlexSans-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-Medium.ttf"; path = "../shared/assets/fonts/IBMPlexSans-Medium.ttf"; sourceTree = ""; }; - C53FD0C124719AD1006D3268 /* BTE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BTE.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C53FD0C124719AD1006D3268 /* BT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BT.app; sourceTree = BUILT_PRODUCTS_DIR; }; C53FD0C224719AD2006D3268 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C53FD116247454EA006D3268 /* COVIDSafePaths.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = COVIDSafePaths.entitlements; path = BTE/COVIDSafePaths.entitlements; sourceTree = ""; }; - C56190A12485332E009A6756 /* BTE-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BTE-Bridging-Header.h"; sourceTree = ""; }; + C53FD116247454EA006D3268 /* COVIDSafePaths.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = COVIDSafePaths.entitlements; path = BT/COVIDSafePaths.entitlements; sourceTree = ""; }; + C56190A12485332E009A6756 /* BT-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BT-Bridging-Header.h"; sourceTree = ""; }; C58463E32486C51100BCB842 /* ExposureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExposureManager.swift; sourceTree = ""; }; C5850A63247D5A41007A596B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - C5AA24E124768FFF00BA0A99 /* BTETests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTETests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C5AA24E124768FFF00BA0A99 /* BTTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BTTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C5C850C6248014F700A494CA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; C5C850C92480156200A494CA /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; }; C5C850DC24804A0300A494CA /* RCTBackgroundGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBackgroundGeolocation.xcodeproj; path = "../node_modules/@mauron85/react-native-background-geolocation/ios/RCTBackgroundGeolocation.xcodeproj"; sourceTree = ""; }; @@ -382,7 +382,7 @@ F2FF56A5536545E693AF41DC /* IBMPlexMono-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-LightItalic.ttf"; path = "../app/assets/fonts/IBMPlexMono-LightItalic.ttf"; sourceTree = ""; }; F3267DEC44754D9BB6ABA49D /* IBMPlexSans-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-BoldItalic.ttf"; path = "../app/assets/fonts/IBMPlexSans-BoldItalic.ttf"; sourceTree = ""; }; F78DC3372D75A63AFE69ADCE /* Pods-COVIDSafePathsTests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-COVIDSafePathsTests.staging.xcconfig"; path = "Target Support Files/Pods-COVIDSafePathsTests/Pods-COVIDSafePathsTests.staging.xcconfig"; sourceTree = ""; }; - F9475E01B42150CFCF453D52 /* Pods-BTETests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTETests.staging.xcconfig"; path = "Target Support Files/Pods-BTETests/Pods-BTETests.staging.xcconfig"; sourceTree = ""; }; + F9475E01B42150CFCF453D52 /* Pods-BTTests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BTTests.staging.xcconfig"; path = "Target Support Files/Pods-BTTests/Pods-BTTests.staging.xcconfig"; sourceTree = ""; }; F9ABA426412C489ABAE6E56B /* IBMPlexSans-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSans-LightItalic.ttf"; path = "../app/assets/fonts/IBMPlexSans-LightItalic.ttf"; sourceTree = ""; }; FAA9C6E73C124FF5AF424D48 /* IBMPlexMono-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-Thin.ttf"; path = "../app/assets/fonts/IBMPlexMono-Thin.ttf"; sourceTree = ""; }; FCF549913C514FDC98379A78 /* IBMPlexMono-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexMono-SemiBold.ttf"; path = "../app/assets/fonts/IBMPlexMono-SemiBold.ttf"; sourceTree = ""; }; @@ -442,7 +442,7 @@ C53FD09824719AD1006D3268 /* CoreData.framework in Frameworks */, C53FD09924719AD1006D3268 /* Accelerate.framework in Frameworks */, 68EFB21324856EC6003D84F3 /* Scrypt in Frameworks */, - 626DB8AB8AF9D02B9E411601 /* libPods-BTE.a in Frameworks */, + 626DB8AB8AF9D02B9E411601 /* libPods-BT.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -450,7 +450,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DC5AA89EE2128B33D9D6BE1F /* libPods-BTETests.a in Frameworks */, + DC5AA89EE2128B33D9D6BE1F /* libPods-BTTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -494,18 +494,18 @@ F78DC3372D75A63AFE69ADCE /* Pods-COVIDSafePathsTests.staging.xcconfig */, 3CADAF81F25CF0AEB8EE6F82 /* Pods-COVIDSafePaths.beta.xcconfig */, D395048E013A063A99716F02 /* Pods-COVIDSafePathsTests.beta.xcconfig */, - 3545C7084259A2C3DE79A3F8 /* Pods-BTE.debug.xcconfig */, - A57EBADB9939F6264CFDDCC3 /* Pods-BTE.staging.xcconfig */, - 38AC1D8427675AE31E01A657 /* Pods-BTE.release.xcconfig */, - 795EB96E2CB0CB5162881486 /* Pods-BTE.beta.xcconfig */, + 3545C7084259A2C3DE79A3F8 /* Pods-BT.debug.xcconfig */, + A57EBADB9939F6264CFDDCC3 /* Pods-BT.staging.xcconfig */, + 38AC1D8427675AE31E01A657 /* Pods-BT.release.xcconfig */, + 795EB96E2CB0CB5162881486 /* Pods-BT.beta.xcconfig */, AD17896CB8387148B1D74914 /* Pods-GPS.debug.xcconfig */, AA3F8B702AA869F663C4CB5C /* Pods-GPS.staging.xcconfig */, 43AEA0E0E250167239F96DA4 /* Pods-GPS.release.xcconfig */, 86BC12080FD7AC01C8D8206B /* Pods-GPS.beta.xcconfig */, - 0AA00174D067CC708D445BC1 /* Pods-BTETests.debug.xcconfig */, - F9475E01B42150CFCF453D52 /* Pods-BTETests.staging.xcconfig */, - 1C73DA2257D3A75481B746C2 /* Pods-BTETests.release.xcconfig */, - 1360DEA45F2DC8248DFD3B91 /* Pods-BTETests.beta.xcconfig */, + 0AA00174D067CC708D445BC1 /* Pods-BTTests.debug.xcconfig */, + F9475E01B42150CFCF453D52 /* Pods-BTTests.staging.xcconfig */, + 1C73DA2257D3A75481B746C2 /* Pods-BTTests.release.xcconfig */, + 1360DEA45F2DC8248DFD3B91 /* Pods-BTTests.beta.xcconfig */, 5210A8DD90D9EAFD1A73B024 /* Pods-GPSTests.debug.xcconfig */, 1ACA74BACC8C2004F373876F /* Pods-GPSTests.staging.xcconfig */, 60B0614ED854C2369C1852FE /* Pods-GPSTests.release.xcconfig */, @@ -581,7 +581,7 @@ isa = PBXGroup; children = ( B52D88BF248F0F130071ED51 /* Common */, - C53FD0C324719C25006D3268 /* BTE */, + C53FD0C324719C25006D3268 /* BT */, C53FD07C247199A4006D3268 /* GPS */, 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, @@ -636,9 +636,9 @@ ED2971642150620600B7C4FE /* JavaScriptCore.framework */, DCA1D1551CFF3D7C90EDC77C /* libPods-COVIDSafePaths-tvOS.a */, 3E10CA5A72D06133B886B461 /* libPods-COVIDSafePaths-tvOSTests.a */, - 48FB16255EA745CC27C638A1 /* libPods-BTE.a */, + 48FB16255EA745CC27C638A1 /* libPods-BT.a */, 3492B066E2C0B51DB382B59D /* libPods-GPS.a */, - 0DC95F63E93B2BB75824CCB3 /* libPods-BTETests.a */, + 0DC95F63E93B2BB75824CCB3 /* libPods-BTTests.a */, B3297E1A39360171CB7CC3C8 /* libPods-GPSTests.a */, ); name = Frameworks; @@ -697,8 +697,8 @@ children = ( 13B07F961A680F5B00A75B9A /* GPS.app */, 00E356EE1AD99517003FC87E /* GPSTests.xctest */, - C53FD0C124719AD1006D3268 /* BTE.app */, - C5AA24E124768FFF00BA0A99 /* BTETests.xctest */, + C53FD0C124719AD1006D3268 /* BT.app */, + C5AA24E124768FFF00BA0A99 /* BTTests.xctest */, ); name = Products; sourceTree = ""; @@ -751,7 +751,7 @@ B5FC37E4248A82D6006474EB /* Storage */ = { isa = PBXGroup; children = ( - B52D88C3248F10FD0071ED51 /* BTESecureStorage.swift */, + B52D88C3248F10FD0071ED51 /* BTSecureStorage.swift */, B5FBB0D024916A7200433980 /* Persisted.swift */, ); path = Storage; @@ -784,7 +784,7 @@ path = GPS; sourceTree = ""; }; - C53FD0C324719C25006D3268 /* BTE */ = { + C53FD0C324719C25006D3268 /* BT */ = { isa = PBXGroup; children = ( B5FC37F2248A9934006474EB /* Extensions */, @@ -795,11 +795,11 @@ C5C850C6248014F700A494CA /* main.m */, C53FD0C224719AD2006D3268 /* Info.plist */, C5850A63247D5A41007A596B /* Images.xcassets */, - C56190A12485332E009A6756 /* BTE-Bridging-Header.h */, + C56190A12485332E009A6756 /* BT-Bridging-Header.h */, C58463E32486C51100BCB842 /* ExposureManager.swift */, B5FBB0CE24916A4C00433980 /* DebugAction.swift */, ); - path = BTE; + path = BT; sourceTree = ""; }; C57BDFB124883EF400CE62B1 /* bridge */ = { @@ -866,9 +866,9 @@ productReference = 13B07F961A680F5B00A75B9A /* GPS.app */; productType = "com.apple.product-type.application"; }; - C53FD07D24719AD1006D3268 /* BTE */ = { + C53FD07D24719AD1006D3268 /* BT */ = { isa = PBXNativeTarget; - buildConfigurationList = C53FD0BC24719AD1006D3268 /* Build configuration list for PBXNativeTarget "BTE" */; + buildConfigurationList = C53FD0BC24719AD1006D3268 /* Build configuration list for PBXNativeTarget "BT" */; buildPhases = ( C53FD07E24719AD1006D3268 /* [CP] Check Pods Manifest.lock */, C53FD07F24719AD1006D3268 /* Start Packager */, @@ -881,17 +881,17 @@ ); dependencies = ( ); - name = BTE; + name = BT; packageProductDependencies = ( 68EFB21224856EC6003D84F3 /* Scrypt */, ); productName = COVIDSafePaths; - productReference = C53FD0C124719AD1006D3268 /* BTE.app */; + productReference = C53FD0C124719AD1006D3268 /* BT.app */; productType = "com.apple.product-type.application"; }; - C5AA24D124768FFF00BA0A99 /* BTETests */ = { + C5AA24D124768FFF00BA0A99 /* BTTests */ = { isa = PBXNativeTarget; - buildConfigurationList = C5AA24DC24768FFF00BA0A99 /* Build configuration list for PBXNativeTarget "BTETests" */; + buildConfigurationList = C5AA24DC24768FFF00BA0A99 /* Build configuration list for PBXNativeTarget "BTTests" */; buildPhases = ( C5AA24D424768FFF00BA0A99 /* [CP] Check Pods Manifest.lock */, C5AA24D524768FFF00BA0A99 /* Sources */, @@ -903,11 +903,11 @@ dependencies = ( C5AA24E42476901700BA0A99 /* PBXTargetDependency */, ); - name = BTETests; + name = BTTests; packageProductDependencies = ( ); productName = COVIDSafePathsTests; - productReference = C5AA24E124768FFF00BA0A99 /* BTETests.xctest */; + productReference = C5AA24E124768FFF00BA0A99 /* BTTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -975,8 +975,8 @@ targets = ( 13B07F861A680F5B00A75B9A /* GPS */, 00E356ED1AD99517003FC87E /* GPSTests */, - C53FD07D24719AD1006D3268 /* BTE */, - C5AA24D124768FFF00BA0A99 /* BTETests */, + C53FD07D24719AD1006D3268 /* BT */, + C5AA24D124768FFF00BA0A99 /* BTTests */, ); }; /* End PBXProject section */ @@ -1142,7 +1142,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-BTE-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-BT-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1197,7 +1197,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-BTETests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-BTTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1294,7 +1294,7 @@ B5FC37E8248A8302006474EB /* TestResult.swift in Sources */, B5FBB0D524916D8900433980 /* UserState.swift in Sources */, B5FBB0D724916DE100433980 /* Notification+Extensions.swift in Sources */, - B52D88C4248F10FD0071ED51 /* BTESecureStorage.swift in Sources */, + B52D88C4248F10FD0071ED51 /* BTSecureStorage.swift in Sources */, B5FC37CC2489B251006474EB /* Result.swift in Sources */, C58463E42486C51100BCB842 /* ExposureManager.swift in Sources */, B5FC37C62489B1B3006474EB /* APIRequest.swift in Sources */, @@ -1340,7 +1340,7 @@ C5AA24E42476901700BA0A99 /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; - target = C53FD07D24719AD1006D3268 /* BTE */; + target = C53FD07D24719AD1006D3268 /* BT */; targetProxy = C5AA24E32476901700BA0A99 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -2072,18 +2072,18 @@ }; C53FD0BD24719AD1006D3268 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3545C7084259A2C3DE79A3F8 /* Pods-BTE.debug.xcconfig */; + baseConfigurationReference = 3545C7084259A2C3DE79A3F8 /* Pods-BT.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = BTE/COVIDSafePaths.entitlements; + CODE_SIGN_ENTITLEMENTS = BT/COVIDSafePaths.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1.0.28; DEAD_CODE_STRIPPING = NO; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 79Z8HUPGC3; - INFOPLIST_FILE = BTE/Info.plist; + INFOPLIST_FILE = BT/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2096,9 +2096,9 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.pathcheck.bt; - PRODUCT_NAME = BTE; + PRODUCT_NAME = BT; PROVISIONING_PROFILE_SPECIFIER = "match Development org.pathcheck.bt"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -2107,18 +2107,18 @@ }; C53FD0BE24719AD1006D3268 /* Staging */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A57EBADB9939F6264CFDDCC3 /* Pods-BTE.staging.xcconfig */; + baseConfigurationReference = A57EBADB9939F6264CFDDCC3 /* Pods-BT.staging.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = BTE/COVIDSafePaths.entitlements; + CODE_SIGN_ENTITLEMENTS = BT/COVIDSafePaths.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1.0.28; DEAD_CODE_STRIPPING = NO; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 79Z8HUPGC3; - INFOPLIST_FILE = BTE/Info.plist; + INFOPLIST_FILE = BT/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2131,9 +2131,9 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.pathcheck.bt; - PRODUCT_NAME = BTE; + PRODUCT_NAME = BT; PROVISIONING_PROFILE_SPECIFIER = "match Development org.pathcheck.bt"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -2142,18 +2142,18 @@ }; C53FD0BF24719AD1006D3268 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 38AC1D8427675AE31E01A657 /* Pods-BTE.release.xcconfig */; + baseConfigurationReference = 38AC1D8427675AE31E01A657 /* Pods-BT.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = BTE/COVIDSafePaths.entitlements; + CODE_SIGN_ENTITLEMENTS = BT/COVIDSafePaths.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1.0.28; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 79Z8HUPGC3; - INFOPLIST_FILE = BTE/Info.plist; + INFOPLIST_FILE = BT/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2166,9 +2166,9 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.pathcheck.bt; - PRODUCT_NAME = BTE; + PRODUCT_NAME = BT; PROVISIONING_PROFILE_SPECIFIER = "match Development org.pathcheck.bt"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -2176,18 +2176,18 @@ }; C53FD0C024719AD1006D3268 /* Beta */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 795EB96E2CB0CB5162881486 /* Pods-BTE.beta.xcconfig */; + baseConfigurationReference = 795EB96E2CB0CB5162881486 /* Pods-BT.beta.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = BTE/COVIDSafePaths.entitlements; + CODE_SIGN_ENTITLEMENTS = BT/COVIDSafePaths.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1.0.28; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 79Z8HUPGC3; - INFOPLIST_FILE = BTE/Info.plist; + INFOPLIST_FILE = BT/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2200,9 +2200,9 @@ "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = org.pathcheck.bt; - PRODUCT_NAME = BTE; + PRODUCT_NAME = BT; PROVISIONING_PROFILE_SPECIFIER = "match Development org.pathcheck.bt"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -2210,7 +2210,7 @@ }; C5AA24DD24768FFF00BA0A99 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0AA00174D067CC708D445BC1 /* Pods-BTETests.debug.xcconfig */; + baseConfigurationReference = 0AA00174D067CC708D445BC1 /* Pods-BTTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -2234,16 +2234,16 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTE.app/BTE"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BT.app/BT"; }; name = Debug; }; C5AA24DE24768FFF00BA0A99 /* Staging */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F9475E01B42150CFCF453D52 /* Pods-BTETests.staging.xcconfig */; + baseConfigurationReference = F9475E01B42150CFCF453D52 /* Pods-BTTests.staging.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -2267,16 +2267,16 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTE.app/BTE"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BT.app/BT"; }; name = Staging; }; C5AA24DF24768FFF00BA0A99 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1C73DA2257D3A75481B746C2 /* Pods-BTETests.release.xcconfig */; + baseConfigurationReference = 1C73DA2257D3A75481B746C2 /* Pods-BTTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -2297,15 +2297,15 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTE.app/BTE"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BT.app/BT"; }; name = Release; }; C5AA24E024768FFF00BA0A99 /* Beta */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1360DEA45F2DC8248DFD3B91 /* Pods-BTETests.beta.xcconfig */; + baseConfigurationReference = 1360DEA45F2DC8248DFD3B91 /* Pods-BTTests.beta.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -2326,9 +2326,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "BTE/BTE-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "BT/BT-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BTE.app/BTE"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BT.app/BT"; }; name = Beta; }; @@ -2368,7 +2368,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C53FD0BC24719AD1006D3268 /* Build configuration list for PBXNativeTarget "BTE" */ = { + C53FD0BC24719AD1006D3268 /* Build configuration list for PBXNativeTarget "BT" */ = { isa = XCConfigurationList; buildConfigurations = ( C53FD0BD24719AD1006D3268 /* Debug */, @@ -2379,7 +2379,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C5AA24DC24768FFF00BA0A99 /* Build configuration list for PBXNativeTarget "BTETests" */ = { + C5AA24DC24768FFF00BA0A99 /* Build configuration list for PBXNativeTarget "BTTests" */ = { isa = XCConfigurationList; buildConfigurations = ( C5AA24DD24768FFF00BA0A99 /* Debug */, diff --git a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Development.xcscheme b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Development.xcscheme similarity index 88% rename from ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Development.xcscheme rename to ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Development.xcscheme index 0aa7ea07ac..5418fc99fc 100644 --- a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Development.xcscheme +++ b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Development.xcscheme @@ -10,13 +10,13 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "echo ".env.bt" > /tmp/envfile # use .env.bt "> @@ -33,8 +33,8 @@ @@ -63,8 +63,8 @@ @@ -80,8 +80,8 @@ diff --git a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Production.xcscheme b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Production.xcscheme similarity index 92% rename from ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Production.xcscheme rename to ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Production.xcscheme index a294247098..841f7d2ac2 100644 --- a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Production.xcscheme +++ b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Production.xcscheme @@ -10,13 +10,13 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "echo ".env.bt.release" > /tmp/envfile # use .env.bt.release "> @@ -47,8 +47,8 @@ diff --git a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Staging.xcscheme b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Staging.xcscheme similarity index 88% rename from ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Staging.xcscheme rename to ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Staging.xcscheme index 3620ce0f2a..29dabf24ec 100644 --- a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Staging.xcscheme +++ b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Staging.xcscheme @@ -10,13 +10,13 @@ ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction"> + scriptText = "echo ".env.bt.staging" > /tmp/envfile # use .env.bt.staging "> @@ -33,8 +33,8 @@ @@ -63,8 +63,8 @@ @@ -86,8 +86,8 @@ diff --git a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Tests.xcscheme b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Tests.xcscheme similarity index 91% rename from ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Tests.xcscheme rename to ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Tests.xcscheme index 40195d598f..7e2954cfd6 100644 --- a/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BTE_Tests.xcscheme +++ b/ios/COVIDSafePaths.xcodeproj/xcshareddata/xcschemes/BT_Tests.xcscheme @@ -15,8 +15,8 @@ @@ -29,8 +29,8 @@ @@ -65,8 +65,8 @@ diff --git a/ios/Podfile b/ios/Podfile index ada77eba09..ccd7d6ffaf 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -53,7 +53,7 @@ def gps_pods pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways.podspec" end -def bte_pods +def bt_pods ### These should be removed in a future commit permissions_path = '../node_modules/react-native-permissions/ios' pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways.podspec" @@ -65,8 +65,8 @@ target 'GPS' do shared_pods end -target 'BTE' do - bte_pods +target 'BT' do + bt_pods shared_pods end @@ -76,8 +76,8 @@ target 'GPSTests' do shared_pods end -target 'BTETests' do +target 'BTTests' do inherit! :search_paths - bte_pods + bt_pods shared_pods end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f7b729e4b6..6223737655 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -518,6 +518,6 @@ SPEC CHECKSUMS: SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23 Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b -PODFILE CHECKSUM: 6f352cde941e47e905ebcc940d3ea58d347b9a1a +PODFILE CHECKSUM: baf57ab8cb13ef692ad8b7fe2d2dab81481b52d3 COCOAPODS: 1.9.1 diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile index 1eb8b8a780..b9227a61ee 100644 --- a/ios/fastlane/Appfile +++ b/ios/fastlane/Appfile @@ -4,7 +4,7 @@ itc_team_id("121372784") # App Store Connect Team ID team_id("79Z8HUPGC3") # Developer Portal Team ID for_platform :ios do - for_lane :release_bte do + for_lane :release_bt do app_identifier "org.pathcheck.bt" end diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index de58aa4aed..20b707af45 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -28,16 +28,16 @@ before_all do end platform :ios do - BTE_APP_ID = "org.pathcheck.bt" + BT_APP_ID = "org.pathcheck.bt" GPS_APP_ID = "org.pathcheck.covid-safepaths" GPS_PROFILE = "match AppStore org.pathcheck.covid-safepaths" - BTE_PROFILE = "match AppStore org.pathcheck.bt" + BT_PROFILE = "match AppStore org.pathcheck.bt" DEBUG_PROFILE = "match Develop org.pathcheck.covid-safepaths" ADHOC_PROFILE = "match AdHoc org.pathcheck.covid-safepaths" - BTE_STAGING_SCHEME = "BTE_Staging" + BT_STAGING_SCHEME = "BT_Staging" GPS_STAGING_SCHEME = "GPS_Staging" TEAM = "79Z8HUPGC3" - BTE_SCHEME = "BTE_Production" + BT_SCHEME = "BT_Production" GPS_SCHEME = "GPS_Production" WORKSPACE = "COVIDSafePaths.xcworkspace" PROJECT = "COVIDSafePaths.xcodeproj" @@ -81,11 +81,11 @@ platform :ios do ) end - desc "Push a new BTE Staging build for automation" - lane :staging_bte do + desc "Push a new Staging build for automation" + lane :staging_bt do signing_bundle_details = { - :BUNDLE_IDENTIFIER => BTE_APP_ID, + :BUNDLE_IDENTIFIER => BT_APP_ID, :PROVISIONING_PROFILE_SPECIFIER => ADHOC_PROFILE, :DEVELOPMENT_TEAM => TEAM } @@ -100,12 +100,12 @@ platform :ios do build_ios_app( workspace: WORKSPACE, - scheme: BTE_STAGING_SCHEME, + scheme: BT_STAGING_SCHEME, configuration: "Staging", export_method: "ad-hoc", silent: true, clean: true, - output_name: "COVIDSafePaths-bte-staging.ipa", + output_name: "COVIDSafePaths-bt-staging.ipa", ) end @@ -149,8 +149,8 @@ platform :ios do ) end - desc "Push a new BTE Release build to TestFlight" - lane :release_bte do + desc "Push a new BT Release build to TestFlight" + lane :release_bt do # Sets the app store version: # https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion increment_build_number( @@ -165,8 +165,8 @@ platform :ios do ) signing_bundle_details = { - :BUNDLE_IDENTIFIER => BTE_APP_ID, - :PROVISIONING_PROFILE_SPECIFIER => BTE_PROFILE, + :BUNDLE_IDENTIFIER => BT_APP_ID, + :PROVISIONING_PROFILE_SPECIFIER => BT_PROFILE, :DEVELOPMENT_TEAM => TEAM } @@ -181,11 +181,11 @@ platform :ios do build_ios_app( workspace: WORKSPACE, - scheme: BTE_SCHEME, + scheme: BT_SCHEME, configuration: "Release", silent: true, clean: true, - output_name: "COVIDSafePaths-bte.ipa", + output_name: "COVIDSafePaths-bt.ipa", ) end diff --git a/ios/fastlane/README.md b/ios/fastlane/README.md index 090a782c94..109c6fa129 100644 --- a/ios/fastlane/README.md +++ b/ios/fastlane/README.md @@ -26,21 +26,21 @@ fastlane ios sync_local_certs fastlane ios staging ``` Push a new GPS Staging build for automation -### ios staging_bte +### ios staging_bt ``` -fastlane ios staging_bte +fastlane ios staging_bt ``` -Push a new BTE Staging build for automation +Push a new BT Staging build for automation ### ios release ``` fastlane ios release ``` Push a new GPS Release build to TestFlight -### ios release_bte +### ios release_bt ``` -fastlane ios release_bte +fastlane ios release_bt ``` -Push a new BTE Release build to TestFlight +Push a new BT Release build to TestFlight ### ios deploy ``` fastlane ios deploy diff --git a/package.json b/package.json index 7d85560b06..cbebcce2df 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "format": "yarn prettier --write", "lint": "eslint ./", "validate": "yarn prettier --list-different && yarn tsc && yarn lint", - "run-android-bte": "react-native run-android --variant=bteDebug --appId=org.pathcheck.covidsafepathsBte", + "run-android-bt": "react-native run-android --variant=btDebug --appId=org.pathcheck.covidsafepathsBt", "run-android-gps": "react-native run-android --variant=gpsDebug --appId=org.pathcheck.covidsafepaths", - "run-ios-bte": "yarn install:pod && react-native run-ios --scheme \"BTE_Development\" --simulator \"iPhone 11 (13.5)\"", + "run-ios-bt": "yarn install:pod && react-native run-ios --scheme \"BT_Development\" --simulator \"iPhone 11 (13.5)\"", "run-ios-gps": "yarn install:pod && react-native run-ios --scheme \"GPS_Development\"", "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"", "install:pod": "cd ios && bundle install --quiet && bundle exec pod install --silent", @@ -198,25 +198,25 @@ "type": "iPhone SE (2nd generation)" } }, - "iphone11-bte.sim": { - "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BTE.app", - "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BTE_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", + "iphone11-bt.sim": { + "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BT.app", + "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BT_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", "type": "ios.simulator", "device": { "type": "iPhone 11" } }, - "iphone8-bte.sim": { - "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BTE.app", - "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BTE_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", + "iphone8-bt.sim": { + "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BT.app", + "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BT_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", "type": "ios.simulator", "device": { "type": "iPhone 8" } }, - "iphone-se-bte.sim": { - "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BTE.app", - "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BTE_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", + "iphone-se-bt.sim": { + "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/BT.app", + "build": "xcodebuild -workspace ios/COVIDSafePaths.xcworkspace -scheme BT_Production -configuration Release -sdk iphonesimulator -derivedDataPath ios/build", "type": "ios.simulator", "device": { "type": "iPhone SE (2nd generation)"