Update ThemeManager.cs to fix build failing

.github/CODEOWNERS

@@ -7,11 +7,21 @@
 # Default file owners
 * @bitwarden/dept-development-mobile
 
+# DevOps for Actions and other workflow changes
+.github/workflows @bitwarden/dept-devops
+
+# DevOps for Version Bumping
+src/Android/Properties/AndroidManifest.xml
+src/iOS.Autofill/Info.plist
+src/iOS.Extension/Info.plist
+src/iOS.ShareExtension/Info.plist
+src/iOS/Info.plist
 
 ## Auth team files ##
 
 ## Platform team files ##
 appIcons @bitwarden/team-platform-dev
+build.cake @bitwarden/team-platform-dev
 
 ## Vault team files ##
 src/watchOS @bitwarden/team-vault-dev
@@ -20,32 +30,17 @@ src/watchOS @bitwarden/team-vault-dev
 src/Core/Services/EmailForwarders @bitwarden/team-tools-dev
 
 ## Crowdin Sync files ##
-src/Core/Resources/Localization @bitwarden/team-tools-dev
+src/App/Resources @bitwarden/team-tools-dev
 src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization @bitwarden/team-tools-dev
 store/apple @bitwarden/team-tools-dev
 store/google @bitwarden/team-tools-dev
 
 ## Locales ## 
-src/Core/Resources/Localization/AppResources.Designer.cs
-src/Core/Resources/Localization/AppResources.resx
+src/App/Resources/AppResources.Designer.cs
+src/App/Resources/AppResources.resx
 src/watchOS/bitwarden/bitwarden\ WatchKit\ Extension/Localization/en.lproj
 store/apple/en
 store/google/en
 
 ## Utils ##
 store/google/Publisher
-
-## These workflows have joint ownership ##
-.github/workflows/build.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-.github/workflows/build-beta.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-.github/workflows/cleanup-rc-branch.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-.github/workflows/release.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-.github/workflows/version-auto-bump.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-.github/workflows/version-bump.yml @bitwarden/dept-bre @bitwarden/dept-development-mobile
-
-# Shared ownership for version bump automation
-src/App/Platforms/Android/AndroidManifest.xml
-src/iOS.Autofill/Info.plist
-src/iOS.Extension/Info.plist
-src/iOS.ShareExtension/Info.plist
-src/App/Platforms/iOS/Info.plist

.github/ISSUE_TEMPLATE/bug.yml

@@ -6,20 +6,8 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-
-        > [!WARNING]  
-        > Testing the new Bitwarden Beta apps? Submit your report in [bitwarden/android](https://github.com/bitwarden/android) or [bitwarden/ios](https://github.com/bitwarden/ios)
-
         
         Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
-  - type: checkboxes
-    id: production
-    attributes:
-      label: Production Build
-      options:
-        - label: I'm using the legacy Bitwarden app pubicly available in App Store / Play Store and I'm aware that Bitwarden Beta bugs should be reported in [bitwarden/android](https://github.com/bitwarden/android) or [bitwarden/ios](https://github.com/bitwarden/ios)
-    validations:
-      required: true
   - type: textarea
     id: reproduce
     attributes:
@@ -85,3 +73,9 @@ body:
       description: What version of our software are you running? (go to "Settings" → "About" in the app)
     validations:
       required: true
+  - type: checkboxes
+    id: beta
+    attributes:
+      label: Beta
+      options:
+        - label: Using a pre-release version of the application.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Native Android Beta Bug Reports
-    url: https://github.com/bitwarden/android/issues
-    about: Bugs found in the new native Android Beta app should be reported in [bitwarden/android](https://github.com/bitwarden/android)
-  - name: Native iOS BETA Bug Reports
-    url: https://github.com/bitwarden/ios/issues
-    about: Bugs found in the new native iOS Beta app should be reported in [bitwarden/ios](https://github.com/bitwarden/ios)
   - name: Customer Support
     url: https://bitwarden.com/contact/
     about: Please contact our customer support for account issues and general customer support.

.github/labeler.yml

@@ -1,26 +1,19 @@
 android:
-- changed-files:
-  - any-glob-to-any-file:
-    - src/App/*
-    - src/Core/*
-    - src/Android/*
-    - 'src/Xamarin.AndroidX.Credentials/*'
+- src/App/*
+- src/Core/*
+- src/Android/*
 
 iOS:
-- changed-files:
-  - any-glob-to-any-file:
-    - src/App/*
-    - src/Core/*
-    - lib/ios/*
-    - src/iOS/*
-    - 'src/iOS.Autofill/*'
-    - 'src/iOS.Core/*'
-    - 'src/iOS.Extension/*'
-    - 'src/iOS.ShareExtension/*'
-    - 'src/iOS.Widget/*'
-    - src/watchOS/*
+- src/App/*
+- src/Core/*
+- lib/ios/*
+- src/iOS/*
+- 'src/iOS.Autofill/*'
+- 'src/iOS.Core/*'
+- 'src/iOS.Extension/*'
+- 'src/iOS.ShareExtension/*'
+- 'src/iOS.Widget/*'
+- src/watchOS/*
 
 watchOS:
-- changed-files:
-  - any-glob-to-any-file:
-    - src/watchOS/*
+- src/watchOS/*

.github/renovate.json

@@ -1,5 +1,4 @@
 {
-  "enabled": false,
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",

.github/secrets/google-services.json.gpg

@@ -0,0 +1,3 @@
+<EFBFBD>
+	K<>Y#<23>(<28><><EFBFBD><EFBFBD>
EI֐߄T?)l<><6C><EFBFBD><18><><10>"=<3D>|<7C>'e<><0E>m<EFBFBD>/~<7E><>'F<><46>><3E><><EFBFBD><EFBFBD>l<EFBFBD>b<EFBFBD>[<5B>+R<><52>iL<69><4C>"<22><><EFBFBD>~V:<3A><>p<EFBFBD>a<17>ڵel%8t<38><74>튖<EFBFBD>y<<3C>n<EFBFBD><6E><EFBFBD>aU<61>w<16>JD<4A><44><1F><>We<57>9<EFBFBD><39><EFBFBD><EFBFBD><x8d<38>O<EFBFBD>j\<14>ד<EFBFBD><D793><EFBFBD>Vq<56><71>֋
+Ǻ<EFBFBD>-<2D>#<23><><11><>]$<24>(<28>l,<2C>Br<42><02><>d<><64><EFBFBD>•a-<2D><><EFBFBD>:<3A><>:<3A><04>9b,!Em<02><19><>Qf<>D<EFBFBD>g<EFBFBD><06><0E>x(P<>ȡ~<7E>͹<EFBFBD><CDB9>	<09><>[<06><>!:<3A>;f<><66>

.github/workflows/automatic-issue-responses.yml

@@ -1,3 +1,4 @@
+---
 name: Automatic responses
 on:
   issues:
@@ -6,7 +7,7 @@ on:
 jobs:
   close-issue:
     name: 'Close issue with automatic response'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     permissions:
       issues: write
     steps:

.github/workflows/build-beta.yml

@@ -1,349 +0,0 @@
-name: Build Beta
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'Branch or tag to build'
-        required: true
-        default: 'main'
-        type: string
-
-env:
-  main_app_folder_path: src/App
-  main_app_project_path: src/App/App.csproj
-  target-net-version: net8.0
-
-jobs:
-  setup:
-    name: Setup
-    runs-on: ubuntu-22.04
-    outputs:
-      rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }}
-      hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          submodules: 'true'
-
-      - name: Check if special branches exist
-        id: branch-check
-        run: |
-          if [[ $(git ls-remote --heads origin rc) ]]; then
-            echo "rc_branch_exists=1" >> $GITHUB_OUTPUT
-          else
-            echo "rc_branch_exists=0" >> $GITHUB_OUTPUT
-          fi
-
-          if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then
-            echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT
-          else
-            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
-          fi
-
-  ios:
-    name: Apple iOS
-    runs-on: macos-14
-    needs: setup
-    env:
-      _IOS_FOLDER_PATH: src/App/Platforms/iOS
-      _APP_OUTPUT_NAME: App
-      _APP_CI_OUTPUT_FILENAME: App_x64_Debug
-    steps:
-      - name: Set XCode version
-        uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
-        with:
-          xcode-version: 15.1
-
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
-        with:
-          nuget-version: 6.4.0
-      
-      - name: Set up .NET
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
-        with:
-          dotnet-version: '8.0.x'
-  
-      # This step might be obsolete at some point as .NET MAUI workloads 
-      # are starting to come pre-installed on the GH Actions build agents.
-      - name: Install MAUI Workload
-        run: dotnet workload install maui --ignore-failed-sources
-
-      - name: Print environment
-        run: |
-          nuget help | grep Version
-          dotnet --info
-          echo "GitHub ref: $GITHUB_REF"
-          echo "GitHub event: $GITHUB_EVENT"
-
-      - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.ref }}
-          submodules: 'true'
-
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "appcenter-ios-token"
-
-      - name: Download Provisioning Profiles secrets
-        env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: profiles
-        run: |
-          mkdir -p $HOME/secrets
-          profiles=(
-              "dist_beta_autofill.mobileprovision"
-              "dist_beta_bitwarden.mobileprovision"
-              "dist_beta_extension.mobileprovision"
-              "dist_beta_share_extension.mobileprovision"
-              "dist_beta_bitwarden_watch_app.mobileprovision"
-              "dist_beta_bitwarden_watch_app_extension.mobileprovision"
-          )
-
-          for FILE in "${profiles[@]}"
-          do
-            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-              --file $HOME/secrets/$FILE --output none
-          done
-
-      - name: Download Google Services secret
-        env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
-          FILE: GoogleService-Info.plist
-        run: |
-          mkdir -p $HOME/secrets
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-            --file $HOME/secrets/$FILE --output none
-
-      - name: Increment version
-        run: |
-          BUILD_NUMBER=$((100 + $GITHUB_RUN_NUMBER))
-          echo "##### Setting CFBundleVersion $BUILD_NUMBER"
-
-          echo "### CFBundleVersion $BUILD_NUMBER" >> $GITHUB_STEP_SUMMARY
-
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env._IOS_FOLDER_PATH }}/Info.plist
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
-          cd src/watchOS/bitwarden
-          agvtool new-version -all  $BUILD_NUMBER
-
-      - name: Update Entitlements
-        run: |
-          echo "##### Updating Entitlements"
-          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>beta<\/string>/' ./${{ env._IOS_FOLDER_PATH }}/Entitlements.plist
-
-      - name: Get certificates
-        run: |
-          mkdir -p $HOME/certificates
-          az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/ios-distribution |
-            jq -r .value | base64 -d > $HOME/certificates/ios-distribution.p12
-
-      - name: Set up Keychain
-        env:
-          KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
-          MOBILE_KEY_PASSWORD: ${{ secrets.IOS_KEY_PASSWORD }}
-          DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_CERT_PASSWORD }}
-        run: |
-          security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
-          security set-keychain-settings -lut 1200 build.keychain
-
-          security import $HOME/certificates/ios-distribution.p12 -k build.keychain -P "" -T /usr/bin/codesign \
-            -T /usr/bin/security
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
-
-      - name: Set up provisioning profiles
-        run: |
-          AUTOFILL_PROFILE_PATH=$HOME/secrets/dist_beta_autofill.mobileprovision
-          BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden.mobileprovision
-          EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_extension.mobileprovision
-          SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_share_extension.mobileprovision
-          WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app.mobileprovision
-          WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app_extension.mobileprovision
-          PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
-
-          mkdir -p "$PROFILES_DIR_PATH"
-
-          AUTOFILL_UUID=$(grep UUID -A1 -a $AUTOFILL_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $AUTOFILL_PROFILE_PATH "$PROFILES_DIR_PATH/$AUTOFILL_UUID.mobileprovision"
-
-          BITWARDEN_UUID=$(grep UUID -A1 -a $BITWARDEN_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $BITWARDEN_PROFILE_PATH "$PROFILES_DIR_PATH/$BITWARDEN_UUID.mobileprovision"
-
-          EXTENSION_UUID=$(grep UUID -A1 -a $EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$EXTENSION_UUID.mobileprovision"
-
-          SHARE_EXTENSION_UUID=$(grep UUID -A1 -a $SHARE_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $SHARE_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$SHARE_EXTENSION_UUID.mobileprovision"
-
-          WATCH_APP_UUID=$(grep UUID -A1 -a $WATCH_APP_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $WATCH_APP_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_UUID.mobileprovision"
-
-          WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision"
-
-      - name: Restore packages
-        run: |
-          dotnet restore
-          dotnet tool restore
-
-      - name: Setup iOS build CAKE (Testing)
-        run: dotnet cake build.cake --target iOS --variant beta
-
-      - name: Bulid WatchApp
-        run: |
-          echo "##### Build WatchApp with Release Configuration"
-          xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden
-
-          echo "##### Done"
-
-      - name: Archive Build for App Store
-        shell: pwsh
-        run: |
-          Write-Output "##### Archive for Release ios-arm64"
-          dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false
-
-          Write-Output "##### Done"
-
-      - name: Archive Build for Mobile Automation
-        shell: pwsh
-        run: |
-          Write-Output "##### Archive Debug for iossimulator-x64"
-          dotnet build ${{ env.main_app_project_path }} -c Debug -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-x64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false
-
-          Write-Output "##### Done"
-          ls ~/Library/Developer/Xcode/Archives
-          
-      - name: Export .ipa for App Store
-        env:
-          EXPORT_OPTIONS_PATH: ./.github/resources/export-options-app-store.plist
-          EXPORT_PATH: ./bitwarden-export
-        run: |
-          ARCHIVE_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive"
-
-          xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \
-            -exportOptionsPlist $EXPORT_OPTIONS_PATH
-
-      - name: Export .app for Automation CI
-        env:
-          ARCHIVE_PATH: ./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64
-          EXPORT_PATH: ./bitwarden-export
-        run: |
-          zip -r -q ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip $ARCHIVE_PATH
-          mv ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip $EXPORT_PATH
-
-      - name: Show Bitwarden Export
-        shell: bash
-        run:  ls -a -R ./bitwarden-export
-
-      - name: Copy all dSYMs files to upload
-        env:
-          EXPORT_PATH: ./bitwarden-export
-          WATCH_ARCHIVE_DSYMS_PATH: ./src/watchOS/bitwarden.xcarchive/dSYMs/
-          WATCH_DSYMS_EXPORT_PATH: ./bitwarden-export/Watch_dSYMs
-        run: |
-          ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
-
-          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
-          mkdir $WATCH_DSYMS_EXPORT_PATH
-          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
-
-      - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
-        with:
-          name: Bitwarden iOS
-          path: |
-            ./bitwarden-export/Bitwarden*.ipa
-            ./bitwarden-export/dSYMs/*.*
-          if-no-files-found: error
-
-      - name: Upload .app file for Automation CI
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
-        with:
-          name: ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip
-          path: ./bitwarden-export/${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip
-          if-no-files-found: error
-
-      - name: Install AppCenter CLI
-        run: npm install -g appcenter-cli
-
-      - name: Upload dSYMs to App Center
-        env:
-          APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }}
-        run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
-
-      - name: Upload Watch dSYMs to Firebase Crashlytics
-        run: |
-          echo "##### Uploading Watch dSYMs to Firebase"
-          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
-
-      - name: Validate app in App Store
-        env:
-          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-        run: |
-          xcrun altool --validate-app --type ios --file "./bitwarden-export/Bitwarden Beta.ipa" \
-              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
-        shell: bash
-
-      - name: Deploy to App Store
-        env:
-          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-        run: |
-          xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden Beta.ipa" \
-              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
-
-  check-failures:
-    name: Check for failures
-    if: always()
-    runs-on: ubuntu-22.04
-    needs:
-      - setup
-      - ios
-    steps:
-      - name: Check if any job failed
-        if: |
-          (github.ref == 'refs/heads/main'
-          || github.ref == 'refs/heads/rc'
-          || github.ref == 'refs/heads/hotfix-rc')
-          && contains(needs.*.result, 'failure')
-        run: exit 1
-
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        if: failure()
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        if: failure()
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "devops-alerts-slack-webhook-url"
-
-      - name: Notify Slack on failure
-        uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
-        if: failure()
-        env:
-          SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}
-        with:
-          status: ${{ job.status }}

.github/workflows/build.yml

@@ -1,14 +1,19 @@
+---
 name: Build
 
 on:
+  push:
+    branches-ignore:
+      - "l10n_master"
+      - "gh-pages"
+    paths-ignore:
+      - ".github/workflows/**"
   workflow_dispatch:
 
 env:
   main_app_folder_path: src/App
   main_app_project_path: src/App/App.csproj
   target-net-version: net8.0
-  dotnet-version: '8.0.402'
-  maui-workload-version: '8.0.402'
 
 jobs:
   cloc:
@@ -16,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Set up CLOC
         run: |
@@ -26,7 +31,6 @@ jobs:
       - name: Print lines of code
         run: cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML
 
-
   setup:
     name: Setup
     runs-on: ubuntu-22.04
@@ -35,7 +39,7 @@ jobs:
       hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: 'true'
 
@@ -54,7 +58,6 @@ jobs:
             echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
           fi
 
-
   android:
     name: Android
     runs-on: windows-2022
@@ -64,30 +67,25 @@ jobs:
       matrix:
         variant: ["prod", "qa"]
     env:
-      _ANDROID_FOLDER_PATH: src\App\Platforms\Android
-      _ANDROID_FOLDER_PATH_BASH: src/App/Platforms/Android
+      android_folder_path: src/App/Platforms/Android
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          fetch-depth: 0
-
       - name: Setup NuGet
-        uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
+        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
           nuget-version: 6.4.0
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+        uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
         with:
-          dotnet-version: ${{ env.dotnet-version }}
-
-      - name: Install MAUI Workload
-        run: |
-          dotnet workload install maui --version ${{ env.maui-workload-version }}
+          dotnet-version: '8.0.x'
 
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
+        uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3
+
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
+      - name: Install MAUI Workload
+        run: dotnet workload install maui --ignore-failed-sources
 
       - name: Setup Windows builder
         run: choco install checksum --no-progress
@@ -95,8 +93,7 @@ jobs:
       - name: Install Microsoft OpenJDK 11
         run: |
           choco install microsoft-openjdk11 --no-progress
-          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | `
-            Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          Write-Output "JAVA_HOME=$(Get-ChildItem -Path 'C:\Program Files\Microsoft\jdk*' | Select -First 1 -ExpandProperty FullName)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           Write-Output "Java Home: $env:JAVA_HOME"
 
       - name: Print environment
@@ -107,43 +104,44 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
+      - name: Checkout repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+          fetch-depth: 0
 
-      - name: Download secrets
+      - name: Decrypt secrets
         env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
-          mkdir -p $HOME/secrets
+          mkdir -p ~/secrets
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name app_play-keystore.jks --file ./${{ env._ANDROID_FOLDER_PATH_BASH }}/app_play-keystore.jks --output none
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name app_upload-keystore.jks --file ./${{ env._ANDROID_FOLDER_PATH_BASH }}/app_upload-keystore.jks --output none
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name play_creds.json --file $HOME/secrets/play_creds.json --output none
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./${{ env.main_app_folder_path }}/app_play-keystore.jks ./.github/secrets/app_play-keystore.jks.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./${{ env.main_app_folder_path }}/app_upload-keystore.jks ./.github/secrets/app_upload-keystore.jks.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/play_creds.json ./.github/secrets/play_creds.json.gpg
         shell: bash
 
-      - name: Download secrets - Google Services
+      - name: Decrypt secrets - Google Services
         if: ${{ matrix.variant == 'prod' }}
         env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name google-services.json --file ./${{ env._ANDROID_FOLDER_PATH_BASH }}/google-services.json --output none
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./${{ env.android_folder_path }}/google-services.json ./.github/secrets/google-services.json.gpg
         shell: bash
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((11000 + $GITHUB_RUN_NUMBER))
-          echo "##### Setting Android Version Code to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
+          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
 
+          echo "########################################"
+          echo "##### Setting Version Code $BUILD_NUMBER"
+          echo "########################################"
+          
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
-            ./${{ env._ANDROID_FOLDER_PATH_BASH }}/AndroidManifest.xml
+            ./${{ env.android_folder_path }}/AndroidManifest.xml
         shell: bash
 
       - name: Restore packages
@@ -152,75 +150,83 @@ jobs:
       - name: Restore tools
         run: dotnet tool restore
 
-      # - name: Run Core tests
-      #   run: |
-      #     dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" `
-      #       /p:CustomConstants=UT
+      # - name: Verify Format
+      #   run: dotnet tool run dotnet-format --check
 
-      # - name: Report test results
-      #   uses: dorny/test-reporter@eaa763f6ffc21c7a37837f56cd5f9737f27fc6c8 # v1.8.0
-      #   if: always()
-      #   with:
-      #     name: Test Results
-      #     path: "**/test-results.trx"
-      #     reporter: dotnet-trx
-      #     fail-on-error: true
+      - name: Run Core tests
+        run: dotnet test test/Core.Test/Core.Test.csproj --logger "trx;LogFileName=test-results.trx" /p:CustomConstants=UT
+
+      - name: Report test results
+        uses: dorny/test-reporter@eaa763f6ffc21c7a37837f56cd5f9737f27fc6c8 # v1.8.0
+        if: always()
+        with:
+          name: Test Results
+          path: "**/test-results.trx"
+          reporter: dotnet-trx
+          fail-on-error: true
 
       - name: Build Play Store publisher
         if: ${{ matrix.variant == 'prod' }}
-        run: dotnet build .\store\google\Publisher\Publisher.csproj /p:Configuration=Release
+        run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release
 
       - name: Setup Android build  (${{ matrix.variant }})
         run: dotnet cake build.cake --target Android --variant ${{ matrix.variant }}
 
-      - name: Build & Sign Android
+      - name: Build Android
+        run: |
+          $configuration = "Release";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
+
+          Write-Output "########################################"
+          Write-Output "##### Build $configuration Configuration"
+          Write-Output "########################################"
+          
+          dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android
+
+      - name: Sign Android Build
         env:
           PLAY_KEYSTORE_PASSWORD: ${{ secrets.PLAY_KEYSTORE_PASSWORD }}
           UPLOAD_KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_PASSWORD }}
         run: |
-          $projToBuild = "$($env:GITHUB_WORKSPACE)/${{ env.main_app_project_path }}";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
           $packageName = "com.x8bit.bitwarden";
 
           if ("${{ matrix.variant }}" -ne "prod")
           {
             $packageName = "com.x8bit.bitwarden.${{ matrix.variant }}";
           }
+          Write-Output "########################################"
           Write-Output "##### Sign Google Play Bundle Release Configuration"
+          Write-Output "########################################"
 
-          $signingUploadKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._ANDROID_FOLDER_PATH }}\app_upload-keystore.jks"
-          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android `
-            /p:AndroidPackageFormats=aab `
-            /p:AndroidKeyStore=true `
-            /p:AndroidSigningKeyStore=$signingUploadKeyStore `
-            /p:AndroidSigningKeyAlias=upload `
-            /p:AndroidSigningKeyPass="$($env:UPLOAD_KEYSTORE_PASSWORD)" `
-            /p:AndroidSigningStorePass="$($env:UPLOAD_KEYSTORE_PASSWORD)" --no-restore
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidPackageFormats=aab /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_upload-keystore.jks") /p:AndroidSigningKeyAlias=upload /p:AndroidSigningKeyPass="$($env:UPLOAD_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:UPLOAD_KEYSTORE_PASSWORD)" --no-restore
 
+          Write-Output "########################################"
           Write-Output "##### Copy Google Play Bundle to project root"
+          Write-Output "########################################"
 
-          $signedAabPath = "$($env:GITHUB_WORKSPACE)\${{ env.main_app_folder_path }}\bin\Release\${{ env.target-net-version }}-android\publish\$($packageName)-Signed.aab";
-          $signedAabDestPath = "$($env:GITHUB_WORKSPACE)\$($packageName).aab";
+          $signedAabPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.aab");
+          $signedAabDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).aab");
           Copy-Item $signedAabPath $signedAabDestPath
 
+          Write-Output "########################################"
           Write-Output "##### Sign APK Release Configuration"
+          Write-Output "########################################"
 
-          $signingPlayKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._ANDROID_FOLDER_PATH }}\app_play-keystore.jks"
-          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android `
-            /p:AndroidKeyStore=true `
-            /p:AndroidSigningKeyStore=$signingPlayKeyStore `
-            /p:AndroidSigningKeyAlias=bitwarden `
-            /p:AndroidSigningKeyPass="$($env:PLAY_KEYSTORE_PASSWORD)" `
-            /p:AndroidSigningStorePass="$($env:PLAY_KEYSTORE_PASSWORD)" --no-restore
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_play-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:PLAY_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:PLAY_KEYSTORE_PASSWORD)" --no-restore
 
+          Write-Output "########################################"
           Write-Output "##### Copy Release APK to project root"
+          Write-Output "########################################"
+
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk");
+          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/$($packageName).apk");
 
-          $signedApkPath = "$($env:GITHUB_WORKSPACE)\${{ env.main_app_folder_path }}\bin\Release\${{ env.target-net-version }}-android\publish\$($packageName)-Signed.apk";
-          $signedApkDestPath = "$($env:GITHUB_WORKSPACE)\$($packageName).apk";
           Copy-Item $signedApkPath $signedApkDestPath
 
       - name: Upload Prod .aab artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: com.x8bit.bitwarden.aab
           path: ./com.x8bit.bitwarden.aab
@@ -228,7 +234,7 @@ jobs:
 
       - name: Upload Prod .apk artifact
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: com.x8bit.bitwarden.apk
           path: ./com.x8bit.bitwarden.apk
@@ -236,7 +242,7 @@ jobs:
 
       - name: Upload Other .apk artifact
         if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: com.x8bit.bitwarden.${{ matrix.variant }}.apk
           path: ./com.x8bit.bitwarden.${{ matrix.variant }}.apk
@@ -256,7 +262,7 @@ jobs:
 
       - name: Upload .apk sha file for prod
         if: ${{ matrix.variant == 'prod' }}
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: bw-android-apk-sha256.txt
           path: ./bw-android-apk-sha256.txt
@@ -264,7 +270,7 @@ jobs:
 
       - name: Upload .apk sha file for other
         if: ${{ matrix.variant != 'prod' }}
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: bw-android-${{ matrix.variant }}-apk-sha256.txt
           path: ./bw-android-${{ matrix.variant }}-apk-sha256.txt
@@ -277,43 +283,39 @@ jobs:
           || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
           || github.ref == 'refs/heads/hotfix-rc' ) }}
         run: |
-          $publisherPath = "$($env:GITHUB_WORKSPACE)\store\google\Publisher\bin\Release\net8.0\Publisher.dll"
-          $credsPath = "$($HOME)\secrets\play_creds.json"
-          $aabPath = "$($env:GITHUB_WORKSPACE)\com.x8bit.bitwarden.aab"
-          $track = "internal"
+          PUBLISHER_PATH="$GITHUB_WORKSPACE/store/google/Publisher/bin/Release/net7.0/Publisher.dll"
+          CREDS_PATH="$HOME/secrets/play_creds.json"
+          AAB_PATH="$GITHUB_WORKSPACE/com.x8bit.bitwarden.aab"
+          TRACK="internal"
 
-          dotnet $publisherPath $credsPath $aabPath $track
+          dotnet $PUBLISHER_PATH $CREDS_PATH $AAB_PATH $TRACK
+        shell: bash
 
 
   f-droid:
     name: F-Droid Build
     runs-on: windows-2022
     env:
-      _ANDROID_FOLDER_PATH: src\App\Platforms\Android
-      _ANDROID_FOLDER_PATH_BASH: src/App/Platforms/Android
-      _ANDROID_MANIFEST_PATH: src/App/Platforms/Android/AndroidManifest.xml
+      android_folder_path: src/App/Platforms/Android
+      android_manifest_path: src/App/Platforms/Android/AndroidManifest.xml
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          fetch-depth: 0
-
       - name: Setup NuGet
-        uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
+        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
           nuget-version: 6.4.0
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
         with:
-          dotnet-version: ${{ env.dotnet-version }}
-
-      - name: Install MAUI Workload
-        run: |
-          dotnet workload install maui --version ${{ env.maui-workload-version }}
+          dotnet-version: '8.0.x'
 
       - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
+        uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3
+
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
+      - name: Install MAUI Workload
+        run: dotnet workload install maui --ignore-failed-sources
 
       - name: Setup Windows builder
         run: choco install checksum --no-progress
@@ -332,42 +334,48 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
+      - name: Checkout repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - name: Download secrets
+      - name: Decrypt secrets
         env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
-          FILE: app_fdroid-keystore.jks
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-            --file ${{ env._ANDROID_FOLDER_PATH_BASH }}/$FILE --output none
+          mkdir -p ~/secrets
+
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./${{ env.main_app_folder_path }}/app_fdroid-keystore.jks ./.github/secrets/app_fdroid-keystore.jks.gpg
         shell: bash
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((11000 + $GITHUB_RUN_NUMBER))
-          echo "##### Setting F-Droid Version Code to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
+          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
+
+          echo "########################################"
+          echo "##### Setting Version Code $BUILD_NUMBER"
+          echo "########################################"
 
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
-            ./${{ env._ANDROID_MANIFEST_PATH }}
+            ./${{ env.android_manifest_path }}
         shell: bash
 
       - name: Clean for F-Droid
         run: |
-          $directoryBuildProps = $($env:GITHUB_WORKSPACE + "/Directory.Build.props");
+          $appPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
+          $corePath = $($env:GITHUB_WORKSPACE + "/src/Core/Core.csproj");
 
-          $androidManifest = $($env:GITHUB_WORKSPACE + "/${{ env._ANDROID_MANIFEST_PATH }}");
+          $androidManifest = $($env:GITHUB_WORKSPACE + "/${{ env.android_manifest_path }}");
 
-          Write-Output "##### Back up project files"
+          Write-Output "########################################"
+          Write-Output "##### Backup project files"
+          Write-Output "########################################"
 
           Copy-Item $androidManifest $($androidManifest + ".original");
-          Copy-Item $directoryBuildProps $($directoryBuildProps + ".original");
+          Copy-Item $appPath $($appPath + ".original");
 
+          Write-Output "########################################"
           Write-Output "##### Cleanup Android Manifest"
+          Write-Output "########################################"
 
           $xml=New-Object XML;
           $xml.Load($androidManifest);
@@ -377,39 +385,44 @@ jobs:
 
           $xml.Save($androidManifest);
 
-          Write-Output "##### Enabling FDROID constant"
-
-          (Get-Content $directoryBuildProps).Replace('<!-- <CustomConstants>FDROID</CustomConstants> -->', '<CustomConstants>FDROID</CustomConstants>') | Set-Content $directoryBuildProps
-
       - name: Restore packages
         run: dotnet restore
 
-      - name: Build & Sign F-Droid
+      - name: Build for F-Droid
+        run: |
+          $configuration = "Release";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
+
+          Write-Output "########################################"
+          Write-Output "##### Build $configuration FDROID
+          Write-Output "########################################"
+          
+          dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android /p:CustomConstants="FDROID"
+
+      - name: Sign for F-Droid
         env:
           FDROID_KEYSTORE_PASSWORD: ${{ secrets.FDROID_KEYSTORE_PASSWORD }}
         run: |
-          $projToBuild = "$($env:GITHUB_WORKSPACE)\${{ env.main_app_project_path }}";
+          $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}");
           $packageName = "com.x8bit.bitwarden";
 
+          Write-Output "########################################"
           Write-Output "##### Sign FDroid"
+          Write-Output "########################################"
 
-          $signingFdroidKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._ANDROID_FOLDER_PATH }}\app_fdroid-keystore.jks"
-          dotnet build $projToBuild -c Release -f ${{ env.target-net-version }}-android `
-            /p:AndroidKeyStore=true `
-            /p:AndroidSigningKeyStore=$signingFdroidKeyStore `
-            /p:AndroidSigningKeyAlias=bitwarden `
-            /p:AndroidSigningKeyPass="$($env:FDROID_KEYSTORE_PASSWORD)" `
-            /p:AndroidSigningStorePass="$($env:FDROID_KEYSTORE_PASSWORD)" ` --no-restore
+          dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android /p:AndroidKeyStore=true /p:AndroidSigningKeyStore=$("app_fdroid-keystore.jks") /p:AndroidSigningKeyAlias=bitwarden /p:AndroidSigningKeyPass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:AndroidSigningStorePass="$($env:FDROID_KEYSTORE_PASSWORD)" /p:CustomConstants="FDROID" --no-restore
 
+          Write-Output "########################################"
           Write-Output "##### Copy FDroid apk to project root"
+          Write-Output "########################################"
 
-          $signedApkPath = "$($env:GITHUB_WORKSPACE)\${{ env.main_app_folder_path }}\bin\Release\${{ env.target-net-version }}-android\$($packageName)-Signed.apk";
-          $signedApkDestPath = "$($env:GITHUB_WORKSPACE)\com.x8bit.bitwarden-fdroid.apk";
+          $signedApkPath = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_folder_path }}/bin/Release/${{ env.target-net-version }}-android/publish/$($packageName)-Signed.apk");
+          $signedApkDestPath = $($env:GITHUB_WORKSPACE + "/com.x8bit.bitwarden-fdroid.apk");
 
           Copy-Item $signedApkPath $signedApkDestPath
 
       - name: Upload F-Droid .apk artifact
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: com.x8bit.bitwarden-fdroid.apk
           path: ./com.x8bit.bitwarden-fdroid.apk
@@ -421,44 +434,40 @@ jobs:
             -t sha256 | Out-File -Encoding ASCII ./bw-fdroid-apk-sha256.txt
 
       - name: Upload F-Droid sha file
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: bw-fdroid-apk-sha256.txt
           path: ./bw-fdroid-apk-sha256.txt
           if-no-files-found: error
 
-
   ios:
     name: Apple iOS
-    runs-on: macos-14
+    runs-on: macos-13
     needs: setup
     env:
-      _IOS_FOLDER_PATH: src/App/Platforms/iOS
-      _APP_OUTPUT_NAME: App
-      _APP_CI_OUTPUT_FILENAME: App_x64_Debug
+      ios_folder_path: src/App/Platforms/iOS
+      app_output_name: App
+      app_ci_output_filename: App_x64_Debug
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          submodules: 'true'
-
       - name: Set XCode version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
-          xcode-version: 15.4
+          xcode-version: 15.1
 
       - name: Setup NuGet
-        uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
+        uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0
         with:
           nuget-version: 6.4.0
-
+      
       - name: Set up .NET
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
         with:
-          dotnet-version: ${{ env.dotnet-version }}
-
+          dotnet-version: '8.0.x'
+  
+      # This step might be obsolete at some point as .NET MAUI workloads 
+      # are starting to come pre-installed on the GH Actions build agents.
       - name: Install MAUI Workload
-        run: dotnet workload install maui --version ${{ env.maui-workload-version }}
+        run: dotnet workload install maui --ignore-failed-sources
 
       - name: Print environment
         run: |
@@ -467,6 +476,11 @@ jobs:
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
+      - name: Checkout repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          submodules: 'true'
+
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
@@ -479,71 +493,73 @@ jobs:
           keyvault: "bitwarden-ci"
           secrets: "appcenter-ios-token"
 
-      - name: Download Provisioning Profiles secrets
+      - name: Decrypt secrets
         env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: profiles
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
-          mkdir -p $HOME/secrets
-          profiles=(
-              "dist_autofill.mobileprovision"
-              "dist_bitwarden.mobileprovision"
-              "dist_extension.mobileprovision"
-              "dist_share_extension.mobileprovision"
-              "dist_bitwarden_watch_app.mobileprovision"
-              "dist_bitwarden_watch_app_extension.mobileprovision"
-          )
+          mkdir -p ~/secrets
 
-          for FILE in "${profiles[@]}"
-          do
-            az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-              --file $HOME/secrets/$FILE --output none
-          done
-
-      - name: Download Google Services secret
-        env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
-          FILE: GoogleService-Info.plist
-        run: |
-          mkdir -p $HOME/secrets
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-            --file src/watchOS/bitwarden/$FILE --output none
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/bitwarden-mobile-key.p12 ./.github/secrets/bitwarden-mobile-key.p12.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/iphone-distribution-cert.p12 ./.github/secrets/iphone-distribution-cert.p12.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_autofill.mobileprovision ./.github/secrets/dist_autofill.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_bitwarden.mobileprovision ./.github/secrets/dist_bitwarden.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_extension.mobileprovision ./.github/secrets/dist_extension.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_share_extension.mobileprovision \
+            ./.github/secrets/dist_share_extension.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_watch_app.mobileprovision \
+            ./.github/secrets/dist_watch_app.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output $HOME/secrets/dist_watch_app_extension.mobileprovision \
+            ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((8000 + $GITHUB_RUN_NUMBER))
-          echo "##### Setting iOS CFBundleVersion to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
+          BUILD_NUMBER=$((100 + $GITHUB_RUN_NUMBER))
 
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env._IOS_FOLDER_PATH }}/Info.plist
+          echo "########################################"
+          echo "##### Setting CFBundleVersion $BUILD_NUMBER"
+          echo "########################################"
+
+          echo "### CFBundleVersion $BUILD_NUMBER" >> $GITHUB_STEP_SUMMARY
+
+          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
           cd src/watchOS/bitwarden
-          agvtool new-version -all $BUILD_NUMBER
+          agvtool new-version -all  $BUILD_NUMBER
 
       - name: Update Entitlements
         run: |
+          echo "########################################"
           echo "##### Updating Entitlements"
-          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./${{ env._IOS_FOLDER_PATH }}/Entitlements.plist
-
-      - name: Get certificates
-        run: |
-          mkdir -p $HOME/certificates
-          az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/ios-distribution |
-            jq -r .value | base64 -d > $HOME/certificates/ios-distribution.p12
+          echo "########################################"
 
+          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>production<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist
+        
       - name: Set up Keychain
         env:
           KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
+          MOBILE_KEY_PASSWORD: ${{ secrets.IOS_KEY_PASSWORD }}
+          DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_CERT_PASSWORD }}
         run: |
           security create-keychain -p $KEYCHAIN_PASSWORD build.keychain
           security default-keychain -s build.keychain
           security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain
           security set-keychain-settings -lut 1200 build.keychain
-
-          security import $HOME/certificates/ios-distribution.p12 -k build.keychain -P "" -T /usr/bin/codesign \
-            -T /usr/bin/security
+          security import ~/secrets/bitwarden-mobile-key.p12 -k build.keychain -P $MOBILE_KEY_PASSWORD \
+            -T /usr/bin/codesign -T /usr/bin/security
+          security import ~/secrets/iphone-distribution-cert.p12 -k build.keychain -P $DIST_CERT_PASSWORD \
+            -T /usr/bin/codesign -T /usr/bin/security
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
 
       - name: Set up provisioning profiles
@@ -552,8 +568,8 @@ jobs:
           BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_bitwarden.mobileprovision
           EXTENSION_PROFILE_PATH=$HOME/secrets/dist_extension.mobileprovision
           SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_share_extension.mobileprovision
-          WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_bitwarden_watch_app.mobileprovision
-          WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_bitwarden_watch_app_extension.mobileprovision
+          WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_watch_app.mobileprovision
+          WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_watch_app_extension.mobileprovision
           PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
 
           mkdir -p "$PROFILES_DIR_PATH"
@@ -581,50 +597,74 @@ jobs:
 
       - name: Bulid WatchApp
         run: |
+          echo "########################################"
           echo "##### Build WatchApp with Release Configuration"
+          echo "########################################"
+
           xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden
 
+          echo "########################################"
+          echo "##### Done"
+          echo "########################################"
+
       - name: Archive Build for App Store
         run: |
-          echo "##### Archive for Release ios-arm64"
+          Write-Output "########################################"
+          Write-Output "##### Archive for Release ios-arm64
+          Write-Output "########################################"
+
           dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false
 
+          Write-Output "########################################"
+          Write-Output "##### Done"
+          Write-Output "########################################"
+        shell: pwsh
+
       - name: Archive Build for Mobile Automation
         run: |
-          echo "##### Archive Debug for iossimulator-x64"
+          Write-Output "########################################"
+          Write-Output "##### Archive Debug for iossimulator-x64
+          Write-Output "########################################"
+
           dotnet build ${{ env.main_app_project_path }} -c Debug -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-x64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false
-          ls $HOME/Library/Developer/Xcode/Archives
+
+          Write-Output "########################################"
+          Write-Output "##### Done"
+          Write-Output "########################################"
+          ls ~/Library/Developer/Xcode/Archives
+        shell: pwsh
 
       - name: Export .ipa for App Store
-        env:
-          EXPORT_OPTIONS_PATH: ./.github/resources/export-options-app-store.plist
-          EXPORT_PATH: ./bitwarden-export
         run: |
+          EXPORT_OPTIONS_PATH="./.github/resources/export-options-app-store.plist"
           ARCHIVE_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive"
+          EXPORT_PATH="./bitwarden-export"
+
           xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \
             -exportOptionsPlist $EXPORT_OPTIONS_PATH
 
       - name: Export .app for Automation CI
-        env:
-          ARCHIVE_PATH: ./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64
-          EXPORT_PATH: ./bitwarden-export
         run: |
-          zip -r -q ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip $ARCHIVE_PATH
-          mv ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip $EXPORT_PATH
+          ARCHIVE_PATH="./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64"
+          EXPORT_PATH="./bitwarden-export"
+
+          zip -r -q ${{ env.app_ci_output_filename }}.app.zip $ARCHIVE_PATH
+          mv ${{ env.app_ci_output_filename }}.app.zip $EXPORT_PATH
 
       - name: Copy all dSYMs files to upload
-        env:
-          EXPORT_PATH: ./bitwarden-export
-          WATCH_ARCHIVE_DSYMS_PATH: ./src/watchOS/bitwarden.xcarchive/dSYMs/
-          WATCH_DSYMS_EXPORT_PATH: ./bitwarden-export/Watch_dSYMs
         run: |
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
+          EXPORT_PATH="./bitwarden-export"
+
+          WATCH_ARCHIVE_DSYMS_PATH="./src/watchOS/bitwarden.xcarchive/dSYMs/"
+          WATCH_DSYMS_EXPORT_PATH="$EXPORT_PATH/Watch_dSYMs"
+
           cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
           mkdir $WATCH_DSYMS_EXPORT_PATH
           cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
 
       - name: Upload App Store .ipa & dSYMs artifacts
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: Bitwarden iOS
           path: |
@@ -633,10 +673,10 @@ jobs:
           if-no-files-found: error
 
       - name: Upload .app file for Automation CI
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
-          name: ${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip
-          path: ./bitwarden-export/${{ env._APP_CI_OUTPUT_FILENAME }}.app.zip
+          name: ${{ env.app_ci_output_filename }}.app.zip
+          path: ./bitwarden-export/${{ env.app_ci_output_filename }}.app.zip
           if-no-files-found: error
 
       - name: Install AppCenter CLI
@@ -667,30 +707,26 @@ jobs:
           || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
           || github.ref == 'refs/heads/hotfix-rc'
         run: |
+          echo "########################################"
           echo "##### Uploading Watch dSYMs to Firebase"
-          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
+          echo "########################################"
 
-      - name: Set up private auth key
-        run: |
-          mkdir ~/private_keys
-          cat << EOF > ~/private_keys/AuthKey_U362LJ87AA.p8
-          ${{ secrets.APP_STORE_CONNECT_AUTH_KEY }}
-          EOF
+          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
 
       - name: Validate app in App Store
         if: |
-          (github.ref == 'refs/heads/main'
+          (github.ref == 'refs/heads/master'
             && needs.setup.outputs.rc_branch_exists == 0
             && needs.setup.outputs.hotfix_branch_exists == 0)
           || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
           || github.ref == 'refs/heads/hotfix-rc'
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         run: |
-          xcrun altool \
-            --validate-app \
-            --type ios \
-            --file "./bitwarden-export/Bitwarden.ipa" \
-            --apiKey "U362LJ87AA" \
-            --apiIssuer ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
+          xcrun altool --validate-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
+              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
+        shell: bash
 
       - name: Deploy to App Store
         if: |
@@ -699,13 +735,13 @@ jobs:
             && needs.setup.outputs.hotfix_branch_exists == 0)
           || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
           || github.ref == 'refs/heads/hotfix-rc'
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         run: |
-          xcrun altool \
-            --upload-app \
-            --type ios \
-            --file "./bitwarden-export/Bitwarden.ipa" \
-            --apiKey "U362LJ87AA" \
-            --apiIssuer ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
+          xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden.ipa" \
+              --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD"
+
 
   crowdin-push:
     name: Crowdin Push
@@ -719,7 +755,7 @@ jobs:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -734,13 +770,13 @@ jobs:
           secrets: "crowdin-api-token"
 
       - name: Upload Sources
-        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
+        uses: crowdin/github-action@97bef4fd3f1b853eb105bc99b8d0d563760e024c # v1.17.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
         with:
           config: crowdin.yml
-          crowdin_branch_name: main
+          crowdin_branch_name: main 
           upload_sources: true
           upload_translations: false
 
@@ -758,11 +794,27 @@ jobs:
     steps:
       - name: Check if any job failed
         if: |
-          (github.ref == 'refs/heads/main'
-          || github.ref == 'refs/heads/rc'
-          || github.ref == 'refs/heads/hotfix-rc')
-          && contains(needs.*.result, 'failure')
-        run: exit 1
+          (github.ref == 'refs/heads/main')
+          || (github.ref == 'refs/heads/rc')
+          || (github.ref == 'refs/heads/hotfix-rc')
+        env:
+          CLOC_STATUS: ${{ needs.cloc.result }}
+          ANDROID_STATUS: ${{ needs.android.result }}
+          F_DROID_STATUS: ${{ needs.f-droid.result }}
+          IOS_STATUS: ${{ needs.ios.result }}
+          CROWDIN_PUSH_STATUS: ${{ needs.crowdin-push.result }}
+        run: |
+          if [ "$CLOC_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$ANDROID_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$F_DROID_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$IOS_STATUS" = "failure" ]; then
+              exit 1
+          elif [ "$CROWDIN_PUSH_STATUS" = "failure" ]; then
+              exit 1
+          fi
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -779,7 +831,7 @@ jobs:
           secrets: "devops-alerts-slack-webhook-url"
 
       - name: Notify Slack on failure
-        uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
+        uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0
         if: failure()
         env:
           SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}

.github/workflows/cleanup-rc-branch.yml

@@ -1,52 +0,0 @@
-name: Cleanup RC Branch
-
-on:
-  push:
-    tags:
-      - v**
-
-jobs:
-  delete-rc:
-    name: Delete RC Branch
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve bot secrets
-        id: retrieve-bot-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: bitwarden-ci
-          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
-
-      - name: Checkout main
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          ref: main
-          token: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
-
-      - name: Check if a RC branch exists
-        id: branch-check
-        run: |
-          hotfix_rc_branch_check=$(git ls-remote --heads origin hotfix-rc | wc -l)
-          rc_branch_check=$(git ls-remote --heads origin rc | wc -l)
-
-          if [[ "${hotfix_rc_branch_check}" -gt 0 ]]; then
-            echo "hotfix-rc branch exists." | tee -a $GITHUB_STEP_SUMMARY
-            echo "name=hotfix-rc" >> $GITHUB_OUTPUT
-          elif [[ "${rc_branch_check}" -gt 0 ]]; then
-            echo "rc branch exists." | tee -a $GITHUB_STEP_SUMMARY
-            echo "name=rc" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Delete RC branch
-        env:
-          BRANCH_NAME: ${{ steps.branch-check.outputs.name }}
-        run: |
-          if ! [[ -z "$BRANCH_NAME" ]]; then
-            git push --quiet origin --delete $BRANCH_NAME
-            echo "Deleted $BRANCH_NAME branch." | tee -a $GITHUB_STEP_SUMMARY
-          fi

.github/workflows/crowdin-pull.yml

@@ -1,27 +1,21 @@
+---
 name: Crowdin Sync
 
 on:
   workflow_dispatch:
     inputs: {}
+  schedule:
+    - cron: '0 0 * * 5'
 
 jobs:
   crowdin-sync:
     name: Autosync
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     env:
       _CROWDIN_PROJECT_ID: "269690"
     steps:
-      - name: Generate GH App token
-        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
-        id: app-token
-        with:
-          app-id: ${{ secrets.BW_GHAPP_ID }}
-          private-key: ${{ secrets.BW_GHAPP_KEY }}
-
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          token: ${{ steps.app-token.outputs.token }}
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
@@ -36,9 +30,9 @@ jobs:
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Download translations
-        uses: crowdin/github-action@61ac8b980551f674046220c3e104bddae2916ac5 # v2.0.0
+        uses: crowdin/github-action@97bef4fd3f1b853eb105bc99b8d0d563760e024c # v1.17.0
         env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
         with:
           config: crowdin.yml

.github/workflows/enforce-labels.yml

@@ -1,3 +1,4 @@
+---
 name: Enforce PR labels
 
 on:
@@ -6,7 +7,7 @@ on:
 jobs:
   enforce-label:
     name: EnforceLabel
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Enforce Label
         uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2

.github/workflows/pr-labeler.yml

@@ -1,3 +1,4 @@
+---
 name: "Pull Request Labeler"
 
 on:
@@ -9,9 +10,8 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
-      - name: Label PR
-        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594  # v4.3.0
         with:
           sync-labels: true

.github/workflows/release.yml

@@ -1,3 +1,4 @@
+---
 name: Release
 run-name: Release ${{ inputs.release_type }}
 
@@ -22,12 +23,12 @@ on:
 jobs:
   release:
     name: Create Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     outputs:
       branch-name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
-        if: inputs.release_type != 'Dry Run'
+        if: github.event.inputs.release_type != 'Dry Run'
         run: |
           if [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then
             echo "==================================="
@@ -37,15 +38,15 @@ jobs:
           fi
 
       - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Check Release Version
         id: version
         uses: bitwarden/gh-actions/release-version-check@main
         with:
-          release-type: ${{ inputs.release_type }}
+          release-type: ${{ github.event.inputs.release_type }}
           project-type: xamarin
-          file: src/App/Platforms/Android/AndroidManifest.xml
+          file: src/Android/Properties/AndroidManifest.xml
 
       - name: Get branch name
         id: branch
@@ -54,8 +55,8 @@ jobs:
           echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
       - name: Create GitHub deployment
-        if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: chrnorm/deployment-action@55729fcebec3d284f60f5bcabbd8376437d696b1 # v2.0.7
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: chrnorm/deployment-action@d42cde7132fcec920de534fffc3be83794335c00 # v2.0.5
         id: deployment
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
@@ -64,35 +65,29 @@ jobs:
           description: 'Deployment ${{ steps.version.outputs.version }} from branch ${{ steps.branch.outputs.branch-name }}'
           task: release
 
+
       - name: Download all artifacts
-        if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ steps.branch.outputs.branch-name }}
-          skip_unpack: true
 
       - name: Dry Run - Download all artifacts
-        if: ${{ inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: main
-          skip_unpack: true
 
-      - name: Unzip release assets
-        run: |
-          unzip bw-android-apk-sha256.txt.zip -d bw-android-apk-sha256.txt
-          unzip bw-fdroid-apk-sha256.txt.zip -d bw-fdroid-apk-sha256.txt
-          unzip com.x8bit.bitwarden-fdroid.apk.zip -d com.x8bit.bitwarden-fdroid.apk
-          unzip com.x8bit.bitwarden.aab.zip -d com.x8bit.bitwarden.aab
-          unzip com.x8bit.bitwarden.apk.zip -d com.x8bit.bitwarden.apk
+      - name: Prep Bitwarden iOS release asset
+        run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS
 
       - name: Create release
-        if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: ncipollo/release-action@6c75be85e571768fa31b40abf38de58ba0397db5  # v1.13.0
         with:
           artifacts: "./com.x8bit.bitwarden.aab/com.x8bit.bitwarden.aab,
                       ./com.x8bit.bitwarden.apk/com.x8bit.bitwarden.apk,
@@ -108,16 +103,16 @@ jobs:
           draft: true
 
       - name: Update deployment status to Success
-        if: ${{ inputs.release_type != 'Dry Run' && success() }}
-        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && success() }}
+        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'success'
           deployment-id: ${{ steps.deployment.outputs.deployment_id }}
 
       - name: Update deployment status to Failure
-        if: ${{ inputs.release_type != 'Dry Run' && failure() }}
-        uses: chrnorm/deployment-status@9a72af4586197112e0491ea843682b5dc280d806 # v2.0.3
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && failure() }}
+        uses: chrnorm/deployment-status@2afb7d27101260f4a764219439564d954d10b5b0 # v2.0.1
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'
           state: 'failure'
@@ -126,36 +121,40 @@ jobs:
 
   f-droid:
     name: F-Droid Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     needs: release
     if: inputs.fdroid_publish
     steps:
       - name: Checkout repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - name: Download F-Droid .apk artifact
-        if: ${{ inputs.release_type != 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: ${{ needs.release.outputs.branch-name }}
+          name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Dry Run - Download F-Droid .apk artifact
-        if: ${{ inputs.release_type == 'Dry Run' }}
-        uses: bitwarden/gh-actions/download-artifacts@main
+        if: ${{ github.event.inputs.release_type == 'Dry Run' }}
+        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
         with:
           workflow: build.yml
           workflow_conclusion: success
           branch: main
+          name: com.x8bit.bitwarden-fdroid.apk
 
       - name: Set up Node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version: '16.x'
 
       - name: Set up F-Droid server
-        run: pip install git+https://gitlab.com/fdroid/fdroidserver.git
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get -qqy install --no-install-recommends fdroidserver wget
 
       - name: Set up Git credentials
         env:
@@ -168,85 +167,49 @@ jobs:
 
       - name: Print environment
         run: |
-          echo "Node Version: $(node --version)"
-          echo "NPM Version: $(npm --version)"
-          echo "Git Version: $(git --version)"
-          echo "F-Droid Server Version: $(fdroid --version)"
+          node --version
+          npm --version
+          git --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
       - name: Install Node dependencies
         run: npm install
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "github-gpg-private-key,
-            github-gpg-private-key-passphrase,
-            github-pat-bitwarden-devops-bot-mobile-fdroid"
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
-        with:
-          gpg_private_key: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key }}
-          passphrase: ${{ steps.retrieve-secrets.outputs.github-gpg-private-key-passphrase }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-
-      - name: Setup git
-        run: |
-          git config --local user.email "106330231+bitwarden-devops-bot@users.noreply.github.com"
-          git config --local user.name "bitwarden-devops-bot"
-
-      - name: Download secrets
+      - name: Decrypt secrets
         env:
-          ACCOUNT_NAME: bitwardenci
-          CONTAINER_NAME: mobile
+          DECRYPT_FILE_PASSWORD: ${{ secrets.DECRYPT_FILE_PASSWORD }}
         run: |
-          mkdir -p $HOME/secrets
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name store_fdroid-keystore.jks --file ./store/fdroid/keystore.jks --output none
+          mkdir -p ~/secrets
+          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
+            --output ./store/fdroid/keystore.jks ./.github/secrets/store_fdroid-keystore.jks.gpg
 
       - name: Compile for F-Droid Store
         env:
           FDROID_STORE_KEYSTORE_PASSWORD: ${{ secrets.FDROID_STORE_KEYSTORE_PASSWORD }}
         run: |
-          # Create required directories.
+          cd $GITHUB_WORKSPACE
           mkdir dist
-          mkdir -p store/temp/fdroid
-          mkdir -p store/fdroid/repo
-
-          # Configure F-Droid server.
-          cp CNAME dist/
-          chmod 600 store/fdroid/config.yml store/fdroid/keystore.jks
+          cp CNAME ./dist
+          cd store
+          chmod 600 fdroid/config.py fdroid/keystore.jks
+          mkdir -p temp/fdroid
           TEMP_DIR="$GITHUB_WORKSPACE/store/temp/fdroid"
-          echo "keypass: $FDROID_STORE_KEYSTORE_PASSWORD" >> store/fdroid/config.yml
-          echo "keystorepass: $FDROID_STORE_KEYSTORE_PASSWORD" >> store/fdroid/config.yml
-          echo "local_copy_dir: $TEMP_DIR" >> store/fdroid/config.yml
-          mv $GITHUB_WORKSPACE/com.x8bit.bitwarden-fdroid.apk store/fdroid/repo/
-
-          # Run update and deploy.
-          cd store/fdroid
+          cd fdroid
+          echo "keypass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
+          echo "keystorepass=\"$FDROID_STORE_KEYSTORE_PASSWORD\"" >>config.py
+          echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
+          mkdir -p repo
+          mv $GITHUB_WORKSPACE/com.x8bit.bitwarden-fdroid.apk ./repo/
           fdroid update
-          fdroid deploy
-          cd ../..
-
-          # Move files for distribution.
-          rm -rf store/temp/fdroid/archive
-          mv -v store/temp/fdroid dist
-          cp store/fdroid/index.html store/fdroid/btn.png store/fdroid/qr.png dist/fdroid
+          fdroid server update
+          cd ..
+          rm -rf temp/fdroid/archive
+          mv -v temp/fdroid ../dist
+          cd fdroid
+          cp index.html btn.png qr.png ../../dist/fdroid
+          cd $GITHUB_WORKSPACE
 
       - name: Deploy to gh-pages
-        if: ${{ inputs.release_type != 'Dry Run' }}
-        env:
-          TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-mobile-fdroid }}
-        run: |
-          git remote set-url origin https://git:${TOKEN}@github.com/${GITHUB_REPOSITORY}.git
-          npm run deploy -- -u "bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com>"
+        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        run: npm run deploy

.github/workflows/stale-bot.yml

@@ -1,3 +1,4 @@
+---
 name: 'Close stale issues and PRs'
 on:
   workflow_dispatch:
@@ -7,7 +8,7 @@ on:
 jobs:
   stale:
     name: 'Check for stale issues and PRs'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: 'Run stale action'
         uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0

.github/workflows/version-auto-bump.yml

@@ -1,3 +1,4 @@
+---
 name: Auto Bump Mobile Version
 
 on:
@@ -10,6 +11,24 @@ jobs:
     name: Bump Mobile Version
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout Branch
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Calculate bumped version
+        id: version
+        env:
+          RELEASE_TAG: ${{ github.ref }}
+        run: |
+          CURR_MAJOR=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\1/')
+          CURR_PATCH=$(echo $RELEASE_TAG | sed -r 's/refs\/tags\/v([0-9]{4}\.[0-9]{1,2})\.([0-9]{1,2})/\2/')
+          echo "Current Major: $CURR_MAJOR"
+          echo "Current Patch: $CURR_PATCH"
+
+          NEW_PATCH=$((CURR_PATCH+1))
+          NEW_VER=$CURR_MAJOR.$NEW_PATCH
+          echo "New Version: $NEW_VER"
+          echo "new_version=$NEW_VER" >> $GITHUB_OUTPUT
+
       - name: Login to Azure - CI Subscription
         uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
@@ -22,9 +41,9 @@ jobs:
           keyvault: bitwarden-ci
           secrets: "github-pat-bitwarden-devops-bot-repo-scope"
 
-      - name: Trigger Version Bump workflow
+      - name: "Bump version to ${{ steps.version.outputs.new_version }}"
         env:
           GH_TOKEN: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
         run: |
-          echo '{"cut_rc_branch": "false"}' | \
-          gh workflow run version-bump.yml --json --repo bitwarden/mobile
+          echo '{"cut_rc_branch": "false", "version_number": "${{ steps.version.outputs.new_version }}"}' | \
+          gh workflow run version-bump.yml --json --repo bitwarden/mobile

.github/workflows/version-bump.yml

@@ -1,44 +1,39 @@
+---
 name: Version Bump
+run-name: Version Bump - v${{ inputs.version_number }}
 
 on:
   workflow_dispatch:
     inputs:
-      version_number_override:
-        description: "New version override (leave blank for automatic calculation, example: '2024.1.0')"
-        required: false
-        type: string
+      version_number:
+        description: "New version (example: '2024.1.0')"
+        required: true
       cut_rc_branch:
         description: "Cut RC branch?"
         default: true
         type: boolean
-      enable_slack_notification:
-        description: "Enable Slack notifications for upcoming release?"
-        default: false
-        type: boolean
 
 jobs:
   bump_version:
-    name: Bump Version
+    name: "Bump Version to v${{ inputs.version_number }}"
     runs-on: ubuntu-22.04
-    outputs:
-      version: ${{ steps.set-final-version-output.outputs.version }}
     steps:
-      - name: Validate version input
-        if: ${{ inputs.version_number_override != '' }}
-        uses: bitwarden/gh-actions/version-check@main
+      - name: Login to Azure - CI Subscription
+        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
         with:
-          version: ${{ inputs.version_number_override }}
+         creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
 
-      - name: Slack Notification Check
-        run: |
-          if [[ "${{ inputs.enable_slack_notification }}" == true ]]; then
-            echo "Slack notifications enabled."
-          else
-            echo "Slack notifications disabled."
-          fi
+      - name: Retrieve secrets
+        id: retrieve-secrets
+        uses: bitwarden/gh-actions/get-keyvault-secrets@main
+        with:
+          keyvault: "bitwarden-ci"
+          secrets: "github-gpg-private-key,
+            github-gpg-private-key-passphrase,
+            github-pat-bitwarden-devops-bot-repo-scope"
 
       - name: Checkout Branch
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: main
 
@@ -52,20 +47,6 @@ jobs:
             exit 1
           fi
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve secrets
-        id: retrieve-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "github-gpg-private-key,
-            github-gpg-private-key-passphrase,
-            github-pat-bitwarden-devops-bot-repo-scope"
-
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
         with:
@@ -74,38 +55,25 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - name: Setup git
-        run: |
-          git config --local user.email "106330231+bitwarden-devops-bot@users.noreply.github.com"
-          git config --local user.name "bitwarden-devops-bot"
-
       - name: Create Version Branch
         id: create-branch
         run: |
-          NAME=version_bump_${{ github.ref_name }}_$(date +"%Y-%m-%d")
+          NAME=version_bump_${{ github.ref_name }}_${{ inputs.version_number }}
           git switch -c $NAME
           echo "name=$NAME" >> $GITHUB_OUTPUT
 
       - name: Install xmllint
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libxml2-utils
-
-      - name: Get current version
-        id: current-version
-        run: |
-          CURRENT_VERSION=$(xmllint --xpath '
-            string(/manifest/@*[local-name()="versionName"
-              and namespace-uri()="http://schemas.android.com/apk/res/android"])
-            ' src/App/Platforms/Android/AndroidManifest.xml)
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+        run: sudo apt install -y libxml2-utils
 
       - name: Verify input version
-        if: ${{ inputs.version_number_override != '' }}
         env:
-          CURRENT_VERSION: ${{ steps.current-version.outputs.version }}
-          NEW_VERSION: ${{ inputs.version_number_override }}
+          NEW_VERSION: ${{ inputs.version_number }}
         run: |
+          CURRENT_VERSION=$(xmllint --xpath '
+            string(/manifest/@*[local-name()="versionName" 
+              and namespace-uri()="http://schemas.android.com/apk/res/android"])
+            ' src/App/Platforms/Android/AndroidManifest.xml)
+
           # Error if version has not changed.
           if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then
             echo "Version has not changed."
@@ -121,93 +89,40 @@ jobs:
             exit 1
           fi
 
-      - name: Calculate next release version
-        if: ${{ inputs.version_number_override == '' }}
-        id: calculate-next-version
-        uses: bitwarden/gh-actions/version-next@main
-        with:
-          version: ${{ steps.current-version.outputs.version }}
-
-      - name: Bump Version - Android XML - Version Override
-        if: ${{ inputs.version_number_override != '' }}
-        id: bump-version-override
+      - name: Bump Version - Android XML
         uses: bitwarden/gh-actions/version-bump@main
         with:
+          version: ${{ inputs.version_number }}
           file_path: "src/App/Platforms/Android/AndroidManifest.xml"
-          version: ${{ inputs.version_number_override }}
 
-      - name: Bump Version - Android XML - Automatic Calculation
-        if: ${{ inputs.version_number_override == '' }}
-        id: bump-version-automatic
-        uses: bitwarden/gh-actions/version-bump@main
-        with:
-          file_path: "src/App/Platforms/Android/AndroidManifest.xml"
-          version: ${{ steps.calculate-next-version.outputs.version }}
-
-      - name: Bump Version - iOS.Autofill - Version Override
-        if: ${{ inputs.version_number_override != '' }}
+      - name: Bump Version - iOS.Autofill
         uses: bitwarden/gh-actions/version-bump@main
         with:
+          version: ${{ inputs.version_number }}
           file_path: "src/iOS.Autofill/Info.plist"
-          version: ${{ inputs.version_number_override }}
 
-      - name: Bump Version - iOS.Autofill - Automatic Calculation
-        if: ${{ inputs.version_number_override == '' }}
-        uses: bitwarden/gh-actions/version-bump@main
-        with:
-          file_path: "src/iOS.Autofill/Info.plist"
-          version: ${{ steps.calculate-next-version.outputs.version }}
-
-      - name: Bump Version - iOS.Extension - Version Override
-        if: ${{ inputs.version_number_override != '' }}
+      - name: Bump Version - iOS.Extension
         uses: bitwarden/gh-actions/version-bump@main
         with:
+          version: ${{ inputs.version_number }}
           file_path: "src/iOS.Extension/Info.plist"
-          version: ${{ inputs.version_number_override }}
 
-      - name: Bump Version - iOS.Extension - Automatic Calculation
-        if: ${{ inputs.version_number_override == '' }}
-        uses: bitwarden/gh-actions/version-bump@main
-        with:
-          file_path: "src/iOS.Extension/Info.plist"
-          version: ${{ steps.calculate-next-version.outputs.version }}
-
-      - name: Bump Version - iOS.ShareExtension - Version Override
-        if: ${{ inputs.version_number_override != '' }}
+      - name: Bump Version - iOS.ShareExtension
         uses: bitwarden/gh-actions/version-bump@main
         with:
+          version: ${{ inputs.version_number }}
           file_path: "src/iOS.ShareExtension/Info.plist"
-          version: ${{ inputs.version_number_override }}
 
-      - name: Bump Version - iOS.ShareExtension - Automatic Calculation
-        if: ${{ inputs.version_number_override == '' }}
-        uses: bitwarden/gh-actions/version-bump@main
-        with:
-          file_path: "src/iOS.ShareExtension/Info.plist"
-          version: ${{ steps.calculate-next-version.outputs.version }}
-
-      - name: Bump Version - iOS - Version Override
-        if: ${{ inputs.version_number_override != '' }}
+      - name: Bump Version - iOS
         uses: bitwarden/gh-actions/version-bump@main
         with:
+          version: ${{ inputs.version_number }}
           file_path: "src/App/Platforms/iOS/Info.plist"
-          version: ${{ inputs.version_number_override }}
 
-      - name: Bump Version - iOS - Automatic Calculation
-        if: ${{ inputs.version_number_override == '' }}
-        uses: bitwarden/gh-actions/version-bump@main
-        with:
-          file_path: "src/App/Platforms/iOS/Info.plist"
-          version: ${{ steps.calculate-next-version.outputs.version }}
-
-      - name: Set Job output
-        id: set-final-version-output
+      - name: Setup git
         run: |
-          if [[ "${{ steps.bump-version-override.outcome }}" == "success" ]]; then
-            echo "version=${{ inputs.version_number_override }}" >> $GITHUB_OUTPUT
-          elif [[ "${{ steps.bump-version-automatic.outcome }}" == "success" ]]; then
-            echo "version=${{ steps.calculate-next-version.outputs.version }}" >> $GITHUB_OUTPUT
-          fi
+          git config --local user.email "106330231+bitwarden-devops-bot@users.noreply.github.com"
+          git config --local user.name "bitwarden-devops-bot"
 
       - name: Check if version changed
         id: version-changed
@@ -221,7 +136,7 @@ jobs:
 
       - name: Commit files
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
-        run: git commit -m "Bumped version to ${{ steps.set-final-version-output.outputs.version }}" -a
+        run: git commit -m "Bumped version to ${{ inputs.version_number }}" -a
 
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
@@ -235,7 +150,7 @@ jobs:
         env:
           GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
           PR_BRANCH: ${{ steps.create-branch.outputs.name }}
-          TITLE: "Bump version to ${{ steps.set-final-version-output.outputs.version }}"
+          TITLE: "Bump version to ${{ inputs.version_number }}"
         run: |
           PR_URL=$(gh pr create --title "$TITLE" \
             --base "main" \
@@ -251,64 +166,46 @@ jobs:
               - [X] Other
 
               ## Objective
-              Automated version bump to ${{ steps.set-final-version-output.outputs.version }}")
+              Automated version bump to ${{ inputs.version_number }}")
           echo "pr_number=${PR_URL##*/}" >> $GITHUB_OUTPUT
 
       - name: Approve PR
-        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
         run: gh pr review $PR_NUMBER --approve
 
       - name: Merge PR
-        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
         env:
           GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }}
           PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }}
         run: gh pr merge $PR_NUMBER --squash --auto --delete-branch
 
-      - name: Report upcoming release version to Slack
-        if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' && inputs.enable_slack_notification == true }}
-        uses: bitwarden/gh-actions/report-upcoming-release-version@main
-        with:
-          version: ${{ steps.set-final-version-output.outputs.version }}
-          project: ${{ github.repository }}
-          AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
   cut_rc:
     name: Cut RC branch
-    if: ${{ inputs.cut_rc_branch == true }}
     needs: bump_version
+    if: ${{ inputs.cut_rc_branch == true }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: main
 
-      - name: Install xmllint
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libxml2-utils
-
       - name: Verify version has been updated
         env:
-          NEW_VERSION: ${{ needs.bump_version.outputs.version }}
+          NEW_VERSION: ${{ inputs.version_number }}
         run: |
           # Wait for version to change.
-          while : ; do
+          do
             echo "Waiting for version to be updated..."
             git pull --force
             CURRENT_VERSION=$(xmllint --xpath '
-            string(/manifest/@*[local-name()="versionName"
+            string(/manifest/@*[local-name()="versionName" 
               and namespace-uri()="http://schemas.android.com/apk/res/android"])
             ' src/App/Platforms/Android/AndroidManifest.xml)
-
-            # If the versions don't match we continue the loop, otherwise we break out of the loop.
-            [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]] || break
             sleep 10
-          done
+          done while [[ "$NEW_VERSION" != "$CURRENT_VERSION" ]]
 
       - name: Cut RC branch
         run: |

.github/workflows/workflow-linter.yml

@@ -0,0 +1,11 @@
+---
+name: Workflow Linter
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/**
+
+jobs:
+  call-workflow:
+    uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@main

.gitignore

@@ -148,7 +148,6 @@ publish/
 
 # NuGet Packages
 *.nupkg
-!**/Xamarin.AndroidX.Credentials.1.0.0.nupkg
 # The packages folder can be ignored because of Package Restore
 **/packages/*
 # except build/, which is used as an MSBuild target.
@@ -296,11 +295,17 @@ iOSInjectionProject/
 timeline.xctimeline
 playground.xcworkspace
 
-# xcode / swift package manager - used by the MessagePack lib
-/.build
-/Packages
-/*.xcodeproj
-.swiftpm 
+# Swift Package Manager
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
 
 # CocoaPods
 # We recommend against adding the Pods directory to your .gitignore. However

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/MessagePack"]
+	path = lib/MessagePack
+	url = https://github.com/bitwarden/MessagePack.git

Directory.Build.props

@@ -1,15 +1,13 @@
 <Project>
  <PropertyGroup>
-   <MauiVersion>8.0.7</MauiVersion>
+   <MauiVersion>8.0.4-nightly.*</MauiVersion>
    <ReleaseCodesignProvision>Automatic:AppStore</ReleaseCodesignProvision>
    <ReleaseCodesignKey>iPhone Distribution</ReleaseCodesignKey>
    <IncludeBitwardeniOSExtensions>True</IncludeBitwardeniOSExtensions>
-   <IncludeBitwardenWatchOSApp>False</IncludeBitwardenWatchOSApp>
+   <IncludeBitwardenWatchOSApp>True</IncludeBitwardenWatchOSApp>
    <Argon2IdLoadMtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</Argon2IdLoadMtouchExtraArgs>
+   
    <!-- Uncomment this when Unit Testing-->
    <!-- <CustomConstants>UT</CustomConstants> -->
-
-   <!-- Uncomment this when building FDROID-->
-   <!-- <CustomConstants>FDROID</CustomConstants> -->
  </PropertyGroup>
-</Project>
+</Project>

README.md

@@ -4,10 +4,6 @@
 
 # Bitwarden Mobile Application
 
-> [!TIP]  
-> Looking for the new native apps? Head on over to [bitwarden/android](https://github.com/bitwarden/android) and [bitwarden/ios](https://github.com/bitwarden/ios)
-
-
 <a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
 
 The Bitwarden mobile application is written in C# using .NET MAUI.
@@ -16,7 +12,7 @@ The Bitwarden mobile application is written in C# using .NET MAUI.
 
 # Build/Run
 
-Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Mobile section](https://contributing.bitwarden.com/getting-started/clients/mobile/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 # We're Hiring!
 

build.cake

@@ -15,18 +15,16 @@ abstract record VariantConfig(
     string AppName, 
     string AndroidPackageName,
     string iOSBundleId,
-    string ApsEnvironment,
-    string DistProvisioningProfilePrefix
+    string ApsEnvironment
     );
 
 const string BASE_BUNDLE_ID_DROID = "com.x8bit.bitwarden";
 const string BASE_BUNDLE_ID_IOS = "com.8bit.bitwarden";
 
-//NOTE: Beta iOS variants have a different ITSEncryptionExportComplianceCode 
-record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development", "Dist:");
-record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development", "Dist:");
-record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production", "Dist: Beta");
-record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production", "Dist:");
+record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development");
+record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development");
+record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production");
+record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production");
 
 VariantConfig GetVariant() => variant.ToLower() switch{
     "qa" => new QA(),
@@ -199,8 +197,7 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi
     var prevBundleId = plist["CFBundleIdentifier"];
     var prevBundleName = plist["CFBundleName"];
     //var newVersion = CreateBuildNumber(prevVersion).ToString();
-    // we need to maintain version formatting here composed of one to three period-separated integers, so we cannot use the GetVersionName method as in Android for non-Prod.
-    var newVersionName = prevVersionName;
+    var newVersionName = GetVersionName(prevVersionName, buildVariant, git);
     var newBundleId = GetiOSBundleId(buildVariant, projectType);
     var newBundleName = GetiOSBundleName(buildVariant, projectType);
 
@@ -222,11 +219,6 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi
         plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"] = keyText.Replace("com.8bit.bitwarden", buildVariant.iOSBundleId);
     }
 
-    if(buildVariant is Beta)
-    {
-        plist["ITSEncryptionExportComplianceCode"] = "3dd3e32f-efa6-4d99-b410-28aa28b1cb77";
-    }
-
     SerializePlist(plistFile, plist);
 
     Information($"Changed app name from {prevBundleName} to {newBundleName}");
@@ -236,15 +228,12 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi
     Information($"{plistPath} updated with success!");
 }
 
-private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant, bool updateApsEnv)
+private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant)
 {
     var EntitlementlistFile = File(entitlementsPath);
     dynamic Entitlements = DeserializePlist(EntitlementlistFile);
 
-    if (updateApsEnv)
-    {
-        Entitlements["aps-environment"] = buildVariant.ApsEnvironment;
-    }
+    Entitlements["aps-environment"] = buildVariant.ApsEnvironment;
     Entitlements["keychain-access-groups"] = new List<string>() { "$(AppIdentifierPrefix)" + buildVariant.iOSBundleId };
     Entitlements["com.apple.security.application-groups"] = new List<string>() { $"group.{buildVariant.iOSBundleId}" };;
 
@@ -283,10 +272,9 @@ private void UpdateWatchPbxproj(string pbxprojPath, string newVersion)
     const string pattern = @"MARKETING_VERSION = [^;]*;";
 
     fileText = Regex.Replace(fileText, pattern, $"MARKETING_VERSION = {newVersion};");
-    
-    FileWriteText(pbxprojPath, fileText);
 
-    Information($"{pbxprojPath} modified Marketing Version successfully.");
+    FileWriteText(pbxprojPath, fileText);
+    Information($"{pbxprojPath} modified successfully.");
 }
 
 /// <summary>
@@ -339,7 +327,7 @@ Task("UpdateiOSPlist")
         var infoPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Info.plist");
         var entitlementsPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Entitlements.plist");
         UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, true);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
     });
 
 Task("UpdateiOSAutofillPlist")
@@ -350,7 +338,7 @@ Task("UpdateiOSAutofillPlist")
         var infoPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Info.plist");
         var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Entitlements.plist");
         UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Autofill);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
     });
 
 Task("UpdateiOSExtensionPlist")
@@ -361,7 +349,7 @@ Task("UpdateiOSExtensionPlist")
         var infoPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Info.plist");
         var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Entitlements.plist");
         UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Extension);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
     });
 
 Task("UpdateiOSShareExtensionPlist")
@@ -372,7 +360,7 @@ Task("UpdateiOSShareExtensionPlist")
         var infoPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Info.plist");
         var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Entitlements.plist");
         UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.ShareExtension);
-        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false);
+        UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant);
     });
 
 Task("UpdateiOSCodeFiles")
@@ -409,22 +397,6 @@ Task("UpdateWatchKitAppInfoPlist")
         UpdateWatchKitAppInfoPlist(infoPath, buildVariant);
     });
 
-Task("UpdateDistProfiles")
-    .IsDependentOn("UpdateiOSCodeFiles")
-    .Does(()=> {
-        var buildVariant = GetVariant();
-    
-        var filesToReplace = new string[] {
-            Path.Combine(".github", "resources", "export-options-app-store.plist"),
-            Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden.xcodeproj", "project.pbxproj")
-        };
-
-        foreach(string path in filesToReplace)
-        {
-            ReplaceInFile(path, "Dist:", buildVariant.DistProvisioningProfilePrefix);
-        }
-    });
-
 #endregion iOS
 
 #region Main Tasks
@@ -446,7 +418,6 @@ Task("iOS")
     .IsDependentOn("UpdateiOSCodeFiles")
     .IsDependentOn("UpdateWatchProject")
     .IsDependentOn("UpdateWatchKitAppInfoPlist")
-    .IsDependentOn("UpdateDistProfiles")
     .Does(()=>
     {
         Information("iOS app updated");
@@ -466,4 +437,4 @@ Options:
     });
 #endregion Main Tasks
 
-RunTarget(target);
+RunTarget(target);

crowdin.yml

@@ -2,9 +2,9 @@ project_id_env: _CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_API_TOKEN
 preserve_hierarchy: true
 files:
-  - source: /src/Core/Resources/Localization/AppResources.resx
-    dest: /src/Core/Resources/Localization/%original_file_name%
-    translation: /src/Core/Resources/Localization/AppResources.%two_letters_code%.resx
+  - source: /src/App/Resources/AppResources.resx
+    dest: /src/App/Resources/%original_file_name%
+    translation: /src/App/Resources/AppResources.%two_letters_code%.resx
     update_option: update_as_unapproved
     languages_mapping:
       two_letters_code:

global.json

@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.402",
-    "rollForward": "disable"
-  }
-}

lib/MessagePack/LICENSE.md

@@ -1,19 +0,0 @@
-Copyright 2018 Read Evaluate Press, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

lib/MessagePack/MessagePack-FlightSchool.podspec

@@ -1,32 +0,0 @@
-Pod::Spec.new do |s|
-    s.name = 'MessagePack-FlightSchool'
-    s.module_name  = 'MessagePack'
-    s.version      = '1.2.4'
-    s.summary      = 'A MessagePack encoder and decoder for Codable types.'
-
-    s.description  = <<-DESC
-      This functionality is discussed in Chapter 7 of
-      Flight School Guide to Swift Codable.
-    DESC
-
-    s.homepage     = 'https://flight.school/books/codable/'
-
-    s.license      = { type: 'MIT', file: 'LICENSE.md' }
-
-    s.author = { 'Mattt' => 'mattt@flight.school' }
-
-    s.social_media_url   = 'https://twitter.com/mattt'
-
-    s.ios.deployment_target = '8.0'
-    s.osx.deployment_target = '10.10'
-    s.watchos.deployment_target = '2.0'
-    s.tvos.deployment_target = '9.0'
-
-    s.source = { git: 'https://github.com/Flight-School/MessagePack.git',
-                 tag: s.version.to_s }
-
-    s.source_files = 'Sources/**/*.swift'
-
-    s.swift_version = '4.2'
-    s.static_framework = true
-end

lib/MessagePack/MessagePack.playground/Contents.swift

@@ -1,13 +0,0 @@
-import MessagePack
-
-let encoder = MessagePackEncoder()
-
-let value: String = "hello"
-let encodedData = try encoder.encode(value)
-
-print("Bytes: ", encodedData.map{ String($0, radix: 16, uppercase: true) })
-
-let decoder = MessagePackDecoder()
-let decodedValue = try decoder.decode(String.self, from: encodedData)
-
-decodedValue == value

lib/MessagePack/MessagePack.playground/contents.xcplayground

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='macos' executeOnSourceChanges='false'>
-    <timeline fileName='timeline.xctimeline'/>
-</playground>

lib/MessagePack/MessagePack.xcodeproj/MessagePackTests_Info.plist

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>$(EXECUTABLE_NAME)</string>
-  <key>CFBundleIdentifier</key>
-  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>$(PRODUCT_NAME)</string>
-  <key>CFBundlePackageType</key>
-  <string>BNDL</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>$(CURRENT_PROJECT_VERSION)</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

lib/MessagePack/MessagePack.xcodeproj/MessagePack_Info.plist

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>$(EXECUTABLE_NAME)</string>
-  <key>CFBundleIdentifier</key>
-  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>$(PRODUCT_NAME)</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>$(CURRENT_PROJECT_VERSION)</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

lib/MessagePack/MessagePack.xcodeproj/project.pbxproj

@@ -1,543 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		"MessagePack::MessagePackPackageTests::ProductTarget" /* MessagePackPackageTests */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = OBJ_57 /* Build configuration list for PBXAggregateTarget "MessagePackPackageTests" */;
-			buildPhases = (
-			);
-			dependencies = (
-				OBJ_60 /* PBXTargetDependency */,
-			);
-			name = MessagePackPackageTests;
-			productName = MessagePackPackageTests;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		1BC312FF2992DE9C00177F2A /* DataSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1BC312FE2992DE9C00177F2A /* DataSpec.swift */; };
-		OBJ_38 /* AnyCodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* AnyCodingKey.swift */; };
-		OBJ_39 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Box.swift */; };
-		OBJ_40 /* KeyedDecodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* KeyedDecodingContainer.swift */; };
-		OBJ_41 /* MessagePackDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_13 /* MessagePackDecoder.swift */; };
-		OBJ_42 /* SingleValueDecodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* SingleValueDecodingContainer.swift */; };
-		OBJ_43 /* UnkeyedDecodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* UnkeyedDecodingContainer.swift */; };
-		OBJ_44 /* KeyedEncodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* KeyedEncodingContainer.swift */; };
-		OBJ_45 /* MessagePackEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_18 /* MessagePackEncoder.swift */; };
-		OBJ_46 /* SingleValueEncodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* SingleValueEncodingContainer.swift */; };
-		OBJ_47 /* UnkeyedEncodingContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_20 /* UnkeyedEncodingContainer.swift */; };
-		OBJ_48 /* FixedWidthInteger+Bytes.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* FixedWidthInteger+Bytes.swift */; };
-		OBJ_55 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_6 /* Package.swift */; };
-		OBJ_66 /* Airport.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_24 /* Airport.swift */; };
-		OBJ_67 /* MessagePackDecodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_25 /* MessagePackDecodingTests.swift */; };
-		OBJ_68 /* MessagePackEncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_26 /* MessagePackEncodingTests.swift */; };
-		OBJ_69 /* MessagePackPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_27 /* MessagePackPerformanceTests.swift */; };
-		OBJ_70 /* MessagePackRoundTripTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_28 /* MessagePackRoundTripTests.swift */; };
-		OBJ_72 /* MessagePack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "MessagePack::MessagePack::Product" /* MessagePack.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		1BC312FC2989A1AD00177F2A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = OBJ_1 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = "MessagePack::MessagePack";
-			remoteInfo = MessagePack;
-		};
-		1BC312FD2989A1B200177F2A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = OBJ_1 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = "MessagePack::MessagePackTests";
-			remoteInfo = MessagePackTests;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		1BC312FE2992DE9C00177F2A /* DataSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSpec.swift; sourceTree = "<group>"; };
-		"MessagePack::MessagePack::Product" /* MessagePack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MessagePack.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		"MessagePack::MessagePackTests::Product" /* MessagePackTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = MessagePackTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		OBJ_10 /* Box.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Box.swift; sourceTree = "<group>"; };
-		OBJ_12 /* KeyedDecodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyedDecodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_13 /* MessagePackDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackDecoder.swift; sourceTree = "<group>"; };
-		OBJ_14 /* SingleValueDecodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleValueDecodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_15 /* UnkeyedDecodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnkeyedDecodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_17 /* KeyedEncodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyedEncodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_18 /* MessagePackEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackEncoder.swift; sourceTree = "<group>"; };
-		OBJ_19 /* SingleValueEncodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleValueEncodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_20 /* UnkeyedEncodingContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnkeyedEncodingContainer.swift; sourceTree = "<group>"; };
-		OBJ_21 /* FixedWidthInteger+Bytes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FixedWidthInteger+Bytes.swift"; sourceTree = "<group>"; };
-		OBJ_24 /* Airport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Airport.swift; sourceTree = "<group>"; };
-		OBJ_25 /* MessagePackDecodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackDecodingTests.swift; sourceTree = "<group>"; };
-		OBJ_26 /* MessagePackEncodingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackEncodingTests.swift; sourceTree = "<group>"; };
-		OBJ_27 /* MessagePackPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackPerformanceTests.swift; sourceTree = "<group>"; };
-		OBJ_28 /* MessagePackRoundTripTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePackRoundTripTests.swift; sourceTree = "<group>"; };
-		OBJ_29 /* MessagePack.xcworkspace */ = {isa = PBXFileReference; lastKnownFileType = wrapper.workspace; path = MessagePack.xcworkspace; sourceTree = SOURCE_ROOT; };
-		OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
-		OBJ_9 /* AnyCodingKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyCodingKey.swift; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		OBJ_49 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		OBJ_71 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 0;
-			files = (
-				OBJ_72 /* MessagePack.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		OBJ_11 /* Decoder */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_12 /* KeyedDecodingContainer.swift */,
-				OBJ_13 /* MessagePackDecoder.swift */,
-				OBJ_14 /* SingleValueDecodingContainer.swift */,
-				OBJ_15 /* UnkeyedDecodingContainer.swift */,
-			);
-			path = Decoder;
-			sourceTree = "<group>";
-		};
-		OBJ_16 /* Encoder */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_17 /* KeyedEncodingContainer.swift */,
-				OBJ_18 /* MessagePackEncoder.swift */,
-				OBJ_19 /* SingleValueEncodingContainer.swift */,
-				OBJ_20 /* UnkeyedEncodingContainer.swift */,
-			);
-			path = Encoder;
-			sourceTree = "<group>";
-		};
-		OBJ_22 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_23 /* MessagePackTests */,
-			);
-			name = Tests;
-			sourceTree = SOURCE_ROOT;
-		};
-		OBJ_23 /* MessagePackTests */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_24 /* Airport.swift */,
-				OBJ_25 /* MessagePackDecodingTests.swift */,
-				OBJ_26 /* MessagePackEncodingTests.swift */,
-				OBJ_27 /* MessagePackPerformanceTests.swift */,
-				OBJ_28 /* MessagePackRoundTripTests.swift */,
-			);
-			name = MessagePackTests;
-			path = Tests/MessagePackTests;
-			sourceTree = SOURCE_ROOT;
-		};
-		OBJ_30 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				"MessagePack::MessagePackTests::Product" /* MessagePackTests.xctest */,
-				"MessagePack::MessagePack::Product" /* MessagePack.framework */,
-			);
-			name = Products;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		OBJ_5 /*  */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_6 /* Package.swift */,
-				OBJ_7 /* Sources */,
-				OBJ_22 /* Tests */,
-				OBJ_29 /* MessagePack.xcworkspace */,
-				OBJ_30 /* Products */,
-			);
-			name = "";
-			sourceTree = "<group>";
-		};
-		OBJ_7 /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_8 /* MessagePack */,
-			);
-			name = Sources;
-			sourceTree = SOURCE_ROOT;
-		};
-		OBJ_8 /* MessagePack */ = {
-			isa = PBXGroup;
-			children = (
-				OBJ_9 /* AnyCodingKey.swift */,
-				OBJ_10 /* Box.swift */,
-				OBJ_11 /* Decoder */,
-				OBJ_16 /* Encoder */,
-				OBJ_21 /* FixedWidthInteger+Bytes.swift */,
-				1BC312FE2992DE9C00177F2A /* DataSpec.swift */,
-			);
-			name = MessagePack;
-			path = Sources/MessagePack;
-			sourceTree = SOURCE_ROOT;
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		"MessagePack::MessagePack" /* MessagePack */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = OBJ_34 /* Build configuration list for PBXNativeTarget "MessagePack" */;
-			buildPhases = (
-				OBJ_37 /* Sources */,
-				OBJ_49 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = MessagePack;
-			productName = MessagePack;
-			productReference = "MessagePack::MessagePack::Product" /* MessagePack.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-		"MessagePack::MessagePackTests" /* MessagePackTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = OBJ_62 /* Build configuration list for PBXNativeTarget "MessagePackTests" */;
-			buildPhases = (
-				OBJ_65 /* Sources */,
-				OBJ_71 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				OBJ_73 /* PBXTargetDependency */,
-			);
-			name = MessagePackTests;
-			productName = MessagePackTests;
-			productReference = "MessagePack::MessagePackTests::Product" /* MessagePackTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		"MessagePack::SwiftPMPackageDescription" /* MessagePackPackageDescription */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = OBJ_51 /* Build configuration list for PBXNativeTarget "MessagePackPackageDescription" */;
-			buildPhases = (
-				OBJ_54 /* Sources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = MessagePackPackageDescription;
-			productName = MessagePackPackageDescription;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		OBJ_1 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 9999;
-			};
-			buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "MessagePack" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				English,
-				en,
-			);
-			mainGroup = OBJ_5 /*  */;
-			productRefGroup = OBJ_30 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				"MessagePack::MessagePack" /* MessagePack */,
-				"MessagePack::SwiftPMPackageDescription" /* MessagePackPackageDescription */,
-				"MessagePack::MessagePackPackageTests::ProductTarget" /* MessagePackPackageTests */,
-				"MessagePack::MessagePackTests" /* MessagePackTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		OBJ_37 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 0;
-			files = (
-				OBJ_38 /* AnyCodingKey.swift in Sources */,
-				OBJ_39 /* Box.swift in Sources */,
-				OBJ_40 /* KeyedDecodingContainer.swift in Sources */,
-				OBJ_41 /* MessagePackDecoder.swift in Sources */,
-				OBJ_42 /* SingleValueDecodingContainer.swift in Sources */,
-				OBJ_43 /* UnkeyedDecodingContainer.swift in Sources */,
-				OBJ_44 /* KeyedEncodingContainer.swift in Sources */,
-				OBJ_45 /* MessagePackEncoder.swift in Sources */,
-				OBJ_46 /* SingleValueEncodingContainer.swift in Sources */,
-				OBJ_47 /* UnkeyedEncodingContainer.swift in Sources */,
-				1BC312FF2992DE9C00177F2A /* DataSpec.swift in Sources */,
-				OBJ_48 /* FixedWidthInteger+Bytes.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		OBJ_54 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 0;
-			files = (
-				OBJ_55 /* Package.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		OBJ_65 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 0;
-			files = (
-				OBJ_66 /* Airport.swift in Sources */,
-				OBJ_67 /* MessagePackDecodingTests.swift in Sources */,
-				OBJ_68 /* MessagePackEncodingTests.swift in Sources */,
-				OBJ_69 /* MessagePackPerformanceTests.swift in Sources */,
-				OBJ_70 /* MessagePackRoundTripTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		OBJ_60 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = "MessagePack::MessagePackTests" /* MessagePackTests */;
-			targetProxy = 1BC312FD2989A1B200177F2A /* PBXContainerItemProxy */;
-		};
-		OBJ_73 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = "MessagePack::MessagePack" /* MessagePack */;
-			targetProxy = 1BC312FC2989A1AD00177F2A /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		OBJ_3 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_NS_ASSERTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_SWIFT_FLAGS = "-DXcode";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "SWIFT_PACKAGE DEBUG";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				USE_HEADERMAP = NO;
-			};
-			name = Debug;
-		};
-		OBJ_35 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = MessagePack.xcodeproj/MessagePack_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
-				OTHER_SWIFT_FLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = MessagePack;
-				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
-				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 4.0;
-				TARGET_NAME = MessagePack;
-			};
-			name = Debug;
-		};
-		OBJ_36 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ENABLE_TESTABILITY = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = MessagePack.xcodeproj/MessagePack_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
-				OTHER_SWIFT_FLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = MessagePack;
-				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
-				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 4.0;
-				TARGET_NAME = MessagePack;
-			};
-			name = Release;
-		};
-		OBJ_4 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				GCC_OPTIMIZATION_LEVEL = s;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				OTHER_SWIFT_FLAGS = "-DXcode";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				USE_HEADERMAP = NO;
-			};
-			name = Release;
-		};
-		OBJ_52 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				LD = /usr/bin/true;
-				OTHER_SWIFT_FLAGS = "-swift-version 4 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk";
-				SWIFT_VERSION = 4.0;
-			};
-			name = Debug;
-		};
-		OBJ_53 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				LD = /usr/bin/true;
-				OTHER_SWIFT_FLAGS = "-swift-version 4 -I $(TOOLCHAIN_DIR)/usr/lib/swift/pm/4 -target x86_64-apple-macosx10.10 -sdk /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk";
-				SWIFT_VERSION = 4.0;
-			};
-			name = Release;
-		};
-		OBJ_58 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		OBJ_59 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		OBJ_63 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = MessagePack.xcodeproj/MessagePackTests_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
-				OTHER_SWIFT_FLAGS = "$(inherited)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 4.0;
-				TARGET_NAME = MessagePackTests;
-			};
-			name = Debug;
-		};
-		OBJ_64 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = MessagePack.xcodeproj/MessagePackTests_Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
-				OTHER_CFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)";
-				OTHER_SWIFT_FLAGS = "$(inherited)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 4.0;
-				TARGET_NAME = MessagePackTests;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		OBJ_2 /* Build configuration list for PBXProject "MessagePack" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				OBJ_3 /* Debug */,
-				OBJ_4 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		OBJ_34 /* Build configuration list for PBXNativeTarget "MessagePack" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				OBJ_35 /* Debug */,
-				OBJ_36 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		OBJ_51 /* Build configuration list for PBXNativeTarget "MessagePackPackageDescription" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				OBJ_52 /* Debug */,
-				OBJ_53 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		OBJ_57 /* Build configuration list for PBXAggregateTarget "MessagePackPackageTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				OBJ_58 /* Debug */,
-				OBJ_59 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		OBJ_62 /* Build configuration list for PBXNativeTarget "MessagePackTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				OBJ_63 /* Debug */,
-				OBJ_64 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = OBJ_1 /* Project object */;
-}

lib/MessagePack/MessagePack.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

lib/MessagePack/MessagePack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

lib/MessagePack/MessagePack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>

lib/MessagePack/MessagePack.xcodeproj/xcshareddata/xcschemes/MessagePack.xcscheme

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1010"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MessagePack::MessagePack"
-               BuildableName = "MessagePack.framework"
-               BlueprintName = "MessagePack"
-               ReferencedContainer = "container:MessagePack.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "MessagePack::MessagePackTests"
-               BuildableName = "MessagePackTests.xctest"
-               BlueprintName = "MessagePackTests"
-               ReferencedContainer = "container:MessagePack.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "MessagePack::MessagePack"
-            BuildableName = "MessagePack.framework"
-            BlueprintName = "MessagePack"
-            ReferencedContainer = "container:MessagePack.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "MessagePack::MessagePack"
-            BuildableName = "MessagePack.framework"
-            BlueprintName = "MessagePack"
-            ReferencedContainer = "container:MessagePack.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "MessagePack::MessagePack"
-            BuildableName = "MessagePack.framework"
-            BlueprintName = "MessagePack"
-            ReferencedContainer = "container:MessagePack.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

lib/MessagePack/MessagePack.xcworkspace/contents.xcworkspacedata

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:MessagePack.playground">
-   </FileRef>
-   <FileRef
-      location = "group:MessagePack.xcodeproj">
-   </FileRef>
-</Workspace>

lib/MessagePack/MessagePack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

lib/MessagePack/MessagePack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>

lib/MessagePack/Package.swift

@@ -1,28 +0,0 @@
-// swift-tools-version:4.0
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "MessagePack",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "MessagePack",
-            targets: ["MessagePack"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "MessagePack",
-            dependencies: []),
-        .testTarget(
-            name: "MessagePackTests",
-            dependencies: ["MessagePack"]),
-    ]
-)

lib/MessagePack/README.md

@@ -1,87 +0,0 @@
-# MessagePack
-
-[![Build Status][build status badge]][build status]
-
-A [MessagePack](https://msgpack.org/) encoder and decoder for `Codable` types.
-
-This functionality is discussed in Chapter 7 of
-[Flight School Guide to Swift Codable](https://flight.school/books/codable).
-
-## Requirements
-
-- Swift 4.2+
-
-## Usage
-
-### Encoding Messages
-
-```swift
-import MessagePack
-
-let encoder = MessagePackEncoder()
-let value = try! encoder.encode(["a": 1, "b": 2, "c": 3])
-// [0x83, 0xA1, 0x62, 0x02, 0xA1, 0x61, 0x01, 0xA1, 0x63, 0x03]
-```
-
-### Decoding Messages
-
-```swift
-import MessagePack
-
-let decoder = MessagePackDecoder()
-let data = Data(bytes: [0xCB, 0x40, 0x09, 0x21, 0xF9, 0xF0, 0x1B, 0x86, 0x6E])
-let value = try! decoder.decode(Double.self, from: data)
-// 3.14159
-```
-
-## Installation
-
-### Swift Package Manager
-
-Add the MessagePack package to your target dependencies in `Package.swift`:
-
-```swift
-import PackageDescription
-
-let package = Package(
-  name: "YourProject",
-  dependencies: [
-    .package(
-        url: "https://github.com/Flight-School/MessagePack",
-        from: "1.2.3"
-    ),
-  ]
-)
-```
-
-Then run the `swift build` command to build your project.
-
-### CocoaPods
-
-You can install `MessagePack` via CocoaPods,
-by adding the following line to your `Podfile`:
-
-```ruby
-pod 'MessagePack-FlightSchool', '~> 1.2.4'
-```
-
-Run the `pod install` command to download the library
-and integrate it into your Xcode project.
-
-> **Note**
-> The module name for this library is "MessagePack" ---
-> that is, to use it, you add `import MessagePack` to the top of your Swift code
-> just as you would by any other installation method.
-> The pod is called "MessagePack-FlightSchool"
-> because there's an existing pod with the name "MessagePack".
-
-## License
-
-MIT
-
-## Contact
-
-Mattt ([@mattt](https://twitter.com/mattt))
-
-[build status]: https://github.com/Flight-School/MessagePack/actions?query=workflow%3ACI
-[build status badge]: https://github.com/Flight-School/MessagePack/workflows/CI/badge.svg

lib/MessagePack/Sources/MessagePack/AnyCodingKey.swift

@@ -1,28 +0,0 @@
-struct AnyCodingKey: CodingKey, Equatable {
-    var stringValue: String
-    var intValue: Int?
-    
-    init?(stringValue: String) {
-        self.stringValue = stringValue
-        self.intValue = nil
-    }
-    
-    init?(intValue: Int) {
-        self.stringValue = "\(intValue)"
-        self.intValue = intValue
-    }
-    
-    init<Key>(_ base: Key) where Key : CodingKey {
-        if let intValue = base.intValue {
-            self.init(intValue: intValue)!
-        } else {
-            self.init(stringValue: base.stringValue)!
-        }
-    }
-}
-
-extension AnyCodingKey: Hashable {
-    var hashValue: Int {
-        return self.intValue?.hashValue ?? self.stringValue.hashValue
-    }
-}

lib/MessagePack/Sources/MessagePack/Box.swift

@@ -1,44 +0,0 @@
-import Foundation
-
-struct Box<Value> {
-    let value: Value
-    init(_ value: Value) {
-        self.value = value
-    }
-}
-
-extension Box: Encodable where Value: Encodable {
-    func encode(to encoder: Encoder) throws {
-        try self.value.encode(to: encoder)
-    }
-}
-
-extension Box: Decodable where Value: Decodable {
-    init(from decoder: Decoder) throws {
-        self.init(try Value(from: decoder))
-    }
-}
-
-extension Box where Value == Data {
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        self.init(try container.decode(Value.self))
-    }
-    
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(self.value)
-    }
-}
-
-extension Box where Value == Date {
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        self.init(try container.decode(Value.self))
-    }
-    
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(self.value)
-    }
-}

lib/MessagePack/Sources/MessagePack/DataSpec.swift

@@ -1,60 +0,0 @@
-import Foundation
-
-public struct DataSpec {
-    let name: String
-    let isObj: Bool
-    let isArray: Bool
-    let dataSpecBuilder: DataSpecBuilder?
-    
-    init(_ name: String, _ isObj: Bool, _ isArray: Bool, _ dataSpecBuilder: DataSpecBuilder?) {
-        self.name = name
-        self.isObj = isObj
-        self.isArray = isArray
-        self.dataSpecBuilder = dataSpecBuilder
-    }
-}
-
-public class DataSpecBuilder : NSCopying {
-    var specs: [DataSpec] = []
-    var specsIterator: IndexingIterator<[DataSpec]>
-    
-    init() {
-        specsIterator = IndexingIterator(_elements: [])
-    }
-    
-    func append(_ name: String) -> DataSpecBuilder {
-        return append(DataSpec(name, false, false, nil))
-    }
-    
-    func appendObj(_ name: String, _ dataSpecBuilder: DataSpecBuilder) -> DataSpecBuilder {
-        return append(DataSpec(name, true, false, dataSpecBuilder))
-    }
-    
-    func appendArray(_ name: String) -> DataSpecBuilder {
-        return append(DataSpec(name, false, true, nil))
-    }
-    
-    func appendArray(_ name: String, _ dataSpecBuilder: DataSpecBuilder) -> DataSpecBuilder {
-        return append(DataSpec(name, false, true, dataSpecBuilder))
-    }
-    
-    func append(_ spec: DataSpec) -> DataSpecBuilder {
-        specs.append(spec)
-        return self
-    }
-    
-    func build() -> DataSpecBuilder {
-        specsIterator = specs.makeIterator()
-        return self
-    }
-    
-    func next() -> DataSpec {
-        return specsIterator.next()!
-    }
-    
-    public func copy(with zone: NSZone? = nil) -> Any {
-        let b = DataSpecBuilder()
-        b.specs = specs
-        return b.build()
-    }
-}

lib/MessagePack/Sources/MessagePack/Decoder/KeyedDecodingContainer.swift

@@ -1,178 +0,0 @@
-import Foundation
-
-extension _MessagePackDecoder {
-    final class KeyedContainer<Key> where Key: CodingKey {
-        lazy var nestedContainers: [String: MessagePackDecodingContainer] = {
-            guard let count = self.count else {
-                return [:]
-            }
-
-            var nestedContainers: [String: MessagePackDecodingContainer] = [:]
-
-            let unkeyedContainer = UnkeyedContainer(data: self.data.suffix(from: self.index), codingPath: self.codingPath, userInfo: self.userInfo)
-            if currentSpec != nil && currentSpec!.isObj {
-                unkeyedContainer.count = count
-            } else {
-                unkeyedContainer.count = count * 2
-            }
-
-            do {
-                var iterator = unkeyedContainer.nestedContainers.makeIterator()
-
-                for _ in 0..<count {
-                    var key: String = ""
-                    if currentSpec == nil || !currentSpec!.isObj {
-                        guard let keyContainer = iterator.next() as? _MessagePackDecoder.SingleValueContainer else {
-                            fatalError() // FIXME
-                        }
-
-                        key = try keyContainer.decode(String.self)
-                    }
-
-                    guard let container = iterator.next() else {
-                        fatalError() // FIXME
-                    }
-
-
-                    if currentSpec != nil && currentSpec!.isObj {
-                        key = container.currentSpec!.name
-                    }
-
-                    container.codingPath += [AnyCodingKey(stringValue: key)!]
-                    nestedContainers[key] = container
-                }
-            } catch {
-                fatalError("\(error)") // FIXME
-            }
-
-            self.index = unkeyedContainer.index
-
-            return nestedContainers
-        }()
-        
-        lazy var count: Int? = {
-            do {
-                let format = try self.readByte()
-                
-                if currentSpec != nil && currentSpec!.isObj && 0x90...0x9f ~= format {
-                    return Int(format & 0x0F)
-                }
-                
-                switch format {
-                case 0x80...0x8f:
-                    return Int(format & 0x0F)
-                case 0xde:
-                    return Int(try read(UInt16.self))
-                case 0xdf:
-                    return Int(try read(UInt32.self))
-                default:
-                    return nil
-                }
-            } catch {
-                return nil
-            }
-        }()
-
-        var data: Data
-        var index: Data.Index
-        var codingPath: [CodingKey]
-        var userInfo: [CodingUserInfoKey: Any]
-        var currentSpec: DataSpec?
-        
-        func nestedCodingPath(forKey key: CodingKey) -> [CodingKey] {
-            return self.codingPath + [key]
-        }
-        
-        init(data: Data, codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-            self.data = data
-            self.index = self.data.startIndex
-        }
-        
-        func checkCanDecodeValue(forKey key: Key) throws {
-            guard self.contains(key) else {
-                let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "key not found: \(key)")
-                throw DecodingError.keyNotFound(key, context)
-            }
-        }
-    }
-}
-
-extension _MessagePackDecoder.KeyedContainer: KeyedDecodingContainerProtocol {
-    var allKeys: [Key] {
-        return self.nestedContainers.keys.map{ Key(stringValue: $0)! }
-    }
-    
-    func contains(_ key: Key) -> Bool {
-        return self.nestedContainers.keys.contains(key.stringValue)
-    }
-    
-    func decodeNil(forKey key: Key) throws -> Bool {
-        try checkCanDecodeValue(forKey: key)
-
-        let nestedContainer = self.nestedContainers[key.stringValue]
-
-        switch nestedContainer {
-        case let singleValueContainer as _MessagePackDecoder.SingleValueContainer:
-            return singleValueContainer.decodeNil()
-        case is _MessagePackDecoder.UnkeyedContainer,
-             is _MessagePackDecoder.KeyedContainer<AnyCodingKey>:
-            return false
-        default:
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "cannot decode nil for key: \(key)")
-            throw DecodingError.typeMismatch(Any?.self, context)
-        }
-    }
-    
-    func decode<T>(_ type: T.Type, forKey key: Key) throws -> T where T : Decodable {
-        try checkCanDecodeValue(forKey: key)
-        
-        let container = self.nestedContainers[key.stringValue]!
-        let decoder = MessagePackDecoder()
-        
-        if userInfo.keys.contains(MessagePackDecoder.dataSpecKey) {
-            decoder.userInfo[MessagePackDecoder.dataSpecKey] = container.currentSpec!.dataSpecBuilder?.copy() as? DataSpecBuilder
-            if container.currentSpec!.isArray {
-                decoder.userInfo[MessagePackDecoder.isArrayDataSpecKey] = true
-            }
-        }
-        
-        let value = try decoder.decode(T.self, from: container.data)
-        
-        return value
-    }
-    
-    func nestedUnkeyedContainer(forKey key: Key) throws -> UnkeyedDecodingContainer {
-        try checkCanDecodeValue(forKey: key)
-        
-        guard let unkeyedContainer = self.nestedContainers[key.stringValue] as? _MessagePackDecoder.UnkeyedContainer else {
-            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "cannot decode nested container for key: \(key)")
-        }
-        
-        return unkeyedContainer
-    }
-    
-    func nestedContainer<NestedKey>(keyedBy type: NestedKey.Type, forKey key: Key) throws -> KeyedDecodingContainer<NestedKey> where NestedKey : CodingKey {
-        try checkCanDecodeValue(forKey: key)
-        
-        guard let keyedContainer = self.nestedContainers[key.stringValue] as? _MessagePackDecoder.KeyedContainer<NestedKey> else {
-            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "cannot decode nested container for key: \(key)")
-        }
-        
-        return KeyedDecodingContainer(keyedContainer)
-    }
-    
-    func superDecoder() throws -> Decoder {
-        return _MessagePackDecoder(data: self.data)
-    }
-    
-    func superDecoder(forKey key: Key) throws -> Decoder {
-        let decoder = _MessagePackDecoder(data: self.data)
-        decoder.codingPath = [key]
-        
-        return decoder
-    }
-}
-
-extension _MessagePackDecoder.KeyedContainer: MessagePackDecodingContainer {}

lib/MessagePack/Sources/MessagePack/Decoder/MessagePackDecoder.swift

@@ -1,168 +0,0 @@
-import Foundation
-
-/**
- An object that decodes instances of a data type from MessagePack objects.
- */
-final public class MessagePackDecoder {
-    public init() {}
-    
-    /**
-     A dictionary you use to customize the decoding process
-     by providing contextual information.
-     */
-    public var userInfo: [CodingUserInfoKey : Any] = [:]
-    
-    /**
-     Returns a value of the type you specify,
-     decoded from a MessagePack object.
-     
-     - Parameters:
-        - type: The type of the value to decode
-                from the supplied MessagePack object.
-        - data: The MessagePack object to decode.
-     - Throws: `DecodingError.dataCorrupted(_:)`
-               if the data is not valid MessagePack.
-     */
-    public func decode<T>(_ type: T.Type, from data: Data) throws -> T where T : Decodable {
-        let decoder = _MessagePackDecoder(data: data)
-        decoder.userInfo = self.userInfo
-        decoder.userInfo[MessagePackDecoder.nonMatchingFloatDecodingStrategyKey] = nonMatchingFloatDecodingStrategy
-        
-        switch type {
-        case is Data.Type:
-            let box = try Box<Data>(from: decoder)
-            return box.value as! T
-        case is Date.Type:
-            let box = try Box<Date>(from: decoder)
-            return box.value as! T
-        default:
-            return try T(from: decoder)
-        }
-    }
-
-    /**
-     The strategy used by a decoder when it encounters format mismatches for floating point values.
-     */
-    public var nonMatchingFloatDecodingStrategy: NonMatchingFloatDecodingStrategy = .strict
-
-    /**
-     The strategies for decoding floating point values when their format doesn't match.
-     */
-    public enum NonMatchingFloatDecodingStrategy {
-
-        /// Throws a DecodingError.typeMismatch
-        case strict
-
-        /// Performs a cast
-        case cast
-    }
-
-    internal static var nonMatchingFloatDecodingStrategyKey: CodingUserInfoKey {
-        return CodingUserInfoKey(rawValue: "nonMatchingFloatDecodingStrategyKey")!
-    }
-    
-    static var dataSpecKey : CodingUserInfoKey {
-        return CodingUserInfoKey(rawValue: "dataSpecKey")!
-    }
-    
-    static var isArrayDataSpecKey : CodingUserInfoKey {
-        return CodingUserInfoKey(rawValue: "isArrayDataSpecKey")!
-    }
-}
-
-// MARK: - TopLevelDecoder
-
-#if canImport(Combine)
-import Combine
-
-extension MessagePackDecoder: TopLevelDecoder {
-    public typealias Input = Data
-}
-#endif
-
-// MARK: -
-
-final class _MessagePackDecoder {
-    var codingPath: [CodingKey] = []
-    
-    var userInfo: [CodingUserInfoKey : Any] = [:]
-    
-    var container: MessagePackDecodingContainer?
-    fileprivate var data: Data
-    
-    init(data: Data) {
-        self.data = data
-    }
-}
-
-extension _MessagePackDecoder: Decoder {
-    fileprivate func assertCanCreateContainer() {
-        precondition(self.container == nil)
-    }
-        
-    func container<Key>(keyedBy type: Key.Type) -> KeyedDecodingContainer<Key> where Key : CodingKey {
-        assertCanCreateContainer()
-
-        let container = KeyedContainer<Key>(data: self.data, codingPath: self.codingPath, userInfo: self.userInfo)
-        
-        if userInfo.keys.contains(MessagePackDecoder.dataSpecKey) {
-            container.currentSpec = DataSpec("", true, false, nil)
-        }
-        
-        self.container = container
-        
-        return KeyedDecodingContainer(container)
-    }
-
-    func unkeyedContainer() -> UnkeyedDecodingContainer {
-        assertCanCreateContainer()
-        
-        let container = UnkeyedContainer(data: self.data, codingPath: self.codingPath, userInfo: self.userInfo)
-        self.container = container
-
-        return container
-    }
-    
-    func singleValueContainer() -> SingleValueDecodingContainer {
-        assertCanCreateContainer()
-        
-        let container = SingleValueContainer(data: self.data, codingPath: self.codingPath, userInfo: self.userInfo)
-        self.container = container
-        
-        return container
-    }
-}
-
-protocol MessagePackDecodingContainer: class {
-    var codingPath: [CodingKey] { get set }
-    
-    var userInfo: [CodingUserInfoKey : Any] { get }
-    
-    var data: Data { get set }
-    var index: Data.Index { get set }
-    
-    var currentSpec: DataSpec? { get set }
-}
-
-extension MessagePackDecodingContainer {
-    func readByte() throws -> UInt8 {
-        return try read(1).first!
-    }
-    
-    func read(_ length: Int) throws -> Data {
-        let nextIndex = self.index.advanced(by: length)
-        guard nextIndex <= self.data.endIndex else {
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Unexpected end of data")
-            throw DecodingError.dataCorrupted(context)
-        }
-        defer { self.index = nextIndex }
-        
-        return self.data.subdata(in: self.index..<nextIndex)
-    }
-    
-    func read<T>(_ type: T.Type) throws -> T where T : FixedWidthInteger {
-        let stride = MemoryLayout<T>.stride
-        let bytes = [UInt8](try read(stride))
-        return T(bytes: bytes)
-    }
-}

lib/MessagePack/Sources/MessagePack/Decoder/SingleValueDecodingContainer.swift

@@ -1,226 +0,0 @@
-import Foundation
-
-#if os(Linux)
-let NSEC_PER_SEC: UInt64 = 1000000000
-#endif
-
-extension _MessagePackDecoder {
-    final class SingleValueContainer {
-        var codingPath: [CodingKey]
-        var userInfo: [CodingUserInfoKey: Any]
-        var data: Data
-        var index: Data.Index
-        var currentSpec: DataSpec?
-
-        init(data: Data, codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-            self.data = data
-            self.index = self.data.startIndex
-        }
-        
-        func checkCanDecode<T>(_ type: T.Type, format: UInt8) throws {
-            guard self.index <= self.data.endIndex else {
-                throw DecodingError.dataCorruptedError(in: self, debugDescription: "Unexpected end of data")
-            }
-            
-            guard self.data[self.index] == format else {
-                let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-                throw DecodingError.typeMismatch(type, context)
-            }
-        }
-
-        var nonMatchingFloatDecodingStrategy: MessagePackDecoder.NonMatchingFloatDecodingStrategy {
-            return userInfo[MessagePackDecoder.nonMatchingFloatDecodingStrategyKey] as? MessagePackDecoder.NonMatchingFloatDecodingStrategy ?? .strict
-        }
-    }
-}
-
-extension _MessagePackDecoder.SingleValueContainer: SingleValueDecodingContainer {    
-    func decodeNil() -> Bool {
-        let format = try? readByte()
-        return format == 0xc0
-    }
-    
-    func decode(_ type: Bool.Type) throws -> Bool {
-        let format = try readByte()
-        switch format {
-        case 0xc2: return false
-        case 0xc3: return true
-        default:
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-            throw DecodingError.typeMismatch(Bool.self, context)
-        }
-    }
-    
-    func decode(_ type: String.Type) throws -> String {
-        let length: Int
-        let format = try readByte()
-        switch format {
-        case 0xa0...0xbf:
-            length = Int(format - 0xa0)
-        case 0xd9:
-            length = Int(try read(UInt8.self))
-        case 0xda:
-            length = Int(try read(UInt16.self))
-        case 0xdb:
-            length = Int(try read(UInt32.self))
-        default:
-            throw DecodingError.dataCorruptedError(in: self, debugDescription: "Invalid format for String length: \(format)")
-        }
-        
-        let data = try read(length)
-        guard let string = String(data: data, encoding: .utf8) else {
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Couldn't decode string with UTF-8 encoding")
-            throw DecodingError.dataCorrupted(context)
-        }
-        
-        return string
-    }
-    
-    func decode(_ type: Double.Type) throws -> Double {
-        let format = try readByte()
-        switch format {
-        case 0xca:
-            switch nonMatchingFloatDecodingStrategy {
-            case .strict:
-                break
-            case .cast:
-                let bitPattern = try read(UInt32.self)
-                return Double(Float(bitPattern: bitPattern))
-            }
-        case 0xcb:
-            let bitPattern = try read(UInt64.self)
-            return Double(bitPattern: bitPattern)
-        default:
-            break
-        }
-        let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-        throw DecodingError.typeMismatch(Double.self, context)
-    }
-    
-    func decode(_ type: Float.Type) throws -> Float {
-        let format = try readByte()
-        switch format {
-        case 0xca:
-            let bitPattern = try read(UInt32.self)
-            return Float(bitPattern: bitPattern)
-        case 0xcb:
-            switch nonMatchingFloatDecodingStrategy {
-            case .strict:
-                break
-            case .cast:
-                let bitPattern = try read(UInt64.self)
-                return Float(Double(bitPattern: bitPattern))
-            }
-        default:
-            break
-        }
-        let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-        throw DecodingError.typeMismatch(Float.self, context)
-    }
-    
-    func decode<T>(_ type: T.Type) throws -> T where T : BinaryInteger & Decodable {
-        let format = try readByte()
-        var t: T?
-        
-        switch format {
-        case 0x00...0x7f:
-            t = T(format)
-        case 0xcc:
-            t = T(exactly: try read(UInt8.self))
-        case 0xcd:
-            t = T(exactly: try read(UInt16.self))
-        case 0xce:
-            t = T(exactly: try read(UInt32.self))
-        case 0xcf:
-            t = T(exactly: try read(UInt64.self))
-        case 0xd0:
-            t = T(exactly: try read(Int8.self))
-        case 0xd1:
-            t = T(exactly: try read(Int16.self))
-        case 0xd2:
-            t = T(exactly: try read(Int32.self))
-        case 0xd3:
-            t = T(exactly: try read(Int64.self))
-        case 0xe0...0xff:
-            t = T(exactly: Int8(bitPattern: format))
-        default:
-            t = nil
-        }
-        
-        guard let value = t else {
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-            throw DecodingError.typeMismatch(T.self, context)
-        }
-        
-        return value
-    }
-    
-    func decode(_ type: Date.Type) throws -> Date {
-        let format = try readByte()
-        
-        var seconds: TimeInterval
-        var nanoseconds: TimeInterval
-        
-        switch format {
-        case 0xd6:
-            _ = try read(Int8.self) // -1
-            nanoseconds = 0
-            seconds = TimeInterval(try read(UInt32.self))
-        case 0xd7:
-            _ = try read(Int8.self) // -1
-            let bitPattern = try read(UInt64.self)
-            nanoseconds = TimeInterval(UInt32(bitPattern >> 34))
-            seconds = TimeInterval(UInt32(bitPattern & 0x03_FF_FF_FF_FF))
-        case 0xc7:
-            _ = try read(Int8.self) // 12
-            _ = try read(Int8.self) // -1
-            nanoseconds = TimeInterval(try read(UInt32.self))
-            seconds = TimeInterval(try read(Int64.self))
-        default:
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "Invalid format: \(format)")
-            throw DecodingError.typeMismatch(Date.self, context)
-        }
-        
-        let timeInterval = TimeInterval(seconds) + nanoseconds / Double(NSEC_PER_SEC)
-        
-        return Date(timeIntervalSince1970: timeInterval)
-    }
-    
-    func decode(_ type: Data.Type) throws -> Data {
-        let length: Int
-        let format = try readByte()
-        switch format {
-        case 0xc4:
-            length = Int(try read(UInt8.self))
-        case 0xc5:
-            length = Int(try read(UInt16.self))
-        case 0xc6:
-            length = Int(try read(UInt32.self))
-        default:
-            throw DecodingError.dataCorruptedError(in: self, debugDescription: "Invalid format for Data length: \(format)")
-        }
-        
-        return self.data.subdata(in: self.index..<self.index.advanced(by: length))
-    }
-    
-    func decode<T>(_ type: T.Type) throws -> T where T : Decodable {
-        switch type {
-        case is Data.Type:
-            return try decode(Data.self) as! T
-        case is Date.Type:
-            return try decode(Date.self) as! T
-        default:
-            let decoder = _MessagePackDecoder(data: self.data)
-            let value = try T(from: decoder)
-            if let nextIndex = decoder.container?.index {
-                self.index = nextIndex
-            }
-            
-            return value
-        }
-    }
-}
-
-extension _MessagePackDecoder.SingleValueContainer: MessagePackDecodingContainer {}

lib/MessagePack/Sources/MessagePack/Decoder/UnkeyedDecodingContainer.swift

@@ -1,235 +0,0 @@
-import Foundation
-
-extension _MessagePackDecoder {
-    final class UnkeyedContainer {
-        var codingPath: [CodingKey]
-        
-        var nestedCodingPath: [CodingKey] {
-            return self.codingPath + [AnyCodingKey(intValue: self.count ?? 0)!]
-        }
-        
-        var userInfo: [CodingUserInfoKey: Any]
-        
-        var data: Data
-        var index: Data.Index
-        var currentSpec: DataSpec?
-        
-        lazy var count: Int? = {
-            do {
-                let format = try self.readByte()
-                switch format {
-                case 0x90...0x9f:
-                    return Int(format & 0x0F)
-                case 0xdc:
-                    return Int(try read(UInt16.self))
-                case 0xdd:
-                    return Int(try read(UInt32.self))
-                default:
-                    return nil
-                }
-            } catch {
-                return nil
-            }
-        }()
-        
-        var currentIndex: Int = 0
-        
-        lazy var nestedContainers: [MessagePackDecodingContainer] = {
-            guard let count = self.count else {
-                return []
-            }
-            
-            var nestedContainers: [MessagePackDecodingContainer] = []
-            
-            do {
-                for _ in 0..<count {
-                    let container = try self.decodeContainer()
-                    nestedContainers.append(container)
-                }
-            } catch {
-                fatalError("\(error)") // FIXME
-            }
-            
-            self.currentIndex = 0
-            
-            return nestedContainers
-        }()
-        
-        init(data: Data, codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-            self.data = data
-            self.index = self.data.startIndex
-        }
-        
-        var isAtEnd: Bool {
-            guard let count = self.count else {
-                return true
-            }
-            
-            return currentIndex >= count
-        }
-        
-        func checkCanDecodeValue() throws {
-            guard !self.isAtEnd else {
-                throw DecodingError.dataCorruptedError(in: self, debugDescription: "Unexpected end of data")
-            }
-        }
-    }
-}
-
-extension _MessagePackDecoder.UnkeyedContainer: UnkeyedDecodingContainer {
-    func decodeNil() throws -> Bool {
-        try checkCanDecodeValue()
-        defer { self.currentIndex += 1 }
-
-        let nestedContainer = self.nestedContainers[self.currentIndex]
-
-        switch nestedContainer {
-        case let singleValueContainer as _MessagePackDecoder.SingleValueContainer:
-            return singleValueContainer.decodeNil()
-        case is _MessagePackDecoder.UnkeyedContainer,
-             is _MessagePackDecoder.KeyedContainer<AnyCodingKey>:
-            return false
-        default:
-            let context = DecodingError.Context(codingPath: self.codingPath, debugDescription: "cannot decode nil for index: \(self.currentIndex)")
-                       throw DecodingError.typeMismatch(Any?.self, context)
-        }
-    }
-    
-    func decode<T>(_ type: T.Type) throws -> T where T : Decodable {
-        try checkCanDecodeValue()
-        defer { self.currentIndex += 1 }
-        
-        if userInfo.keys.contains(MessagePackDecoder.isArrayDataSpecKey) {
-            currentSpec = DataSpec("", false, true, (userInfo[MessagePackDecoder.dataSpecKey] as? DataSpecBuilder)?.copy() as? DataSpecBuilder)
-        }
-        
-        let container = self.nestedContainers[self.currentIndex]
-        let decoder = MessagePackDecoder()
-        
-        if userInfo.keys.contains(MessagePackDecoder.dataSpecKey) {
-            decoder.userInfo[MessagePackDecoder.dataSpecKey] = (userInfo[MessagePackDecoder.dataSpecKey] as? DataSpecBuilder)?.copy() as? DataSpecBuilder
-        }
-        
-        let value = try decoder.decode(T.self, from: container.data)
-
-        return value
-    }
-    
-    func nestedUnkeyedContainer() throws -> UnkeyedDecodingContainer {
-        try checkCanDecodeValue()
-        defer { self.currentIndex += 1 }
-
-        let container = self.nestedContainers[self.currentIndex] as! _MessagePackDecoder.UnkeyedContainer
-        
-        return container
-    }
-    
-    func nestedContainer<NestedKey>(keyedBy type: NestedKey.Type) throws -> KeyedDecodingContainer<NestedKey> where NestedKey : CodingKey {
-        try checkCanDecodeValue()
-        defer { self.currentIndex += 1 }
-
-        let container = self.nestedContainers[self.currentIndex] as! _MessagePackDecoder.KeyedContainer<NestedKey>
-        
-        return KeyedDecodingContainer(container)
-    }
-
-    func superDecoder() throws -> Decoder {
-        return _MessagePackDecoder(data: self.data)
-    }
-}
-
-extension _MessagePackDecoder.UnkeyedContainer {
-    func decodeContainer() throws -> MessagePackDecodingContainer {
-        try checkCanDecodeValue()
-        defer { self.currentIndex += 1 }
-        
-        let startIndex = self.index
-        
-        var currDataSpec: DataSpec? = nil
-        if currentSpec != nil && currentSpec!.isArray && currentSpec!.dataSpecBuilder != nil {
-            currDataSpec = DataSpec("", true, false, currentSpec!.dataSpecBuilder!.copy() as? DataSpecBuilder)
-        } else {
-            let dataSpec = self.userInfo[MessagePackDecoder.dataSpecKey] as? DataSpecBuilder
-            if let currDS = dataSpec?.next() {
-                currDataSpec = DataSpec(currDS.name, currDS.isObj, currDS.isArray, currDS.dataSpecBuilder?.copy() as? DataSpecBuilder)
-            }
-        }
-        
-        let length: Int
-        let format = try self.readByte()
-        switch format {
-        case 0x00...0x7f,
-             0xc0, 0xc2, 0xc3,
-             0xe0...0xff:
-            length = 0
-        case 0xcc, 0xd0, 0xd4:
-            length = 1
-        case 0xcd, 0xd1, 0xd5:
-            length = 2
-        case 0xca, 0xce, 0xd2:
-            length = 4
-        case 0xcb, 0xcf, 0xd3:
-            length = 8
-        case 0xd6:
-            length = 5
-        case 0xd7:
-            length = 9
-        case 0xd8:
-            length = 16
-        case 0xa0...0xbf:
-            length = Int(format - 0xa0)
-        case 0xc4, 0xc7, 0xd9:
-            length = Int(try read(UInt8.self))
-        case 0xc5, 0xc8, 0xda:
-            length = Int(try read(UInt16.self))
-        case 0xc6, 0xc9, 0xdb:
-            length = Int(try read(UInt32.self))
-        case 0x80...0x8f, 0xde, 0xdf:
-            let container = _MessagePackDecoder.KeyedContainer<AnyCodingKey>(data: self.data.suffix(from: startIndex), codingPath: self.nestedCodingPath, userInfo: self.userInfo)
-            container.currentSpec = currDataSpec
-            _ = container.nestedContainers // FIXME
-            self.index = container.index
-            
-            return container
-        case 0x90...0x9f, 0xdc, 0xdd:
-            if currDataSpec != nil && currDataSpec!.isObj {
-                var objUserInfo = self.userInfo
-                objUserInfo[MessagePackDecoder.dataSpecKey] = currDataSpec!.dataSpecBuilder!
-                
-                let container = _MessagePackDecoder.KeyedContainer<AnyCodingKey>(data: self.data.suffix(from: startIndex), codingPath: self.nestedCodingPath, userInfo: objUserInfo)
-                container.currentSpec = currDataSpec
-                _ = container.nestedContainers // FIXME
-                self.index = container.index
-                
-                return container
-            }
-            
-            var arrUserInfo = self.userInfo
-            if currDataSpec != nil && currDataSpec!.isArray {
-                arrUserInfo[MessagePackDecoder.dataSpecKey] = currDataSpec!.dataSpecBuilder!
-            }
-
-            let container = _MessagePackDecoder.UnkeyedContainer(data: self.data.suffix(from: startIndex), codingPath: self.nestedCodingPath, userInfo: arrUserInfo)
-            container.currentSpec = currDataSpec
-            _ = container.nestedContainers // FIXME
-
-            self.index = container.index
-            
-            return container
-        default:
-            throw DecodingError.dataCorruptedError(in: self, debugDescription: "Invalid format: \(format)")
-        }
-        
-        let range: Range<Data.Index> = startIndex..<self.index.advanced(by: length)
-        self.index = range.upperBound
-        
-        let container = _MessagePackDecoder.SingleValueContainer(data: self.data.subdata(in: range), codingPath: self.codingPath, userInfo: self.userInfo)
-        container.currentSpec = currDataSpec
-        
-        return container
-    }
-}
-
-extension _MessagePackDecoder.UnkeyedContainer: MessagePackDecodingContainer {}

lib/MessagePack/Sources/MessagePack/Encoder/KeyedEncodingContainer.swift

@@ -1,90 +0,0 @@
-import Foundation
-
-extension _MessagePackEncoder {
-    final class KeyedContainer<Key> where Key: CodingKey {
-        private var storage: [AnyCodingKey: _MessagePackEncodingContainer] = [:]
-        
-        var codingPath: [CodingKey]
-        var userInfo: [CodingUserInfoKey: Any]
-        
-        func nestedCodingPath(forKey key: CodingKey) -> [CodingKey] {
-            return self.codingPath + [key]
-        }
-        
-        init(codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-        }
-    }
-}
-
-extension _MessagePackEncoder.KeyedContainer: KeyedEncodingContainerProtocol {
-    func encodeNil(forKey key: Key) throws {
-        var container = self.nestedSingleValueContainer(forKey: key)
-        try container.encodeNil()
-    }
-    
-    func encode<T>(_ value: T, forKey key: Key) throws where T : Encodable {
-        var container = self.nestedSingleValueContainer(forKey: key)
-        try container.encode(value)
-    }
-    
-    private func nestedSingleValueContainer(forKey key: Key) -> SingleValueEncodingContainer {
-        let container = _MessagePackEncoder.SingleValueContainer(codingPath: self.nestedCodingPath(forKey: key), userInfo: self.userInfo)
-        self.storage[AnyCodingKey(key)] = container
-        return container
-    }
-    
-    func nestedUnkeyedContainer(forKey key: Key) -> UnkeyedEncodingContainer {
-        let container = _MessagePackEncoder.UnkeyedContainer(codingPath: self.nestedCodingPath(forKey: key), userInfo: self.userInfo)
-        self.storage[AnyCodingKey(key)] = container
-
-        return container
-    }
-    
-    func nestedContainer<NestedKey>(keyedBy keyType: NestedKey.Type, forKey key: Key) -> KeyedEncodingContainer<NestedKey> where NestedKey : CodingKey {
-        let container = _MessagePackEncoder.KeyedContainer<NestedKey>(codingPath: self.nestedCodingPath(forKey: key), userInfo: self.userInfo)
-        self.storage[AnyCodingKey(key)] = container
-
-        return KeyedEncodingContainer(container)
-    }
-    
-    func superEncoder() -> Encoder {
-        fatalError("Unimplemented") // FIXME
-    }
-    
-    func superEncoder(forKey key: Key) -> Encoder {
-        fatalError("Unimplemented") // FIXME
-    }
-}
-
-extension _MessagePackEncoder.KeyedContainer: _MessagePackEncodingContainer {
-    var data: Data {
-        var data = Data()
-        
-        let length = storage.count
-        if let uint16 = UInt16(exactly: length) {
-            if length <= 15 {
-                data.append(0x80 + UInt8(length))
-            } else {
-                data.append(0xde)
-                data.append(contentsOf: uint16.bytes)
-            }
-        } else if let uint32 = UInt32(exactly: length) {
-            data.append(0xdf)
-            data.append(contentsOf: uint32.bytes)
-        } else {
-            fatalError()
-        }
-        
-        for (key, container) in self.storage {
-            let keyContainer = _MessagePackEncoder.SingleValueContainer(codingPath: self.codingPath, userInfo: self.userInfo)
-            try! keyContainer.encode(key.stringValue)
-            data.append(keyContainer.data)
-            
-            data.append(container.data)
-        }
-        
-        return data
-    }
-}

lib/MessagePack/Sources/MessagePack/Encoder/MessagePackEncoder.swift

@@ -1,99 +0,0 @@
-import Foundation
-
-/**
- An object that encodes instances of a data type as MessagePack objects.
- */
-final public class MessagePackEncoder {
-    public init() {}
-    
-    /**
-     A dictionary you use to customize the encoding process
-     by providing contextual information.
-     */
-    public var userInfo: [CodingUserInfoKey : Any] = [:]
-
-    /**
-     Returns a MessagePack-encoded representation of the value you supply.
-     
-     - Parameters:
-        - value: The value to encode as MessagePack.
-     - Throws: `EncodingError.invalidValue(_:_:)`
-                if the value can't be encoded as a MessagePack object.
-     */
-    public func encode<T>(_ value: T) throws -> Data where T : Encodable {
-        let encoder = _MessagePackEncoder()
-        encoder.userInfo = self.userInfo
-        
-        switch value {
-        case let data as Data:
-            try Box<Data>(data).encode(to: encoder)
-        case let date as Date:
-            try Box<Date>(date).encode(to: encoder)
-        default:
-            try value.encode(to: encoder)
-        }
-        
-        return encoder.data
-    }
-}
-
-// MARK: - TopLevelEncoder
-
-#if canImport(Combine)
-import Combine
-
-extension MessagePackEncoder: TopLevelEncoder {
-    public typealias Input = Data
-}
-#endif
-
-// MARK: -
-
-protocol _MessagePackEncodingContainer {
-    var data: Data { get }
-}
-
-class _MessagePackEncoder {
-    var codingPath: [CodingKey] = []
-    
-    var userInfo: [CodingUserInfoKey : Any] = [:]
-    
-    fileprivate var container: _MessagePackEncodingContainer?
-    
-    var data: Data {
-        return container?.data ?? Data()
-    }
-}
-
-extension _MessagePackEncoder: Encoder {
-    fileprivate func assertCanCreateContainer() {
-        precondition(self.container == nil)
-    }
-    
-    func container<Key>(keyedBy type: Key.Type) -> KeyedEncodingContainer<Key> where Key : CodingKey {
-        assertCanCreateContainer()
-        
-        let container = KeyedContainer<Key>(codingPath: self.codingPath, userInfo: self.userInfo)
-        self.container = container
-        
-        return KeyedEncodingContainer(container)
-    }
-    
-    func unkeyedContainer() -> UnkeyedEncodingContainer {
-        assertCanCreateContainer()
-        
-        let container = UnkeyedContainer(codingPath: self.codingPath, userInfo: self.userInfo)
-        self.container = container
-        
-        return container
-    }
-    
-    func singleValueContainer() -> SingleValueEncodingContainer {
-        assertCanCreateContainer()
-        
-        let container = SingleValueContainer(codingPath: self.codingPath, userInfo: self.userInfo)
-        self.container = container
-        
-        return container
-    }
-}

lib/MessagePack/Sources/MessagePack/Encoder/SingleValueEncodingContainer.swift

@@ -1,264 +0,0 @@
-import Foundation
-
-extension _MessagePackEncoder {
-    final class SingleValueContainer {
-        private var storage: Data = Data()
-        
-        fileprivate var canEncodeNewValue = true
-        fileprivate func checkCanEncode(value: Any?) throws {
-            guard self.canEncodeNewValue else {
-                let context = EncodingError.Context(codingPath: self.codingPath, debugDescription: "Attempt to encode value through single value container when previously value already encoded.")
-                throw EncodingError.invalidValue(value as Any, context)
-            }
-        }
-        
-        var codingPath: [CodingKey]
-        var userInfo: [CodingUserInfoKey: Any]
-        
-        init(codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-        }
-    }
-}
-
-extension _MessagePackEncoder.SingleValueContainer: SingleValueEncodingContainer {
-    func encodeNil() throws {
-        try checkCanEncode(value: nil)
-        defer { self.canEncodeNewValue = false }
-        
-        self.storage.append(0xc0)
-    }
-    
-    func encode(_ value: Bool) throws {
-        try checkCanEncode(value: nil)
-        defer { self.canEncodeNewValue = false }
-
-        switch value {
-        case false:
-            self.storage.append(0xc2)
-        case true:
-            self.storage.append(0xc3)
-        }
-    }
-    
-    func encode(_ value: String) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        guard let data = value.data(using: .utf8) else {
-            let context = EncodingError.Context(codingPath: self.codingPath, debugDescription: "Cannot encode string using UTF-8 encoding.")
-            throw EncodingError.invalidValue(value, context)
-        }
-        
-        let length = data.count
-        if let uint8 = UInt8(exactly: length) {
-            if (uint8 <= 31) {
-                self.storage.append(0xa0 + uint8)
-            } else {
-                self.storage.append(0xd9)
-                self.storage.append(contentsOf: uint8.bytes)
-            }
-        } else if let uint16 = UInt16(exactly: length) {
-            self.storage.append(0xda)
-            self.storage.append(contentsOf: uint16.bytes)
-        } else if let uint32 = UInt32(exactly: length) {
-            self.storage.append(0xdb)
-            self.storage.append(contentsOf: uint32.bytes)
-        } else {
-            let context = EncodingError.Context(codingPath: self.codingPath, debugDescription: "Cannot encode string with length \(length).")
-            throw EncodingError.invalidValue(value, context)
-        }
-        
-        self.storage.append(data)
-    }
-    
-    func encode(_ value: Double) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xcb)
-        self.storage.append(contentsOf: value.bitPattern.bytes)
-    }
-    
-    func encode(_ value: Float) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xca)
-        self.storage.append(contentsOf: value.bitPattern.bytes)
-    }
-    
-    func encode<T>(_ value: T) throws where T : BinaryInteger & Encodable {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        if value < 0 {
-            if let int8 = Int8(exactly: value) {
-                return try encode(int8)
-            } else if let int16 = Int16(exactly: value) {
-                return try encode(int16)
-            } else if let int32 = Int32(exactly: value) {
-                return try encode(int32)
-            } else if let int64 = Int64(exactly: value) {
-                return try encode(int64)
-            }
-        } else {
-            if let uint8 = UInt8(exactly: value) {
-                return try encode(uint8)
-            } else if let uint16 = UInt16(exactly: value) {
-                return try encode(uint16)
-            } else if let uint32 = UInt32(exactly: value) {
-                return try encode(uint32)
-            } else if let uint64 = UInt64(exactly: value) {
-                return try encode(uint64)
-            }
-        }
-        
-        let context = EncodingError.Context(codingPath: self.codingPath, debugDescription: "Cannot encode integer \(value).")
-        throw EncodingError.invalidValue(value, context)
-    }
-    
-    func encode(_ value: Int8) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        if (value >= 0 && value <= 127) {
-            self.storage.append(UInt8(value))
-        } else if (value < 0 && value >= -31) {
-            self.storage.append(0xe0 + (0x1f & UInt8(truncatingIfNeeded: value)))
-        } else {
-            self.storage.append(0xd0)
-            self.storage.append(contentsOf: value.bytes)
-        }
-    }
-    
-    func encode(_ value: Int16) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xd1)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: Int32) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xd2)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: Int64) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xd3)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: UInt8) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        if (value <= 127) {
-            self.storage.append(value)
-        } else {
-            self.storage.append(0xcc)
-            self.storage.append(contentsOf: value.bytes)
-        }
-    }
-    
-    func encode(_ value: UInt16) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xcd)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: UInt32) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xce)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: UInt64) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-
-        self.storage.append(0xcf)
-        self.storage.append(contentsOf: value.bytes)
-    }
-    
-    func encode(_ value: Date) throws {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        let timeInterval = value.timeIntervalSince1970
-        let (integral, fractional) = modf(timeInterval)
-        
-        let seconds = Int64(integral)
-        let nanoseconds = UInt32(fractional * Double(NSEC_PER_SEC))
-        
-        if seconds < 0 || seconds > UInt32.max {
-            self.storage.append(0xc7)
-            self.storage.append(0x0C)
-            self.storage.append(0xFF)
-            self.storage.append(contentsOf: nanoseconds.bytes)
-            self.storage.append(contentsOf: seconds.bytes)
-        } else if nanoseconds > 0 {
-            self.storage.append(0xd7)
-            self.storage.append(0xFF)
-            self.storage.append(contentsOf: ((UInt64(nanoseconds) << 34) + UInt64(seconds)).bytes)
-        } else {
-            self.storage.append(0xd6)
-            self.storage.append(0xFF)
-            self.storage.append(contentsOf: UInt32(seconds).bytes)
-        }
-    }
-    
-    func encode(_ value: Data) throws {
-        let length = value.count
-        if let uint8 = UInt8(exactly: length) {
-            self.storage.append(0xc4)
-            self.storage.append(uint8)
-            self.storage.append(value)
-        } else if let uint16 = UInt16(exactly: length) {
-            self.storage.append(0xc5)
-            self.storage.append(contentsOf: uint16.bytes)
-            self.storage.append(value)
-        } else if let uint32 = UInt32(exactly: length) {
-            self.storage.append(0xc6)
-            self.storage.append(contentsOf: uint32.bytes)
-            self.storage.append(value)
-        } else {
-            let context = EncodingError.Context(codingPath: self.codingPath, debugDescription: "Cannot encode data of length \(value.count).")
-            throw EncodingError.invalidValue(value, context)
-        }
-    }
-    
-    func encode<T>(_ value: T) throws where T : Encodable {
-        try checkCanEncode(value: value)
-        defer { self.canEncodeNewValue = false }
-        
-        switch value {
-        case let data as Data:
-            try self.encode(data)
-        case let date as Date:
-            try self.encode(date)
-        default:
-            let encoder = _MessagePackEncoder()
-            try value.encode(to: encoder)
-            self.storage.append(encoder.data)
-        }
-    }
-}
-
-extension _MessagePackEncoder.SingleValueContainer: _MessagePackEncodingContainer {
-    var data: Data {
-        return storage
-    }
-}

lib/MessagePack/Sources/MessagePack/Encoder/UnkeyedEncodingContainer.swift

@@ -1,88 +0,0 @@
-import Foundation
-
-extension _MessagePackEncoder {
-    final class UnkeyedContainer {
-        private var storage: [_MessagePackEncodingContainer] = []
-        
-        var count: Int {
-            return storage.count
-        }
-        
-        var codingPath: [CodingKey]
-        
-        var nestedCodingPath: [CodingKey] {
-            return self.codingPath + [AnyCodingKey(intValue: self.count)!]
-        }
-        
-        var userInfo: [CodingUserInfoKey: Any]
-        
-        init(codingPath: [CodingKey], userInfo: [CodingUserInfoKey : Any]) {
-            self.codingPath = codingPath
-            self.userInfo = userInfo
-        }
-    }
-}
-
-extension _MessagePackEncoder.UnkeyedContainer: UnkeyedEncodingContainer {
-    func encodeNil() throws {
-        var container = self.nestedSingleValueContainer()
-        try container.encodeNil()
-    }
-    
-    func encode<T>(_ value: T) throws where T : Encodable {
-        var container = self.nestedSingleValueContainer()
-        try container.encode(value)
-    }
-    
-    private func nestedSingleValueContainer() -> SingleValueEncodingContainer {
-        let container = _MessagePackEncoder.SingleValueContainer(codingPath: self.nestedCodingPath, userInfo: self.userInfo)
-        self.storage.append(container)
-
-        return container
-    }
-    
-    func nestedContainer<NestedKey>(keyedBy keyType: NestedKey.Type) -> KeyedEncodingContainer<NestedKey> where NestedKey : CodingKey {
-        let container = _MessagePackEncoder.KeyedContainer<NestedKey>(codingPath: self.nestedCodingPath, userInfo: self.userInfo)
-        self.storage.append(container)
-        
-        return KeyedEncodingContainer(container)
-    }
-    
-    func nestedUnkeyedContainer() -> UnkeyedEncodingContainer {
-        let container = _MessagePackEncoder.UnkeyedContainer(codingPath: self.nestedCodingPath, userInfo: self.userInfo)
-        self.storage.append(container)
-        
-        return container
-    }
-    
-    func superEncoder() -> Encoder {
-        fatalError("Unimplemented") // FIXME
-    }
-}
-
-extension _MessagePackEncoder.UnkeyedContainer: _MessagePackEncodingContainer {
-    var data: Data {
-        var data = Data()
-        
-        let length = storage.count
-        if let uint16 = UInt16(exactly: length) {
-            if uint16 <= 15 {
-                data.append(UInt8(0x90 + uint16))
-            } else {
-                data.append(0xdc)
-                data.append(contentsOf: uint16.bytes)
-            }
-        } else if let uint32 = UInt32(exactly: length) {
-            data.append(0xdd)
-            data.append(contentsOf: uint32.bytes)
-        } else {
-            fatalError()
-        }
-        
-        for container in storage {
-            data.append(container.data)
-        }
-        
-        return data
-    }
-}

lib/MessagePack/Sources/MessagePack/FixedWidthInteger+Bytes.swift

@@ -1,20 +0,0 @@
-extension FixedWidthInteger {
-    init(bytes: [UInt8]) {
-        self = bytes.withUnsafeBufferPointer {
-            $0.baseAddress!.withMemoryRebound(to: Self.self, capacity: 1) {
-                $0.pointee
-            }
-        }.bigEndian
-    }
-    
-    var bytes: [UInt8] {
-        let capacity = MemoryLayout<Self>.size
-        var mutableValue = self.bigEndian
-        return withUnsafePointer(to: &mutableValue) {
-            return $0.withMemoryRebound(to: UInt8.self, capacity: capacity) {
-                return Array(UnsafeBufferPointer(start: $0, count: capacity))
-            }
-        }
-    }
-}
-

lib/MessagePack/Tests/LinuxMain.swift

@@ -1,8 +0,0 @@
-import XCTest
-@testable import MessagePackTests
-
-XCTMain([
-    testCase(MessagePackDecodingTests.allTests),
-    testCase(MessagePackEncodingTests.allTests),
-    testCase(MessagePackRoundTripTests.allTests),
-])

lib/MessagePack/Tests/MessagePackTests/Airport.swift

@@ -1,63 +0,0 @@
-struct Airport: Codable, Equatable {
-    let name: String
-    let iata: String
-    let icao: String
-    let coordinates: [Double]
-
-    struct Runway: Codable, Equatable {
-        enum Surface: String, Codable, Equatable {
-            case rigid, flexible, gravel, sealed, unpaved, other
-        }
-        
-        let direction: String
-        let distance: Int
-        let surface: Surface
-    }
-    
-    let runways: [Runway]
-
-    let instrumentApproachProcedures: [String]
-    
-    static var example: Airport {
-        return Airport(
-            name: "Portland International Airport",
-            iata: "PDX",
-            icao: "KPDX",
-            coordinates: [-122.5975,
-                          45.5886111111111],
-            runways: [
-                Airport.Runway(
-                    direction: "3/21",
-                    distance: 1829,
-                    surface: .flexible
-                )
-            ],
-            instrumentApproachProcedures: [
-                "HI-ILS OR LOC RWY 28",
-                "HI-ILS OR LOC/DME RWY 10",
-                "ILS OR LOC RWY 10L",
-                "ILS OR LOC RWY 10R",
-                "ILS OR LOC RWY 28L",
-                "ILS OR LOC RWY 28R",
-                "ILS RWY 10R (SA CAT I)",
-                "ILS RWY 10R (CAT II - III)",
-                "RNAV (RNP) Y RWY 28L",
-                "RNAV (RNP) Y RWY 28R",
-                "RNAV (RNP) Z RWY 10L",
-                "RNAV (RNP) Z RWY 10R",
-                "RNAV (RNP) Z RWY 28L",
-                "RNAV (RNP) Z RWY 28R",
-                "RNAV (GPS) X RWY 28L",
-                "RNAV (GPS) X RWY 28R",
-                "RNAV (GPS) Y RWY 10L",
-                "RNAV (GPS) Y RWY 10R",
-                "LOC/DME RWY 21",
-                "VOR-A",
-                "HI-TACAN RWY 10",
-                "TACAN RWY 28",
-                "COLUMBIA VISUAL RWY 10L/",
-                "MILL VISUAL RWY 28L/R"
-            ]
-        )
-    }
-}

lib/MessagePack/Tests/MessagePackTests/MessagePackDecodingTests.swift

@@ -1,301 +0,0 @@
-import XCTest
-@testable import MessagePack
-
-class MessagePackDecodingTests: XCTestCase {
-    var decoder: MessagePackDecoder!
-    
-    override func setUp() {
-        self.decoder = MessagePackDecoder()
-    }
-
-    func assertTypeMismatch<T>(_ expression: @autoclosure () throws -> T,
-                               _ message: @autoclosure () -> String = "",
-                               file: StaticString = #file,
-                               line: UInt = #line) -> Any.Type? {
-        var error: Error?
-        XCTAssertThrowsError(expression, message,
-                             file: file, line: line) {
-            error = $0
-        }
-        guard case .typeMismatch(let type, _) = error as? DecodingError else {
-            XCTFail(file: file, line: line)
-            return nil
-        }
-        return type
-    }
-    
-    func testDecodeNil() {
-        let data = Data(bytes: [0xC0])
-        let value = try! decoder.decode(Int?.self, from: data)
-        XCTAssertNil(value)
-    }
-
-    func testDecodeFalse() {
-        let data = Data(bytes: [0xc2])
-        let value = try! decoder.decode(Bool.self, from: data)
-        XCTAssertEqual(value, false)
-    }
-
-    func testDecodeTrue() {
-        let data = Data(bytes: [0xc3])
-        let value = try! decoder.decode(Bool.self, from: data)
-        XCTAssertEqual(value, true)
-    }
-
-    func testDecodeInt() {
-        let data = Data(bytes: [0x2A])
-        let value = try! decoder.decode(Int.self, from: data)
-        XCTAssertEqual(value, 42)
-    }
-
-    func testDecodeNegativeInt() {
-        let data = Data(bytes: [0xFF])
-        let value = try! decoder.decode(Int.self, from: data)
-        XCTAssertEqual(value, -1)
-    }
-
-    func testDecodeUInt() {
-        let data = Data(bytes: [0xCC, 0x80])
-        let value = try! decoder.decode(Int.self, from: data)
-        XCTAssertEqual(value, 128)
-    }
-
-    func testDecodeFloat() {
-        let data = Data(bytes: [0xCA, 0x40, 0x48, 0xF5, 0xC3])
-        let value = try! decoder.decode(Float.self, from: data)
-        XCTAssertEqual(value, 3.14)
-    }
-
-    func testDecodeFloatToDouble() {
-        let data = Data(bytes: [0xCA, 0x40, 0x48, 0xF5, 0xC3])
-        let type = assertTypeMismatch(try decoder.decode(Double.self, from: data))
-        XCTAssertTrue(type is Double.Type)
-        decoder.nonMatchingFloatDecodingStrategy = .cast
-        let value = try! decoder.decode(Double.self, from: data)
-        XCTAssertEqual(value, 3.14, accuracy: 1e-6)
-    }
-
-    func testDecodeDouble() {
-        let data = Data(bytes: [0xCB, 0x40, 0x09, 0x21, 0xF9, 0xF0, 0x1B, 0x86, 0x6E])
-        let value = try! decoder.decode(Double.self, from: data)
-        XCTAssertEqual(value, 3.14159)
-    }
-
-    func testDecodeDoubleToFloat() {
-        let data = Data(bytes: [0xCB, 0x40, 0x09, 0x21, 0xF9, 0xF0, 0x1B, 0x86, 0x6E])
-        let type = assertTypeMismatch(try decoder.decode(Float.self, from: data))
-        XCTAssertTrue(type is Float.Type)
-        decoder.nonMatchingFloatDecodingStrategy = .cast
-        let value = try! decoder.decode(Float.self, from: data)
-        XCTAssertEqual(value, 3.14159)
-    }
-
-    func testDecodeFixedArray() {
-        let data = Data(bytes: [0x93, 0x01, 0x02, 0x03])
-        let value = try! decoder.decode([Int].self, from: data)
-        XCTAssertEqual(value, [1, 2, 3])
-    }
-
-    func testDecodeVariableArray() {
-        let data = Data(bytes: [0xdc] + [0x00, 0x10] + Array(0x01...0x10))
-        let value = try! decoder.decode([Int].self, from: data)
-        XCTAssertEqual(value, Array(1...16))
-    }
-
-    func testDecodeFixedDictionary() {
-        let data = Data(bytes: [0x83, 0xA1, 0x62, 0x02, 0xA1, 0x61, 0x01, 0xA1, 0x63, 0x03])
-        let value = try! decoder.decode([String: Int].self, from: data)
-        XCTAssertEqual(value, ["a": 1, "b": 2, "c": 3])
-    }
-
-    func testDecodeData() {
-        let data = Data(bytes: [0xC4, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F])
-        let value = try! decoder.decode(Data.self, from: data)
-        XCTAssertEqual(value, "hello".data(using: .utf8))
-    }
-
-    func testDecodeDate() {
-        let data = Data(bytes: [0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01])
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! decoder.decode(Date.self, from: data)
-        XCTAssertEqual(value, date)
-    }
-
-    func testDecodeDistantPast() {
-        let data = Data(bytes: [0xC7, 0x0C, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xF1, 0x88, 0x6B, 0x66, 0x00])
-        let date = Date.distantPast
-        let value = try! decoder.decode(Date.self, from: data)
-        XCTAssertEqual(value, date)
-    }
-
-    func testDecodeDistantFuture() {
-        let data = Data(bytes: [0xC7, 0x0C, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xEC, 0x31, 0x88, 0x00])
-        let date = Date.distantFuture
-        let value = try! decoder.decode(Date.self, from: data)
-        XCTAssertEqual(value, date)
-    }
-
-    func testDecodeArrayWithDate() {
-        let data = Data(bytes: [0x91, 0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01])
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! decoder.decode([Date].self, from: data)
-        XCTAssertEqual(value, [date])
-    }
-
-    func testDecodeDictionaryWithDate() {
-        let data = Data(bytes: [0x81, 0xA1, 0x31, 0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01])
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! decoder.decode([String: Date].self, from: data)
-        XCTAssertEqual(value, ["1": date])
-    }
-    
-    func testDecodeBv() {
-        let b64 = "lK50ZXN0aW5nIHN0cmluZyeSpnF3ZXF3ZagxMjNpY29uc5OU2SRlMTZkYTYwMi0zMjE1LTRiZDYtYjY5MC00Y2Q4NmEwZmU3NjSoQ2lwaGVyIDEBk61jaXBodXNlcm5hbWUxrWFkZmFmZHcyMzQxMzGSkblodHRwczovL3d3dy5nb29nbGUuY29tLmFykbVodHRwczovL3d3dy5hcHBsZS5jb22U2SRhNjExMWU2Ny1hMTMwLTRiM2ItODM5NS0xZjIzMDFjNjk3ZjeoQ2lwaGVyIDIBk6g0MzEzMjEzMatqbGpsbHl1bHVpecCU2SRiOGIwODM3MC0xNGU0LTQzZmUtYjBkOS04ZjJlMDlmODJkYzWoQ2lwaGVyIDMBk6twaW9waW9waXBpb6x6eGN6eHZ6eHZ4enaSkbdodHRwczovL3d3dy52aXNhLmNvbS5hcpG1aHR0cHM6Ly93d3cuZG9ja3MuY29t" // array mode with envData and ciphers
-        
-//        let b64 = "hKFirnRlc3Rpbmcgc3RyaW5noWMnp2VudkRhdGGCpGJhc2WmcXdlcXdlpWljb25zqDEyM2ljb25zp2NpcGhlcnOThKJpZNkkMDA4YmE0NDctZjU0Mi00OWVjLWJjYTktMDMzZTQ2OTU0YTBipG5hbWWoQ2lwaGVyIDGkdHlwZQGlbG9naW6DqHVzZXJuYW1lrWNpcGh1c2VybmFtZTGkdG90cK1hZGZhZmR3MjM0MTMxpHVyaXOSgaN1cmm5aHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS5hcoGjdXJptWh0dHBzOi8vd3d3LmFwcGxlLmNvbYSiaWTZJDQ1ZTBhODJiLTgyZGQtNDJiZi05ODhhLTAyYTkyNGM4Yzg5M6RuYW1lqENpcGhlciAypHR5cGUBpWxvZ2lug6h1c2VybmFtZag0MzEzMjEzMaR0b3Rwq2psamxseXVsdWl5pHVyaXPAhKJpZNkkZTBjZWU5NDEtZDI1Ni00MjdiLWJkNWUtNDMxMmMwN2U1NDI5pG5hbWWoQ2lwaGVyIDOkdHlwZQGlbG9naW6DqHVzZXJuYW1lq3Bpb3Bpb3BpcGlvpHRvdHCsenhjenh2enh2eHp2pHVyaXOSgaN1cmm3aHR0cHM6Ly93d3cudmlzYS5jb20uYXKBo3VyabVodHRwczovL3d3dy5kb2Nrcy5jb20=" // dict mode with envData and ciphers
-        
-        do {
-            if let d = Data(base64Encoded: b64) {
-                let decoder = MessagePackDecoder()
-                decoder.userInfo[MessagePackDecoder.dataSpecKey] = DataSpecBuilder()
-                    .append("b")
-                    .append("c")
-                    .appendObj("envData", DataSpecBuilder()
-                        .append("base")
-                        .append("icons")
-                        .build())
-                    .appendArray("ciphers", DataSpecBuilder()
-                        .append("id")
-                        .append("name")
-                        .append("type")
-                        .appendObj("login", DataSpecBuilder()
-                            .append("username")
-                            .append("totp")
-                            .appendArray("uris", DataSpecBuilder()
-                                .append("uri")
-                                .build())
-                            .build())
-                        .build())
-                    .build()
-
-                let codTest = try decoder.decode(CodableTest.self, from: d)
-                
-                XCTAssertEqual(codTest.b, "testing string")
-                XCTAssertEqual(codTest.envData.base, "qweqwe")
-                XCTAssertEqual(codTest.envData.icons, "123icons")
-                XCTAssertTrue(codTest.ciphers!.count > 1)
-            } else {
-                XCTAssertEqual(1, 0)
-            }
-        } catch let error {
-            XCTFail("E: \(error)")
-        }
-    }
-
-    static var allTests = [
-        ("testDecodeNil", testDecodeNil),
-        ("testDecodeFalse", testDecodeFalse),
-        ("testDecodeTrue", testDecodeTrue),
-        ("testDecodeInt", testDecodeInt),
-        ("testDecodeUInt", testDecodeUInt),
-        ("testDecodeFloat", testDecodeFloat),
-        ("testDecodeFloatToDouble", testDecodeFloatToDouble),
-        ("testDecodeDouble", testDecodeDouble),
-        ("testDecodeDoubleToFloat", testDecodeDoubleToFloat),
-        ("testDecodeFixedArray", testDecodeFixedArray),
-        ("testDecodeFixedDictionary", testDecodeFixedDictionary),
-        ("testDecodeData", testDecodeData),
-        ("testDecodeDistantPast", testDecodeDistantPast),
-        ("testDecodeDistantFuture", testDecodeDistantFuture),
-        ("testDecodeArrayWithDate", testDecodeArrayWithDate),
-        ("testDecodeDictionaryWithDate", testDecodeDictionaryWithDate),
-        ("testDecodeBv", testDecodeBv)
-    ]
-}
-
-struct CodableTest : Codable {
-    enum CodingKeys: Int, CodingKey {
-        case b
-        case c
-        case envData
-        case ciphers
-    }
-    
-    var b: String
-    var c: Int
-    var envData: EnvironmentUrlDataDto
-    var ciphers: [Cipher]?
-    
-    func printt() {
-        print("B: \(b)")
-        print("C: \(c)")
-        print("ENVDATA")
-        envData.printt()
-        
-        if let cs = ciphers {
-            print("CIPHERS")
-            for c in cs {
-                c.printt()
-                print("----------------------------")
-            }
-        }
-        
-        print("###########################")
-    }
-}
-
-struct EnvironmentUrlDataDto : Codable {
-    var base: String?
-    var icons: String?
-    
-    func printt() {
-        print("Base: \(base ?? "")")
-        print("Icons: \(icons ?? "")")
-    }
-}
-
-struct Cipher:Identifiable,Codable{
-    enum CodingKeys: Int, CodingKey {
-        case id
-        case name
-        case login
-    }
-
-    var id:String
-    var name:String?
-    var userId:String?
-    var login:Login
-    
-    func printt() {
-        print("id: \(id)")
-        print("name: \(name ?? "")")
-        print("LOGIN")
-        login.printt()
-    }
-}
-
-struct Login:Codable{
-    var username:String?
-    var totp:String?
-    var uris:[LoginUri]?
-    
-    func printt() {
-        print("username: \(username ?? "")")
-        print("totp: \(totp ?? "")")
-        print("URIS")
-        if let us = uris {
-            for u in us {
-                u.printt()
-                print("----------------------------")
-            }
-        }
-    }
-}
-
-struct LoginUri:Codable{
-    var uri:String?
-    
-    func printt() {
-        print("Uri: \(uri ?? "")")
-    }
-}

lib/MessagePack/Tests/MessagePackTests/MessagePackEncodingTests.swift

@@ -1,127 +0,0 @@
-import XCTest
-@testable import MessagePack
-
-class MessagePackEncodingTests: XCTestCase {
-    var encoder: MessagePackEncoder!
-    
-    override func setUp() {
-        self.encoder = MessagePackEncoder()
-    }
-    
-    func testEncodeNil() {
-        let value = try! encoder.encode(nil as Int?)
-        XCTAssertEqual(value, Data(bytes: [0xc0]))
-    }
-    
-    func testEncodeFalse() {
-        let value = try! encoder.encode(false)
-        XCTAssertEqual(value, Data(bytes: [0xc2]))
-    }
-    
-    func testEncodeTrue() {
-        let value = try! encoder.encode(true)
-        XCTAssertEqual(value, Data(bytes: [0xc3]))
-    }
-    
-    func testEncodeInt() {
-        let value = try! encoder.encode(42 as Int)
-        XCTAssertEqual(value, Data(bytes: [0x2A]))
-    }
-    
-    func testEncodeUInt() {
-        let value = try! encoder.encode(128 as UInt)
-        XCTAssertEqual(value, Data(bytes: [0xCC, 0x80]))
-    }
-    
-    func testEncodeFloat() {
-        let value = try! encoder.encode(3.14 as Float)
-        XCTAssertEqual(value, Data(bytes: [0xCA, 0x40, 0x48, 0xF5, 0xC3]))
-    }
-    
-    func testEncodeDouble() {
-        let value = try! encoder.encode(3.14159 as Double)
-        XCTAssertEqual(value, Data(bytes: [0xCB, 0x40, 0x09, 0x21, 0xF9, 0xF0, 0x1B, 0x86, 0x6E]))
-    }
-    
-    func testEncodeString() {
-        let value = try! encoder.encode("hello")
-        XCTAssertEqual(value, Data(bytes: [0xA5, 0x68, 0x65, 0x6C, 0x6C, 0x6F]))
-    }
-    
-    func testEncodeFixedArray() {
-        let value = try! encoder.encode([1, 2, 3])
-        XCTAssertEqual(value, Data(bytes: [0x93, 0x01, 0x02, 0x03]))
-    }
-
-    func testEncodeVariableArray() {
-        let value = try! encoder.encode(Array(1...16))
-        XCTAssertEqual(value, Data(bytes: [0xdc] + [0x00, 0x10] + Array(0x01...0x10)))
-    }
-    
-    func testEncodeFixedDictionary() {
-        let value = try! encoder.encode(["a": 1])
-        XCTAssertEqual(value, Data(bytes: [0x81, 0xA1, 0x61, 0x01]))
-    }
-
-    func testEncodeVariableDictionary() {
-        let letters = "abcdefghijklmnopqrstuvwxyz".unicodeScalars
-        let dictionary = Dictionary(uniqueKeysWithValues: zip(letters.map { String($0) }, 1...26))
-        let value = try! encoder.encode(dictionary)
-        XCTAssertEqual(value.count, 81)
-        XCTAssert(value.starts(with: [0xde] + [0x00, 0x1A]))
-    }
-    
-    func testEncodeData() {
-        let data = "hello".data(using: .utf8)
-        let value = try! encoder.encode(data)
-        XCTAssertEqual(value, Data(bytes: [0xC4, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F]))
-    }
-    
-    func testEncodeDate() {
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! encoder.encode(date)
-        XCTAssertEqual(value, Data(bytes: [0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01]))
-    }
-
-    func testEncodeDistantPast() {
-        let date = Date.distantPast
-        let value = try! encoder.encode(date)
-        XCTAssertEqual(value, Data(bytes: [0xC7, 0x0C, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xF1, 0x88, 0x6B, 0x66, 0x00]))
-    }
-
-    func testEncodeDistantFuture() {
-        let date = Date.distantFuture
-        let value = try! encoder.encode(date)
-        XCTAssertEqual(value, Data(bytes: [0xC7, 0x0C, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xEC, 0x31, 0x88, 0x00]))
-    }
-
-    func testEncodeArrayWithDate() {
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! encoder.encode([date])
-        XCTAssertEqual(value, Data(bytes: [0x91, 0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01]))
-    }
-    
-    func testEncodeDictionaryWithDate() {
-        let date = Date(timeIntervalSince1970: 1)
-        let value = try! encoder.encode(["1": date])
-        XCTAssertEqual(value, Data(bytes: [0x81, 0xA1, 0x31, 0xD6, 0xFF, 0x00, 0x00, 0x00, 0x01]))
-    }
-
-    static var allTests = [
-        ("testEncodeFalse", testEncodeFalse),
-        ("testEncodeTrue", testEncodeTrue),
-        ("testEncodeInt", testEncodeInt),
-        ("testEncodeUInt", testEncodeUInt),
-        ("testEncodeFloat", testEncodeFloat),
-        ("testEncodeDouble", testEncodeDouble),
-        ("testEncodeFixedArray", testEncodeFixedArray),
-        ("testEncodeVariableArray", testEncodeVariableArray),
-        ("testEncodeFixedDictionary", testEncodeFixedDictionary),
-        ("testEncodeVariableDictionary", testEncodeVariableDictionary),
-        ("testEncodeDate", testEncodeDate),
-        ("testEncodeDistantPast", testEncodeDistantPast),
-        ("testEncodeDistantFuture", testEncodeDistantFuture),
-        ("testEncodeArrayWithDate", testEncodeArrayWithDate),
-        ("testEncodeDictionaryWithDate", testEncodeDictionaryWithDate)
-    ]
-}

lib/MessagePack/Tests/MessagePackTests/MessagePackPerformanceTests.swift

@@ -1,23 +0,0 @@
-import XCTest
-@testable import MessagePack
-
-class MessagePackPerformanceTests: XCTestCase {
-    var encoder: MessagePackEncoder!
-    var decoder: MessagePackDecoder!
-    
-    override func setUp() {
-        self.encoder = MessagePackEncoder()
-        self.decoder = MessagePackDecoder()
-    }
-    
-    func testPerformance() {
-        let count = 100
-        let values = [Airport](repeating: .example, count: count)
-        
-        self.measure {
-            let encoded = try! encoder.encode(values)
-            let decoded = try! decoder.decode([Airport].self, from: encoded)
-            XCTAssertEqual(decoded.count, count)
-        }
-    }
-}

lib/MessagePack/Tests/MessagePackTests/MessagePackRoundTripTests.swift

@@ -1,106 +0,0 @@
-import XCTest
-@testable import MessagePack
-
-class MessagePackRoundTripTests: XCTestCase {
-    var encoder: MessagePackEncoder!
-    var decoder: MessagePackDecoder!
-    
-    override func setUp() {
-        self.encoder = MessagePackEncoder()
-        self.decoder = MessagePackDecoder()
-    }
-
-    func testRoundTripAirport() {
-        let value = Airport.example
-        let encoded = try! encoder.encode(value)
-        let decoded = try! decoder.decode(Airport.self, from: encoded)
-
-        XCTAssertEqual(value.name, decoded.name)
-        XCTAssertEqual(value.iata, decoded.iata)
-        XCTAssertEqual(value.icao, decoded.icao)
-        XCTAssertEqual(value.coordinates[0], decoded.coordinates[0], accuracy: 0.01)
-        XCTAssertEqual(value.coordinates[1], decoded.coordinates[1], accuracy: 0.01)
-        XCTAssertEqual(value.runways[0].direction, decoded.runways[0].direction)
-        XCTAssertEqual(value.runways[0].distance, decoded.runways[0].distance)
-        XCTAssertEqual(value.runways[0].surface, decoded.runways[0].surface)
-    }
-
-    func testRoundTripParachutePack() {
-        struct Parachute: Codable, Equatable {
-            enum Canopy: String, Codable, Equatable {
-                case round, cruciform, rogalloWing, annular, ramAir
-            }
-
-            let canpoy: Canopy
-            let surfaceArea: Double
-        }
-
-        struct ParachutePack: Codable, Equatable {
-            let main: Parachute?
-            let reserve: Parachute?
-        }
-
-        let value = ParachutePack(main: Parachute(canpoy: .ramAir, surfaceArea: 200), reserve: nil)
-        let encoded = try! encoder.encode(value)
-        let decoded = try! decoder.decode(ParachutePack.self, from: encoded)
-
-        XCTAssertEqual(value, decoded)
-    }
-
-    func testRoundTripArray() {
-        let count: UInt8 = 100
-        var bytes: [UInt8] = [0xdc, 0x00, count]
-        var encoded: [Int] = []
-        for n in 1...count {
-            bytes.append(n)
-            encoded.append(Int(n))
-        }
-
-        let data = Data(bytes: bytes)
-        let decoded = try! decoder.decode([Int].self, from: data)
-        XCTAssertEqual(encoded, decoded)
-    }
-
-    func testRoundTripDictionary() {
-        let (a, z): (UInt8, UInt8) = (0x61, 0x7a)
-        var bytes: [UInt8] = [0xde, 0x00, 0x1A]
-        var encoded: [String: Int] = [:]
-        for n in a...z {
-            bytes.append(contentsOf: [0xA1, n, n])
-            encoded[String(Unicode.Scalar(n))] = Int(n)
-        }
-
-        let data = Data(bytes: bytes)
-        let decoded = try! decoder.decode([String: Int].self, from: data)
-        XCTAssertEqual(encoded, decoded)
-    }
-    
-    func testRoundTripDate() {
-        var bytes: [UInt8] = [0xD6, 0xFF]
-
-        let dateComponents = DateComponents(year: 2018, month: 4, day: 20)
-        let encoded = Calendar.current.date(from: dateComponents)!
-        
-        let secondsSince1970 = UInt32(encoded.timeIntervalSince1970)
-        bytes.append(contentsOf: secondsSince1970.bytes)
-        
-        let data = Data(bytes: bytes)
-        let decoded = try! decoder.decode(Date.self, from: data)
-        XCTAssertEqual(encoded, decoded)
-    }
-
-    func testRoundTripDateWithNanoseconds() {
-        let encoded = Date()
-        let data = try! self.encoder.encode(encoded)
-        let decoded = try! self.decoder.decode(Date.self, from: data)
-        XCTAssertEqual(encoded.timeIntervalSinceReferenceDate, decoded.timeIntervalSinceReferenceDate, accuracy: 0.0001)
-    }
-    
-    static var allTests = [
-        ("testRoundTripAirport", testRoundTripAirport),
-        ("testRoundTripArray", testRoundTripArray),
-        ("testRoundTripDictionary", testRoundTripDictionary),
-        ("testRoundTripDate", testRoundTripDate),
-        ("testRoundTripDateWithNanoseconds", testRoundTripDateWithNanoseconds)
-    ]
-}

lib/android/Xamarin.AndroidX.Credentials/net8.0-android/Xamarin.AndroidX.Credentials.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Xamarin.AndroidX.Credentials</name>
-    </assembly>
-    <members>
-    </members>
-</doc>

nuget.config

@@ -2,6 +2,5 @@
 <configuration>
     <packageSources>
         <add key="MAUI Nightly builds" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/maui-nightly/nuget/v3/index.json" />
-        <add key="Local AndroidX Credentials" value="lib/android/Xamarin.AndroidX.Credentials" />
     </packageSources>
 </configuration>

package-lock.json

@@ -8,7 +8,7 @@
       "name": "bitwarden-mobile",
       "version": "0.0.0",
       "devDependencies": {
-        "gh-pages": "^6.1.1"
+        "gh-pages": "3.2.3"
       }
     },
     "node_modules/array-union": {
@@ -33,11 +33,13 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
@@ -56,14 +58,10 @@
       }
     },
     "node_modules/commander": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      }
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/commondir": {
       "version": "1.0.1",
@@ -78,11 +76,10 @@
       "dev": true
     },
     "node_modules/email-addresses": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
-      "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
+      "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
+      "dev": true
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
@@ -150,18 +147,17 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">=6 <7 || >=8"
       }
     },
     "node_modules/fs.realpath": {
@@ -171,18 +167,17 @@
       "dev": true
     },
     "node_modules/gh-pages": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.1.1.tgz",
-      "integrity": "sha512-upnohfjBwN5hBP9w2dPE7HO5JJTHzSGMV1JrLrHvNuqmjoYHg6TBrCcnEoorjG/e0ejbuvnwyKMdTyM40PEByw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz",
+      "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "async": "^3.2.4",
-        "commander": "^11.0.0",
-        "email-addresses": "^5.0.0",
+        "async": "^2.6.1",
+        "commander": "^2.18.0",
+        "email-addresses": "^3.0.1",
         "filenamify": "^4.3.0",
         "find-cache-dir": "^3.3.1",
-        "fs-extra": "^11.1.1",
+        "fs-extra": "^8.1.0",
         "globby": "^6.1.0"
       },
       "bin": {
@@ -230,11 +225,10 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
-      "license": "ISC"
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true
     },
     "node_modules/inflight": {
       "version": "1.0.6",
@@ -253,14 +247,10 @@
       "dev": true
     },
     "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -277,6 +267,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
     "node_modules/make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -452,13 +448,12 @@
       }
     },
     "node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/wrappy": {
@@ -485,10 +480,13 @@
       "dev": true
     },
     "async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
-      "dev": true
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
     },
     "balanced-match": {
       "version": "1.0.2",
@@ -507,9 +505,9 @@
       }
     },
     "commander": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "commondir": {
@@ -525,9 +523,9 @@
       "dev": true
     },
     "email-addresses": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-5.0.0.tgz",
-      "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
+      "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
       "dev": true
     },
     "escape-string-regexp": {
@@ -575,14 +573,14 @@
       }
     },
     "fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs.realpath": {
@@ -592,17 +590,17 @@
       "dev": true
     },
     "gh-pages": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-6.1.1.tgz",
-      "integrity": "sha512-upnohfjBwN5hBP9w2dPE7HO5JJTHzSGMV1JrLrHvNuqmjoYHg6TBrCcnEoorjG/e0ejbuvnwyKMdTyM40PEByw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz",
+      "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==",
       "dev": true,
       "requires": {
-        "async": "^3.2.4",
-        "commander": "^11.0.0",
-        "email-addresses": "^5.0.0",
+        "async": "^2.6.1",
+        "commander": "^2.18.0",
+        "email-addresses": "^3.0.1",
         "filenamify": "^4.3.0",
         "find-cache-dir": "^3.3.1",
-        "fs-extra": "^11.1.1",
+        "fs-extra": "^8.1.0",
         "globby": "^6.1.0"
       }
     },
@@ -634,9 +632,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
       "dev": true
     },
     "inflight": {
@@ -656,13 +654,12 @@
       "dev": true
     },
     "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
+        "graceful-fs": "^4.1.6"
       }
     },
     "locate-path": {
@@ -674,6 +671,12 @@
         "p-locate": "^4.1.0"
       }
     },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
     "make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -798,9 +801,9 @@
       }
     },
     "universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true
     },
     "wrappy": {

package.json

@@ -6,6 +6,6 @@
     "clean:l10n": "git push origin --delete l10n_master"
   },
   "devDependencies": {
-    "gh-pages": "^6.1.1"
+    "gh-pages": "3.2.3"
   }
 }

src/App/App.csproj

@@ -44,7 +44,7 @@
     <AndroidEnableMultiDex>True</AndroidEnableMultiDex>
     <UseInterpreter>False</UseInterpreter>
     <DebugSymbols>False</DebugSymbols>
-    <RunAOTCompilation>True</RunAOTCompilation>
+    <RunAOTCompilation>False</RunAOTCompilation>
     <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
@@ -117,13 +117,10 @@
 	  <Folder Include="Platforms\Android\Services\" />
 	  <Folder Include="Platforms\Android\Tiles\" />
 	  <Folder Include="Platforms\Android\Utilities\" />
-	  <Folder Include="Platforms\Android\Resources\drawable-xxxhdpi\" />
-	  <Folder Include="Resources\Raw\" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
 	  <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
 	  <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />
-      <PackageReference Include="Xamarin.AndroidX.Credentials" Version="1.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND !$(DefineConstants.Contains(FDROID))">
 	  <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.5" />
@@ -259,13 +256,5 @@
 	  <None Remove="Platforms\iOS\Resources\more_vert.png" />
 	  <None Remove="Platforms\iOS\Resources\logo_white.png" />
 	  <None Remove="Platforms\iOS\Resources\logo%402x.png" />
-	  <None Remove="Platforms\Android\Resources\drawable-xxxhdpi\" />
-	  <None Remove="Resources\Raw\" />
-	</ItemGroup>
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
-	</ItemGroup>
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-	  <MauiAsset Include="Resources\Raw\fido2_privileged_allow_list.json" LogicalName="fido2_privileged_allow_list.json" />
 	</ItemGroup>
 </Project>

src/App/Platforms/Android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.10.111" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.2.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
@@ -43,9 +43,6 @@
 	<!-- Support for Xamarin.Essentials.Browser.OpenAsync  (for Android > 11) -->
 	<!-- Related docs: https://learn.microsoft.com/en-us/xamarin/essentials/open-browser?tabs=android -->
 	<queries>
-		<intent>
-			<action android:name="android.support.customtabs.action.CustomTabsService" />
-		</intent>
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
 			<data android:scheme="http" />

src/App/Platforms/Android/Autofill/AutofillHelpers.cs

@@ -347,7 +347,7 @@ namespace Bit.Droid.Autofill
                 // InlinePresentation requires nonNull pending intent (even though we only utilize one for the
                 // "my vault" presentation) so we're including an empty one here
                 pendingIntent = PendingIntent.GetService(context, 0, new Intent(),
-                    AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.OneShot | PendingIntentFlags.UpdateCurrent, false));
+                    AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.OneShot | PendingIntentFlags.UpdateCurrent, true));
             }
             var slice = CreateInlinePresentationSlice(
                 inlinePresentationSpec,

src/App/Platforms/Android/Autofill/CredentialHelpers.cs

@@ -1,321 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.Text.Json.Nodes;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using AndroidX.Credentials;
-using AndroidX.Credentials.Exceptions;
-using AndroidX.Credentials.Provider;
-using AndroidX.Credentials.WebAuthn;
-using Bit.App.Abstractions;
-using Bit.App.Droid.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Utilities.Fido2.Extensions;
-using Bit.Droid;
-using Org.Json;
-using Activity = Android.App.Activity;
-using Drawables = Android.Graphics.Drawables;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public static class CredentialHelpers
-    {
-        public static async Task<List<CredentialEntry>> PopulatePasskeyDataAsync(CallingAppInfo callingAppInfo,
-            BeginGetPublicKeyCredentialOption option, Context context, bool hasVaultBeenUnlockedInThisTransaction)
-        {
-            var passkeyEntries = new List<CredentialEntry>();
-            var requestOptions = new PublicKeyCredentialRequestOptions(option.RequestJson);
-
-            var authenticator = Bit.Core.Utilities.ServiceContainer.Resolve<IFido2AuthenticatorService>();
-            var credentials = await authenticator.SilentCredentialDiscoveryAsync(requestOptions.RpId);
-
-            // We need to change the request code for every pending intent on mapping the credential so the extras are not overriten by the last
-            // credential entry created.
-            int requestCodeAddition = 0;
-            passkeyEntries = credentials.Select(credential => MapCredential(credential, option, context, hasVaultBeenUnlockedInThisTransaction, Bit.Droid.Autofill.CredentialProviderService.UniqueGetRequestCode + requestCodeAddition++) as CredentialEntry).ToList();
-
-            return passkeyEntries;
-        }
-
-        private static PublicKeyCredentialEntry MapCredential(Fido2AuthenticatorDiscoverableCredentialMetadata credential, BeginGetPublicKeyCredentialOption option, Context context, bool hasVaultBeenUnlockedInThisTransaction, int requestCode)
-        {
-            var credDataBundle = new Bundle();
-            credDataBundle.PutByteArray(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialIdIntentExtra, credential.Id);
-
-            var intent = new Intent(context, typeof(Bit.Droid.Autofill.CredentialProviderSelectionActivity))
-                .SetAction(Bit.Droid.Autofill.CredentialProviderService.GetFido2IntentAction).SetPackage(Constants.PACKAGE_NAME);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialDataIntentExtra, credDataBundle);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialProviderCipherId, credential.CipherId);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialHasVaultBeenUnlockedInThisTransactionExtra, hasVaultBeenUnlockedInThisTransaction);
-            var pendingIntent = PendingIntent.GetActivity(context, requestCode, intent,
-                PendingIntentFlags.Mutable | PendingIntentFlags.UpdateCurrent);
-
-            return new PublicKeyCredentialEntry.Builder(
-                        context,
-                        credential.UserName ?? "No username",
-                        pendingIntent,
-                        option)
-                    .SetDisplayName(credential.UserName ?? "No username")
-                    .SetIcon(Drawables.Icon.CreateWithResource(context, Microsoft.Maui.Resource.Drawable.icon))
-                    .Build();
-        }
-
-        private static PublicKeyCredentialCreationOptions GetPublicKeyCredentialCreationOptionsFromJson(string json)
-        {
-            var request = new PublicKeyCredentialCreationOptions(json);
-            var jsonObj = new JSONObject(json);
-            var authenticatorSelection = jsonObj.GetJSONObject("authenticatorSelection");
-            request.AuthenticatorSelection = new AndroidX.Credentials.WebAuthn.AuthenticatorSelectionCriteria(
-                authenticatorSelection.OptString("authenticatorAttachment", "platform"),
-                authenticatorSelection.OptString("residentKey", null),
-                authenticatorSelection.OptBoolean("requireResidentKey", false),
-                authenticatorSelection.OptString("userVerification", "preferred"));
-
-            return request;
-        }
-
-        public static async Task CreateCipherPasskeyAsync(ProviderCreateCredentialRequest getRequest, Activity activity)
-        {
-            var callingRequest = getRequest?.CallingRequest as CreatePublicKeyCredentialRequest;
-
-            if (callingRequest is null)
-            {
-                await DisplayAlertAsync(AppResources.AnErrorHasOccurred, string.Empty);
-                FailAndFinish();
-                return;
-            }
-
-            var credentialCreationOptions = GetPublicKeyCredentialCreationOptionsFromJson(callingRequest.RequestJson);
-            string origin;
-            try
-            {
-                origin = await ValidateCallingAppInfoAndGetOriginAsync(getRequest.CallingAppInfo, credentialCreationOptions.Rp.Id);
-            }
-            catch (Core.Exceptions.ValidationException valEx)
-            {
-                await DisplayAlertAsync(AppResources.AnErrorHasOccurred, valEx.Message);
-                FailAndFinish();
-                return;
-            }
-
-            if (origin is null)
-            {
-                await DisplayAlertAsync(AppResources.ErrorCreatingPasskey, AppResources.PasskeysNotSupportedForThisApp);
-                FailAndFinish();
-                return;
-            }
-
-            var rp = new Core.Utilities.Fido2.PublicKeyCredentialRpEntity()
-            {
-                Id = credentialCreationOptions.Rp.Id,
-                Name = credentialCreationOptions.Rp.Name
-            };
-
-            var user = new Core.Utilities.Fido2.PublicKeyCredentialUserEntity()
-            {
-                Id = credentialCreationOptions.User.GetId(),
-                Name = credentialCreationOptions.User.Name,
-                DisplayName = credentialCreationOptions.User.DisplayName
-            };
-
-            var pubKeyCredParams = new List<Core.Utilities.Fido2.PublicKeyCredentialParameters>();
-            foreach (var pubKeyCredParam in credentialCreationOptions.PubKeyCredParams)
-            {
-                pubKeyCredParams.Add(new Core.Utilities.Fido2.PublicKeyCredentialParameters() { Alg = Convert.ToInt32(pubKeyCredParam.Alg), Type = pubKeyCredParam.Type });
-            }
-
-            var excludeCredentials = new List<Core.Utilities.Fido2.PublicKeyCredentialDescriptor>();
-            foreach (var excludeCred in credentialCreationOptions.ExcludeCredentials)
-            {
-                excludeCredentials.Add(new Core.Utilities.Fido2.PublicKeyCredentialDescriptor() { Id = excludeCred.GetId(), Type = excludeCred.Type, Transports = excludeCred.Transports.ToArray() });
-            }
-
-            var authenticatorSelection = new Core.Utilities.Fido2.AuthenticatorSelectionCriteria()
-            {
-                UserVerification = credentialCreationOptions.AuthenticatorSelection.UserVerification,
-                ResidentKey = credentialCreationOptions.AuthenticatorSelection.ResidentKey,
-                RequireResidentKey = credentialCreationOptions.AuthenticatorSelection.RequireResidentKey
-            };
-
-            var timeout = Convert.ToInt32(credentialCreationOptions.Timeout);
-
-            var credentialCreateParams = new Fido2ClientCreateCredentialParams()
-            {
-                Challenge = credentialCreationOptions.GetChallenge(),
-                Origin = origin,
-                PubKeyCredParams = pubKeyCredParams.ToArray(),
-                Rp = rp,
-                User = user,
-                Timeout = timeout,
-                Attestation = credentialCreationOptions.Attestation,
-                AuthenticatorSelection = authenticatorSelection,
-                ExcludeCredentials = excludeCredentials.ToArray(),
-                Extensions = MapExtensionsFromJson(credentialCreationOptions),
-                SameOriginWithAncestors = true
-            };
-
-            var credentialExtraCreateParams = new Fido2ExtraCreateCredentialParams
-            (
-                callingRequest.GetClientDataHash(),
-                getRequest.CallingAppInfo?.PackageName
-            );
-
-            var fido2MediatorService = ServiceContainer.Resolve<IFido2MediatorService>();
-            var clientCreateCredentialResult = await fido2MediatorService.CreateCredentialAsync(credentialCreateParams, credentialExtraCreateParams);
-            if (clientCreateCredentialResult == null)
-            {
-                FailAndFinish();
-                return;
-            }
-
-            var transportsArray = new JSONArray();
-            if (clientCreateCredentialResult.Transports != null)
-            {
-                foreach (var transport in clientCreateCredentialResult.Transports)
-                {
-                    transportsArray.Put(transport);
-                }
-            }
-
-            var responseInnerAndroidJson = new JSONObject();
-            if (clientCreateCredentialResult.ClientDataJSON != null)
-            {
-                responseInnerAndroidJson.Put("clientDataJSON", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.ClientDataJSON));
-            }
-            responseInnerAndroidJson.Put("authenticatorData", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.AuthData));
-            responseInnerAndroidJson.Put("attestationObject", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.AttestationObject));
-            responseInnerAndroidJson.Put("transports", transportsArray);
-            responseInnerAndroidJson.Put("publicKeyAlgorithm", clientCreateCredentialResult.PublicKeyAlgorithm);
-            responseInnerAndroidJson.Put("publicKey", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.PublicKey));
-
-            var rootAndroidJson = new JSONObject();
-            rootAndroidJson.Put("id", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.CredentialId));
-            rootAndroidJson.Put("rawId", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.CredentialId));
-            rootAndroidJson.Put("authenticatorAttachment", "platform");
-            rootAndroidJson.Put("type", "public-key");
-            rootAndroidJson.Put("clientExtensionResults", MapExtensionsToJson(clientCreateCredentialResult.Extensions));
-            rootAndroidJson.Put("response", responseInnerAndroidJson);
-
-            var result = new Intent();
-            var publicKeyResponse = new CreatePublicKeyCredentialResponse(rootAndroidJson.ToString());
-            PendingIntentHandler.SetCreateCredentialResponse(result, publicKeyResponse);
-
-            activity.SetResult(Result.Ok, result);
-            activity.Finish();
-
-            async Task DisplayAlertAsync(string title, string message)
-            {
-                if (ServiceContainer.TryResolve<IDeviceActionService>(out var deviceActionService))
-                {
-                    await deviceActionService.DisplayAlertAsync(title, message, AppResources.Ok);
-                }
-            }
-
-            void FailAndFinish()
-            {
-                var result = new Intent();
-                PendingIntentHandler.SetCreateCredentialException(result, new CreateCredentialUnknownException());
-
-                activity.SetResult(Result.Ok, result);
-                activity.Finish();
-            }
-        }
-
-        private static Fido2CreateCredentialExtensionsParams MapExtensionsFromJson(PublicKeyCredentialCreationOptions options)
-        {
-            if (options == null || !options.Json.Has("extensions"))
-            {
-                return null;
-            }
-
-            var extensions = options.Json.GetJSONObject("extensions");
-            return new Fido2CreateCredentialExtensionsParams
-            {
-                CredProps = extensions.Has("credProps") && extensions.GetBoolean("credProps")
-            };
-        }
-
-        private static JSONObject MapExtensionsToJson(Fido2CreateCredentialExtensionsResult extensions)
-        {
-            if (extensions == null)
-            {
-                return null;
-            }
-
-            var extensionsJson = new JSONObject();
-            if (extensions.CredProps != null)
-            {
-                var credPropsJson = new JSONObject();
-                credPropsJson.Put("rk", extensions.CredProps.Rk);
-                extensionsJson.Put("credProps", credPropsJson);
-            }
-
-            return extensionsJson;
-        }
-
-        public static async Task<string> LoadFido2PrivilegedAllowedListAsync()
-        {
-            try
-            {
-                using var stream = await FileSystem.OpenAppPackageFileAsync("fido2_privileged_allow_list.json");
-                using var reader = new StreamReader(stream);
-
-                return reader.ReadToEnd();
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public static async Task<string> ValidateCallingAppInfoAndGetOriginAsync(CallingAppInfo callingAppInfo, string rpId)
-        {
-            if (callingAppInfo.Origin is null)
-            {
-                return await ValidateAssetLinksAndGetOriginAsync(callingAppInfo, rpId);
-            }
-
-            var privilegedAllowedList = await LoadFido2PrivilegedAllowedListAsync();
-            if (privilegedAllowedList is null)
-            {
-                throw new InvalidOperationException("Could not load Fido2 privileged allowed list");
-            }
-
-            if (!privilegedAllowedList.Contains($"\"package_name\": \"{callingAppInfo.PackageName}\""))
-            {
-                throw new Core.Exceptions.ValidationException(AppResources.PasskeyOperationFailedBecauseBrowserIsNotPrivileged);
-            }
-
-            try
-            {
-                return callingAppInfo.GetOrigin(privilegedAllowedList);
-            }
-            catch (Java.Lang.IllegalStateException)
-            {
-                throw new Core.Exceptions.ValidationException(AppResources.PasskeyOperationFailedBecauseBrowserSignatureDoesNotMatch);
-            }
-            catch (Java.Lang.IllegalArgumentException)
-            {
-                return null; // wrong list format
-            }
-        }
-
-        private static async Task<string> ValidateAssetLinksAndGetOriginAsync(CallingAppInfo callingAppInfo, string rpId)
-        {
-            if (!ServiceContainer.TryResolve<IAssetLinksService>(out var assetLinksService))
-            {
-                throw new InvalidOperationException("Can't resolve IAssetLinksService");
-            }
-
-            var normalizedFingerprint = callingAppInfo.GetLatestCertificationFingerprint();
-
-            var isValid = await assetLinksService.ValidateAssetLinksAsync(rpId, callingAppInfo.PackageName, normalizedFingerprint);
-
-            return isValid ? callingAppInfo.GetAndroidOrigin() : null;
-        }
-    }
-}

src/App/Platforms/Android/Autofill/CredentialProviderSelectionActivity.cs

@@ -1,183 +0,0 @@
-using Android.App;
-using Android.Content;
-using Android.Content.PM;
-using Android.OS;
-using AndroidX.Credentials;
-using AndroidX.Credentials.Provider;
-using AndroidX.Credentials.WebAuthn;
-using Bit.App.Droid.Utilities;
-using Bit.App.Abstractions;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Services;
-using Bit.App.Platforms.Android.Autofill;
-using AndroidX.Credentials.Exceptions;
-using Org.Json;
-
-namespace Bit.Droid.Autofill
-{
-    [Activity(
-        NoHistory = true,
-        LaunchMode = LaunchMode.SingleTop)]
-    public class CredentialProviderSelectionActivity : MauiAppCompatActivity
-    {
-        private LazyResolve<IFido2MediatorService> _fido2MediatorService = new LazyResolve<IFido2MediatorService>();
-        private LazyResolve<IFido2AndroidGetAssertionUserInterface> _fido2GetAssertionUserInterface = new LazyResolve<IFido2AndroidGetAssertionUserInterface>();
-        private LazyResolve<IVaultTimeoutService> _vaultTimeoutService = new LazyResolve<IVaultTimeoutService>();
-        private LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>();
-        private LazyResolve<ICipherService> _cipherService = new LazyResolve<ICipherService>();
-        private LazyResolve<IUserVerificationMediatorService> _userVerificationMediatorService = new LazyResolve<IUserVerificationMediatorService>();
-        private LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>();
-
-        protected override void OnCreate(Bundle bundle)
-        {
-            Intent?.Validate();
-            base.OnCreate(bundle);
-
-            var cipherId = Intent?.GetStringExtra(CredentialProviderConstants.CredentialProviderCipherId);
-            if (string.IsNullOrEmpty(cipherId))
-            {
-                Finish();
-                return;
-            }
-
-            GetCipherAndPerformFido2AuthAsync(cipherId).FireAndForget();
-        }
-
-        //Used to avoid crash on MAUI when doing back
-        public override void OnBackPressed()
-        {
-            Finish();
-        }
-
-        private async Task GetCipherAndPerformFido2AuthAsync(string cipherId)
-        {
-            string RpId = string.Empty;
-            try
-            {
-                var getRequest = PendingIntentHandler.RetrieveProviderGetCredentialRequest(Intent);
-
-                if (getRequest is null)
-                {
-                    FailAndFinish();
-                    return;
-                }
-
-                var credentialOption = getRequest.CredentialOptions.FirstOrDefault();
-                var credentialPublic = credentialOption as GetPublicKeyCredentialOption;
-
-                var requestOptions = new PublicKeyCredentialRequestOptions(credentialPublic.RequestJson);
-                RpId = requestOptions.RpId;
-
-                var requestInfo = Intent.GetBundleExtra(CredentialProviderConstants.CredentialDataIntentExtra);
-                var credentialId = requestInfo?.GetByteArray(CredentialProviderConstants.CredentialIdIntentExtra);
-                var hasVaultBeenUnlockedInThisTransaction = Intent.GetBooleanExtra(CredentialProviderConstants.CredentialHasVaultBeenUnlockedInThisTransactionExtra, false);
-
-                var packageName = getRequest.CallingAppInfo.PackageName;
-
-                string origin;
-                try
-                {
-                    origin = await CredentialHelpers.ValidateCallingAppInfoAndGetOriginAsync(getRequest.CallingAppInfo, RpId);
-                }
-                catch (Core.Exceptions.ValidationException valEx)
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.AnErrorHasOccurred, valEx.Message, AppResources.Ok);
-                    FailAndFinish();
-                    return;
-                }
-
-                if (origin is null)
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, AppResources.PasskeysNotSupportedForThisApp, AppResources.Ok);
-                    FailAndFinish();
-                    return;
-                }
-
-                _fido2GetAssertionUserInterface.Value.Init(
-                    cipherId,
-                    false,
-                    () => hasVaultBeenUnlockedInThisTransaction,
-                    RpId
-                );
-
-                var clientAssertParams = new Fido2ClientAssertCredentialParams
-                {
-                    Challenge = requestOptions.GetChallenge(),
-                    RpId = RpId,
-                    AllowCredentials = new Core.Utilities.Fido2.PublicKeyCredentialDescriptor[] { new Core.Utilities.Fido2.PublicKeyCredentialDescriptor { Id = credentialId } },
-                    Origin = origin,
-                    SameOriginWithAncestors = true,
-                    UserVerification = requestOptions.UserVerification
-                };
-
-                var extraAssertParams = new Fido2ExtraAssertCredentialParams
-                (
-                    getRequest.CallingAppInfo.Origin != null ? credentialPublic.GetClientDataHash() : null,
-                    packageName
-                );
-
-                var assertResult = await _fido2MediatorService.Value.AssertCredentialAsync(clientAssertParams, extraAssertParams);
-
-                var result = new Intent();
-
-                var responseInnerAndroidJson = new JSONObject();
-                if (assertResult.ClientDataJSON != null)
-                {
-                    responseInnerAndroidJson.Put("clientDataJSON", CoreHelpers.Base64UrlEncode(assertResult.ClientDataJSON));
-                }
-                responseInnerAndroidJson.Put("authenticatorData", CoreHelpers.Base64UrlEncode(assertResult.AuthenticatorData));
-                responseInnerAndroidJson.Put("signature", CoreHelpers.Base64UrlEncode(assertResult.Signature));
-                responseInnerAndroidJson.Put("userHandle", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.UserHandle));
-
-                var rootAndroidJson = new JSONObject();
-                rootAndroidJson.Put("id", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.Id));
-                rootAndroidJson.Put("rawId", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.Id));
-                rootAndroidJson.Put("authenticatorAttachment", "platform");
-                rootAndroidJson.Put("type", "public-key");
-                rootAndroidJson.Put("clientExtensionResults", new JSONObject());
-                rootAndroidJson.Put("response", responseInnerAndroidJson);
-
-                var json = rootAndroidJson.ToString();
-
-                var cred = new PublicKeyCredential(json);
-                var credResponse = new GetCredentialResponse(cred);
-                PendingIntentHandler.SetGetCredentialResponse(result, credResponse);
-
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    SetResult(Result.Ok, result);
-                    Finish();
-                });
-            }
-            catch (NotAllowedError)
-            {
-                await MainThread.InvokeOnMainThreadAsync(async () =>
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, string.Format(AppResources.ThereWasAProblemReadingAPasskeyForXTryAgainLater, RpId), AppResources.Ok);
-                    FailAndFinish();
-                });
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                await MainThread.InvokeOnMainThreadAsync(async () =>
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, string.Format(AppResources.ThereWasAProblemReadingAPasskeyForXTryAgainLater, RpId), AppResources.Ok);
-                    FailAndFinish();
-                });
-            }
-        }
-
-        private void FailAndFinish()
-        {
-            var result = new Intent();
-            PendingIntentHandler.SetGetCredentialException(result, new GetCredentialUnknownException());
-
-            SetResult(Result.Ok, result);
-            Finish();
-        }
-    }
-}

src/App/Platforms/Android/Autofill/CredentialProviderService.cs

@@ -1,168 +0,0 @@
-using Android;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using AndroidX.Credentials.Provider;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using AndroidX.Credentials.Exceptions;
-using Bit.App.Droid.Utilities;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Droid.Autofill
-{
-    [Service(Permission = Manifest.Permission.BindCredentialProviderService, Label = "Bitwarden", Exported = true)]
-    [IntentFilter(new string[] { "android.service.credentials.CredentialProviderService" })]
-    [MetaData("android.credentials.provider", Resource = "@xml/provider")]
-    [Register("com.x8bit.bitwarden.Autofill.CredentialProviderService")]
-    public class CredentialProviderService : AndroidX.Credentials.Provider.CredentialProviderService
-    {
-        public const string GetFido2IntentAction = "PACKAGE_NAME.GET_PASSKEY";
-        public const string CreateFido2IntentAction = "PACKAGE_NAME.CREATE_PASSKEY";
-        public const int UniqueGetRequestCode = 94556023;
-        public const int UniqueCreateRequestCode = 94556024;
-
-        private readonly LazyResolve<IVaultTimeoutService> _vaultTimeoutService = new LazyResolve<IVaultTimeoutService>();
-        private readonly LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>();
-        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
-        public override async void OnBeginCreateCredentialRequest(BeginCreateCredentialRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            try
-            {
-                var response = await ProcessCreateCredentialsRequestAsync(request);
-                if (response != null)
-                {
-                    await MainThread.InvokeOnMainThreadAsync(() => callback.OnResult(response));
-                    return;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-            MainThread.BeginInvokeOnMainThread(() => callback.OnError(AppResources.ErrorCreatingPasskey));
-        }
-
-        public override async void OnBeginGetCredentialRequest(BeginGetCredentialRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            try
-            {
-                await _vaultTimeoutService.Value.CheckVaultTimeoutAsync();
-                var locked = await _vaultTimeoutService.Value.IsLockedAsync();
-                if (!locked)
-                {
-                    var response = await ProcessGetCredentialsRequestAsync(request);
-                    callback.OnResult(response);
-                    return;
-                }
-
-                var intent = new Intent(ApplicationContext, typeof(MainActivity));
-                intent.PutExtra(CredentialProviderConstants.Fido2CredentialAction, CredentialProviderConstants.Fido2CredentialGet);
-                var pendingIntent = PendingIntent.GetActivity(ApplicationContext, UniqueGetRequestCode, intent,
-                    AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true));
-
-                var unlockAction = new AuthenticationAction(AppResources.Unlock, pendingIntent);
-
-                var unlockResponse = new BeginGetCredentialResponse.Builder()
-                    .SetAuthenticationActions(new List<AuthenticationAction>() { unlockAction } )
-                    .Build();
-                callback.OnResult(unlockResponse);
-            }
-            catch (GetCredentialException e)
-            {
-                _logger.Value.Exception(e);
-                callback.OnError(e.ErrorMessage ?? AppResources.ErrorReadingPasskey);
-            }
-            catch (Exception e)
-            {
-                _logger.Value.Exception(e);
-                callback.OnError(AppResources.ErrorReadingPasskey);
-            }
-        }
-
-        private async Task<BeginCreateCredentialResponse> ProcessCreateCredentialsRequestAsync(
-            BeginCreateCredentialRequest request)
-        {
-            if (request == null) { return null; }
-
-            if (request is BeginCreatePasswordCredentialRequest beginCreatePasswordCredentialRequest)
-            {
-                //This flow can be used if Password flow needs to be implemented
-                throw new NotImplementedException();
-                //return HandleCreatePasswordQuery(beginCreatePasswordCredentialRequest);
-            }
-            else if (request is BeginCreatePublicKeyCredentialRequest beginCreatePublicKeyCredentialRequest)
-            {
-                return await HandleCreatePasskeyQueryAsync(beginCreatePublicKeyCredentialRequest);
-            }
-
-            return null;
-        }
-
-        private async Task<BeginCreateCredentialResponse> HandleCreatePasskeyQueryAsync(BeginCreatePublicKeyCredentialRequest optionRequest)
-        {
-            var intent = new Intent(ApplicationContext, typeof(MainActivity));
-            intent.PutExtra(CredentialProviderConstants.Fido2CredentialAction, CredentialProviderConstants.Fido2CredentialCreate);
-            var pendingIntent = PendingIntent.GetActivity(ApplicationContext, UniqueCreateRequestCode, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true));
-
-            var userEmail = await GetSafeActiveAccountEmailAsync();
-
-            var createEntryBuilder = new CreateEntry.Builder(userEmail ?? AppResources.Bitwarden, pendingIntent)
-                .SetDescription(userEmail != null
-                                    ? string.Format(AppResources.YourPasskeyWillBeSavedToYourBitwardenVaultForX, userEmail)
-                                    : AppResources.YourPasskeyWillBeSavedToYourBitwardenVault)
-                .Build();
-
-            var createCredentialResponse = new BeginCreateCredentialResponse.Builder()
-                .AddCreateEntry(createEntryBuilder);
-
-            return createCredentialResponse.Build();
-        }
-
-        private async Task<BeginGetCredentialResponse> ProcessGetCredentialsRequestAsync(
-            BeginGetCredentialRequest request)
-        {
-            var credentialEntries = new List<CredentialEntry>();
-
-            foreach (var option in request.BeginGetCredentialOptions.OfType<BeginGetPublicKeyCredentialOption>())
-            {
-                credentialEntries.AddRange(await Bit.App.Platforms.Android.Autofill.CredentialHelpers.PopulatePasskeyDataAsync(request.CallingAppInfo, option, ApplicationContext, false));
-            }
-
-            if (!credentialEntries.Any())
-            {
-                return new BeginGetCredentialResponse();
-            }
-
-            return new BeginGetCredentialResponse.Builder()
-                .SetCredentialEntries(credentialEntries)
-                .Build();
-        }
-
-        public override void OnClearCredentialStateRequest(ProviderClearCredentialStateRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            callback.OnResult(null);
-        }
-
-        private async Task<string> GetSafeActiveAccountEmailAsync()
-        {
-            try
-            {
-                return await _stateService.Value.GetEmailAsync();
-            }
-            catch (Exception ex)
-            {
-                // if it throws to get the user's email then we log and continue showing a more generic message
-                _logger.Value.Exception(ex);
-                return null;
-            }
-        }
-    }
-}

src/App/Platforms/Android/Autofill/Fido2GetAssertionUserInterface.cs

@@ -1,77 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public interface IFido2AndroidGetAssertionUserInterface : IFido2GetAssertionUserInterface
-    {
-        void Init(string cipherId,
-            bool userVerified,
-            Func<bool> hasVaultBeenUnlockedInThisTransaction,
-            string rpId);
-    }
-
-    public class Fido2GetAssertionUserInterface : Core.Utilities.Fido2.Fido2GetAssertionUserInterface, IFido2AndroidGetAssertionUserInterface
-    {
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-
-        public Fido2GetAssertionUserInterface(IStateService stateService, 
-            IVaultTimeoutService vaultTimeoutService,
-            ICipherService cipherService,
-            IUserVerificationMediatorService userVerificationMediatorService)
-        {
-            _stateService = stateService;
-            _vaultTimeoutService = vaultTimeoutService;
-            _cipherService = cipherService;
-            _userVerificationMediatorService = userVerificationMediatorService;
-        }
-
-        public void Init(string cipherId,
-            bool userVerified,
-            Func<bool> hasVaultBeenUnlockedInThisTransaction,
-            string rpId)
-        {
-            Init(cipherId, 
-                userVerified, 
-                EnsureAuthenAndVaultUnlockedAsync, 
-                hasVaultBeenUnlockedInThisTransaction, 
-                (cipherId, userVerificationPreference) => VerifyUserAsync(cipherId, userVerificationPreference, rpId, hasVaultBeenUnlockedInThisTransaction()));
-        }
-
-        public async Task EnsureAuthenAndVaultUnlockedAsync()
-        {
-            if (!await _stateService.IsAuthenticatedAsync() || await _vaultTimeoutService.IsLockedAsync())
-            {
-                // this should never happen but just in case.
-                throw new InvalidOperationException("Not authed or vault locked");
-            }
-        }
-
-        private async Task<bool> VerifyUserAsync(string selectedCipherId, Fido2UserVerificationPreference userVerificationPreference, string rpId, bool vaultUnlockedDuringThisTransaction)
-        {
-            try
-            {
-                var encrypted = await _cipherService.GetAsync(selectedCipherId);
-                var cipher = await encrypted.DecryptAsync();
-
-                var userVerification = await _userVerificationMediatorService.VerifyUserForFido2Async(
-                    new Fido2UserVerificationOptions(
-                        cipher?.Reprompt == Core.Enums.CipherRepromptType.Password,
-                        userVerificationPreference,
-                        vaultUnlockedDuringThisTransaction,
-                        rpId)
-                    );
-                return !userVerification.IsCancelled && userVerification.Result;
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                return false;
-            }
-        }
-    }
-}

src/App/Platforms/Android/Autofill/Fido2MakeCredentialUserInterface.cs

@@ -1,202 +0,0 @@
-using Bit.App.Abstractions;
-using Bit.Core.Abstractions;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public class Fido2MakeCredentialUserInterface : IFido2MakeCredentialConfirmationUserInterface
-    {
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private LazyResolve<IMessagingService> _messagingService = new LazyResolve<IMessagingService>();
-
-        private TaskCompletionSource<(string cipherId, bool? userVerified)> _confirmCredentialTcs;
-        private TaskCompletionSource<bool> _unlockVaultTcs;
-        private Fido2UserVerificationOptions? _currentDefaultUserVerificationOptions;
-        private Func<bool> _checkHasVaultBeenUnlockedInThisTransaction;
-
-        public Fido2MakeCredentialUserInterface(IStateService stateService,
-            IVaultTimeoutService vaultTimeoutService,
-            ICipherService cipherService,
-            IUserVerificationMediatorService userVerificationMediatorService,
-            IDeviceActionService deviceActionService,
-            IPlatformUtilsService platformUtilsService)
-        {
-            _stateService = stateService;
-            _vaultTimeoutService = vaultTimeoutService;
-            _cipherService = cipherService;
-            _userVerificationMediatorService = userVerificationMediatorService;
-            _deviceActionService = deviceActionService;
-            _platformUtilsService = platformUtilsService;
-        }
-
-        public bool HasVaultBeenUnlockedInThisTransaction => _checkHasVaultBeenUnlockedInThisTransaction?.Invoke() == true;
-
-        public bool IsConfirmingNewCredential => _confirmCredentialTcs?.Task != null && !_confirmCredentialTcs.Task.IsCompleted;
-        public bool IsWaitingUnlockVault => _unlockVaultTcs?.Task != null && !_unlockVaultTcs.Task.IsCompleted;
-
-        public async Task<(string CipherId, bool UserVerified)> ConfirmNewCredentialAsync(Fido2ConfirmNewCredentialParams confirmNewCredentialParams)
-        {
-            _confirmCredentialTcs?.TrySetCanceled();
-            _confirmCredentialTcs = null;
-            _confirmCredentialTcs = new TaskCompletionSource<(string cipherId, bool? userVerified)>();
-
-            _currentDefaultUserVerificationOptions = new Fido2UserVerificationOptions(false, confirmNewCredentialParams.UserVerificationPreference, HasVaultBeenUnlockedInThisTransaction, confirmNewCredentialParams.RpId);
-            
-            _messagingService.Value.Send(Bit.Core.Constants.CredentialNavigateToAutofillCipherMessageCommand, confirmNewCredentialParams);
-
-            var (cipherId, isUserVerified) = await _confirmCredentialTcs.Task;
-
-            var verified = isUserVerified;
-            if (verified is null)
-            {
-                var userVerification = await VerifyUserAsync(cipherId, confirmNewCredentialParams.UserVerificationPreference, confirmNewCredentialParams.RpId);
-                // TODO: If cancelled then let the user choose another cipher.
-                // I think this can be done by showing a message to the uesr and recursive calling of this method ConfirmNewCredentialAsync
-                verified = !userVerification.IsCancelled && userVerification.Result;
-            }
-
-            if (cipherId is null)
-            {
-                return await CreateNewLoginForFido2CredentialAsync(confirmNewCredentialParams, verified.Value);
-            }
-
-            return (cipherId, verified.Value);
-        }
-
-        private async Task<(string CipherId, bool UserVerified)> CreateNewLoginForFido2CredentialAsync(Fido2ConfirmNewCredentialParams confirmNewCredentialParams, bool userVerified)
-        {
-            if (!userVerified && await _userVerificationMediatorService.ShouldEnforceFido2RequiredUserVerificationAsync(new Fido2UserVerificationOptions
-                (
-                    false,
-                    confirmNewCredentialParams.UserVerificationPreference,
-                    true,
-                    confirmNewCredentialParams.RpId
-                )))
-            {
-                return (null, false);
-            }
-
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-
-                var cipherId = await _cipherService.CreateNewLoginForPasskeyAsync(confirmNewCredentialParams);
-
-                await _deviceActionService.HideLoadingAsync();
-
-                return (cipherId, userVerified);
-            }
-            catch
-            {
-                await _deviceActionService.HideLoadingAsync();
-                throw;
-            }
-        }
-
-        public async Task EnsureUnlockedVaultAsync()
-        {
-            if (!await _stateService.IsAuthenticatedAsync()
-                ||
-                await _vaultTimeoutService.IsLoggedOutByTimeoutAsync()
-                ||
-                await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-            {
-                await NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget.HomeLogin);
-                return;
-            }
-
-            if (!await _vaultTimeoutService.IsLockedAsync())
-            {
-                return;
-            }
-
-            await NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget.Lock);
-        }
-
-        private async Task NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget navTarget)
-        {
-            _unlockVaultTcs?.TrySetCanceled();
-            _unlockVaultTcs = new TaskCompletionSource<bool>();
-
-            _messagingService.Value.Send(Bit.Core.Constants.NavigateToMessageCommand, navTarget);
-
-            await _unlockVaultTcs.Task;
-        }
-
-        public Task InformExcludedCredentialAsync(string[] existingCipherIds)
-        {
-            // TODO: Show excluded credential to the user in some screen.
-            return Task.FromResult(true);
-        }
-
-        public void SetCheckHasVaultBeenUnlockedInThisTransaction(Func<bool> checkHasVaultBeenUnlockedInThisTransaction)
-        {
-            _checkHasVaultBeenUnlockedInThisTransaction = checkHasVaultBeenUnlockedInThisTransaction;
-        }
-
-        public void Confirm(string cipherId, bool? userVerified) => _confirmCredentialTcs?.TrySetResult((cipherId, userVerified));
-        public void ConfirmVaultUnlocked() => _unlockVaultTcs?.TrySetResult(true);
-
-        public async Task ConfirmAsync(string cipherId, bool alreadyHasFido2Credential, bool? userVerified)
-        {
-            if (alreadyHasFido2Credential
-                &&
-                !await _platformUtilsService.ShowDialogAsync(
-                    AppResources.ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey,
-                    AppResources.OverwritePasskey,
-                    AppResources.Yes,
-                    AppResources.No))
-            {
-                return;
-            }
-
-            Confirm(cipherId, userVerified);
-        }
-
-        public void Cancel() => _confirmCredentialTcs?.TrySetCanceled();
-
-        public void OnConfirmationException(Exception ex) => _confirmCredentialTcs?.TrySetException(ex);
-
-        private async Task<CancellableResult<bool>> VerifyUserAsync(string selectedCipherId, Fido2UserVerificationPreference userVerificationPreference, string rpId)
-        {
-            try
-            {
-                if (selectedCipherId is null && userVerificationPreference == Fido2UserVerificationPreference.Discouraged)
-                {
-                    return new CancellableResult<bool>(false);
-                }
-
-                var shouldCheckMasterPasswordReprompt = false;
-                if (selectedCipherId != null)
-                {
-                    var encrypted = await _cipherService.GetAsync(selectedCipherId);
-                    var cipher = await encrypted.DecryptAsync();
-                    shouldCheckMasterPasswordReprompt = cipher?.Reprompt == Core.Enums.CipherRepromptType.Password;
-                }
-
-                return await _userVerificationMediatorService.VerifyUserForFido2Async(
-                    new Fido2UserVerificationOptions(
-                        shouldCheckMasterPasswordReprompt,
-                        userVerificationPreference,
-                        HasVaultBeenUnlockedInThisTransaction,
-                        rpId)
-                    );
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                return new CancellableResult<bool>(false);
-            }
-        }
-
-        public Fido2UserVerificationOptions? GetCurrentUserVerificationOptions() => _currentDefaultUserVerificationOptions;
-    }
-}

src/App/Platforms/Android/MainActivity.cs

@@ -24,7 +24,6 @@ using Bit.App.Droid.Utilities;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using FileProvider = AndroidX.Core.Content.FileProvider;
-using Bit.Core.Utilities.Fido2;
 
 namespace Bit.Droid
 {
@@ -168,13 +167,6 @@ namespace Bit.Droid
             base.OnNewIntent(intent);
             try
             {
-                if (intent?.GetStringExtra(CredentialProviderConstants.Fido2CredentialAction) == CredentialProviderConstants.Fido2CredentialCreate
-                    &&
-                    _appOptions != null)
-                {
-                    _appOptions.HasUnlockedInThisTransaction = false;
-                }
-
                 if (intent?.GetStringExtra("uri") is string uri)
                 {
                     _messagingService.Send(App.App.POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE);
@@ -333,15 +325,12 @@ namespace Bit.Droid
 
         private AppOptions GetOptions()
         {
-            var fido2CredentialAction = Intent.GetStringExtra(CredentialProviderConstants.Fido2CredentialAction);
             var options = new AppOptions
             {
                 Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra(AutofillConstants.AutofillFrameworkUri),
                 MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
                 GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
                 FromAutofillFramework = Intent.GetBooleanExtra(AutofillConstants.AutofillFramework, false),
-                Fido2CredentialAction = fido2CredentialAction,
-                FromFido2Framework = !string.IsNullOrWhiteSpace(fido2CredentialAction),
                 CreateSend = GetCreateSendRequest(Intent)
             };
             var fillType = Intent.GetIntExtra(AutofillConstants.AutofillFrameworkFillType, 0);

src/App/Platforms/Android/MainApplication.cs

@@ -20,10 +20,7 @@ using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
-using Bit.App.Platforms.Android.Autofill;
 using Bit.Core.Enums;
-using Bit.Core.Services.UserVerification;
-
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -88,57 +85,6 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IWatchDeviceService>(),
                     ServiceContainer.Resolve<IConditionedAwaiterManager>());
                 ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
-
-                var userPinService = new UserPinService(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<ICryptoService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>());
-                ServiceContainer.Register<IUserPinService>(userPinService);
-
-                var userVerificationMediatorService = new UserVerificationMediatorService(
-                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    userPinService,
-                    deviceActionService,
-                    ServiceContainer.Resolve<IUserVerificationService>());
-                ServiceContainer.Register<IUserVerificationMediatorService>(userVerificationMediatorService);
-
-                var fido2AuthenticatorService = new Fido2AuthenticatorService(
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<ISyncService>(),
-                    ServiceContainer.Resolve<ICryptoFunctionService>(),
-                    userVerificationMediatorService);
-                ServiceContainer.Register<IFido2AuthenticatorService>(fido2AuthenticatorService);
-
-                var fido2GetAssertionUserInterface = new Fido2GetAssertionUserInterface(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>(),
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IUserVerificationMediatorService>());
-                ServiceContainer.Register<IFido2AndroidGetAssertionUserInterface>(fido2GetAssertionUserInterface);                
-
-                var fido2MakeCredentialUserInterface = new Fido2MakeCredentialUserInterface(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>(),
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IUserVerificationMediatorService>(),
-                    ServiceContainer.Resolve<IDeviceActionService>(),
-                    ServiceContainer.Resolve<IPlatformUtilsService>());
-                ServiceContainer.Register<IFido2MakeCredentialConfirmationUserInterface>(fido2MakeCredentialUserInterface);
-
-                var fido2ClientService = new Fido2ClientService(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IEnvironmentService>(),
-                    ServiceContainer.Resolve<ICryptoFunctionService>(),
-                    ServiceContainer.Resolve<IFido2AuthenticatorService>(),
-                    fido2GetAssertionUserInterface,
-                    fido2MakeCredentialUserInterface);
-                ServiceContainer.Register<IFido2ClientService>(fido2ClientService);
-
-                ServiceContainer.Register<IFido2MediatorService>(new Fido2MediatorService(
-                    fido2AuthenticatorService,
-                    fido2ClientService,
-                    ServiceContainer.Resolve<ICipherService>()));
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -214,6 +160,7 @@ namespace Bit.Droid
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService, logger);
             var biometricService = new BiometricService(stateService, cryptoService);
+            var userPinService = new UserPinService(stateService, cryptoService);
             var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);
 
             ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
@@ -237,6 +184,7 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
             ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
+            ServiceContainer.Register<IUserPinService>(userPinService);
 
             // Push
 #if FDROID

src/App/Platforms/Android/Push/FirebaseMessagingService.cs

@@ -1,9 +1,8 @@
-#if !FDROID
+#if !FDROID
 using System;
 using Android.App;
 using Bit.App.Abstractions;
 using Bit.Core.Abstractions;
-using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Firebase.Messaging;
@@ -21,7 +20,7 @@ namespace Bit.Droid.Push
             try { 
                 var stateService = ServiceContainer.Resolve<IStateService>("stateService");
                 var pushNotificationService = ServiceContainer.Resolve<IPushNotificationService>("pushNotificationService");
-
+            
                 await stateService.SetPushRegisteredTokenAsync(token);
                 await pushNotificationService.RegisterAsync();
             }
@@ -39,33 +38,13 @@ namespace Bit.Droid.Push
                 {
                     return;
                 }
-
-                JObject obj = null;
-                if (message.Data.TryGetValue("data", out var data))
-                {
-                    // Legacy GCM format
-                    obj = JObject.Parse(data);
-                }
-                else if (message.Data.TryGetValue("type", out var typeData) &&
-                    Enum.TryParse(typeData, out NotificationType type))
-                {
-                    // New FCMv1 format
-                    obj = new JObject
-                    {
-                        { "type", (int)type }
-                    };
-
-                    if (message.Data.TryGetValue("payload", out var payloadData))
-                    {
-                        obj.Add("payload", payloadData);
-                    }
-                }
-
-                if (obj == null)
+                var data = message.Data.ContainsKey("data") ? message.Data["data"] : null;
+                if (data == null)
                 {
                     return;
                 }
 
+                var obj = JObject.Parse(data);
                 var listener = ServiceContainer.Resolve<IPushNotificationListenerService>(
                     "pushNotificationListenerService");
                 await listener.OnMessageAsync(obj, Device.Android);

src/App/Platforms/Android/Resources/xml/provider.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<credential-provider xmlns:android="http://schemas.android.com/apk/res/android">
-    <capabilities>
-        <capability name="androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL" />
-    </capabilities>
-</credential-provider>

src/App/Platforms/Android/Services/AndroidPushNotificationService.cs

@@ -79,29 +79,24 @@ namespace Bit.Droid.Services
             }
             
             var context = Android.App.Application.Context;
-            var intent = context.PackageManager?.GetLaunchIntentForPackage(context.PackageName ?? string.Empty);
+            var intent = new Intent(context, typeof(MainActivity));
+            intent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
+            var pendingIntentFlags = AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true);
+            var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, pendingIntentFlags);
 
-            var builder = new NotificationCompat.Builder(context, Bit.Core.Constants.AndroidNotificationChannelId);
-            if(intent != null && context.PackageManager != null && !string.IsNullOrEmpty(context.PackageName))
-            {
-                intent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
-                var pendingIntentFlags = AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true);
-                var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, pendingIntentFlags);
+            var deleteIntent = new Intent(context, typeof(NotificationDismissReceiver));
+            deleteIntent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
+            var deletePendingIntent = PendingIntent.GetBroadcast(context, 20220802, deleteIntent, pendingIntentFlags);
 
-                var deleteIntent = new Intent(context, typeof(NotificationDismissReceiver));
-                deleteIntent.PutExtra(Bit.Core.Constants.NotificationData, JsonConvert.SerializeObject(data));
-                var deletePendingIntent = PendingIntent.GetBroadcast(context, 20220802, deleteIntent, pendingIntentFlags);
-
-                builder.SetContentIntent(pendingIntent)
-                    .SetDeleteIntent(deletePendingIntent);
-            }
-            
-            builder.SetContentTitle(title)
+            var builder = new NotificationCompat.Builder(context, Bit.Core.Constants.AndroidNotificationChannelId)
+               .SetContentIntent(pendingIntent)
+               .SetContentTitle(title)
                .SetContentText(message)
                .SetSmallIcon(Bit.Core.Resource.Drawable.ic_notification)
                .SetColor((int)Android.Graphics.Color.White)
+               .SetDeleteIntent(deletePendingIntent)
                .SetAutoCancel(true);
-            
+
             if (data is PasswordlessNotificationData passwordlessNotificationData && passwordlessNotificationData.TimeoutInMinutes > 0)
             {
                 builder.SetTimeoutAfter(passwordlessNotificationData.TimeoutInMinutes * 60000);

src/App/Platforms/Android/Services/AutofillHandler.cs

@@ -1,11 +1,11 @@
-using Android.App;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
 using Android.App.Assist;
 using Android.Content;
-using Android.Credentials;
 using Android.OS;
 using Android.Provider;
 using Android.Views.Autofill;
-using Bit.App.Abstractions;
 using Bit.Core.Resources.Localization;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -37,42 +37,6 @@ namespace Bit.Droid.Services
             _eventService = eventService;
         }
 
-        public bool CredentialProviderServiceEnabled()
-        {
-            if (Build.VERSION.SdkInt < BuildVersionCodes.UpsideDownCake)
-            {
-                return false;
-            }
-
-            try
-            {
-                var activity = (MainActivity)Platform.CurrentActivity;
-                if (activity == null)
-                {
-                    return false;
-                }
-
-                var credManager = activity.GetSystemService(Java.Lang.Class.FromType(typeof(CredentialManager))) as CredentialManager;
-                if (credManager == null)
-                {
-                    return false;
-                }
-
-                var credentialProviderServiceComponentName = new ComponentName(activity, Java.Lang.Class.FromType(typeof(CredentialProviderService)));
-                return credManager.IsEnabledCredentialProviderService(credentialProviderServiceComponentName);
-            }
-            catch (Java.Lang.NullPointerException) 
-            {
-                // CredentialManager API is not working fully and may return a NullPointerException even if the CredentialProviderService is working and enabled
-                // Info Here: https://developer.android.com/reference/android/credentials/CredentialManager#isEnabledCredentialProviderService(android.content.ComponentName)
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
         public bool AutofillServiceEnabled()
         {
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
@@ -199,17 +163,7 @@ namespace Bit.Droid.Services
             return Accessibility.AccessibilityHelpers.OverlayPermitted();
         }
 
-        public void DisableCredentialProviderService()
-        {
-            try
-            {
-                // We should try to find a way to programmatically disable the provider service when the API allows for it.
-                // For now we'll take the user to Credential Settings so they can manually disable it
-                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-                deviceActionService.OpenCredentialProviderSettings();
-            }
-            catch { }
-        }
+        
 
         public void DisableAutofillService()
         {

src/App/Platforms/Android/Services/DeviceActionService.cs

@@ -1,4 +1,6 @@
-using Android.App;
+using System;
+using System.Threading.Tasks;
+using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Nfc;
@@ -9,20 +11,16 @@ using Android.Text.Method;
 using Android.Views;
 using Android.Views.InputMethods;
 using Android.Widget;
-using AndroidX.Credentials;
 using Bit.App.Abstractions;
 using Bit.Core.Resources.Localization;
 using Bit.App.Utilities;
 using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
+using Bit.Core.Enums;
 using Bit.App.Droid.Utilities;
-using Bit.App.Models;
-using Bit.Droid.Autofill;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android;
 using Resource = Bit.Core.Resource;
 using Application = Android.App.Application;
-using Bit.Core.Services;
-using Bit.Core.Utilities.Fido2;
 
 namespace Bit.Droid.Services
 {
@@ -74,28 +72,17 @@ namespace Bit.Droid.Services
 
         public bool LaunchApp(string appName)
         {
-            try
-            {
-                if ((int)Build.VERSION.SdkInt < 33)
-                {
-                    // API 33 required to avoid using wildcard app visibility or dangerous permissions
-                    // https://developer.android.com/reference/android/content/pm/PackageManager#getLaunchIntentSenderForPackage(java.lang.String)
-                    return false;
-                }
-                var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-                appName = appName.Replace("androidapp://", string.Empty);
-                var launchIntentSender = activity?.PackageManager?.GetLaunchIntentSenderForPackage(appName);
-                launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
-                return launchIntentSender != null;
-            }
-            catch (IntentSender.SendIntentException)
-            {
-                return false;
-            }
-            catch (Android.Util.AndroidException)
+            if ((int)Build.VERSION.SdkInt < 33)
             {
+                // API 33 required to avoid using wildcard app visibility or dangerous permissions
+                // https://developer.android.com/reference/android/content/pm/PackageManager#getLaunchIntentSenderForPackage(java.lang.String)
                 return false;
             }
+            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            appName = appName.Replace("androidapp://", string.Empty);
+            var launchIntentSender = activity?.PackageManager?.GetLaunchIntentSenderForPackage(appName);
+            launchIntentSender?.SendIntent(activity, Result.Ok, null, null, null);
+            return launchIntentSender != null;
         }
 
         public async Task ShowLoadingAsync(string text)
@@ -205,7 +192,7 @@ namespace Bit.Droid.Services
             string text = null, string okButtonText = null, string cancelButtonText = null,
             bool numericKeyboard = false, bool autofocus = true, bool password = false)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<string>(null);
@@ -262,7 +249,7 @@ namespace Bit.Droid.Services
 
         public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<ValidatablePromptResponse?>(null);
@@ -339,7 +326,7 @@ namespace Bit.Droid.Services
 
         public void RateApp()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var rateIntent = RateIntentForUrl("market://details", activity);
@@ -372,14 +359,14 @@ namespace Bit.Droid.Services
 
         public bool SupportsNfc()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             var manager = activity.GetSystemService(Context.NfcService) as NfcManager;
             return manager.DefaultAdapter?.IsEnabled ?? false;
         }
 
         public bool SupportsCamera()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             return activity.PackageManager.HasSystemFeature(PackageManager.FeatureCamera);
         }
 
@@ -395,7 +382,7 @@ namespace Bit.Droid.Services
 
         public Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<string>(null);
@@ -476,7 +463,7 @@ namespace Bit.Droid.Services
 
         public void OpenAccessibilityOverlayPermissionSettings()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var intent = new Intent(Settings.ActionManageOverlayPermission);
@@ -503,32 +490,11 @@ namespace Bit.Droid.Services
             }
         }
 
-        public void OpenCredentialProviderSettings()
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            try
-            {
-                var pendingIntent = ICredentialManager.Create(activity).CreateSettingsPendingIntent();
-                pendingIntent.Send();
-            }
-            catch (ActivityNotFoundException)
-            {
-                var alertBuilder = new AlertDialog.Builder(activity);
-                alertBuilder.SetMessage(AppResources.BitwardenCredentialProviderGoToSettings);
-                alertBuilder.SetCancelable(true);
-                alertBuilder.SetPositiveButton(AppResources.Ok, (sender, args) =>
-                {
-                    (sender as AlertDialog)?.Cancel();
-                });
-                alertBuilder.Create().Show();
-            }
-        }
-
         public void OpenAccessibilitySettings()
         {
             try
             {
-                var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+                var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
                 var intent = new Intent(Settings.ActionAccessibilitySettings);
                 activity.StartActivity(intent);
             }
@@ -537,7 +503,7 @@ namespace Bit.Droid.Services
 
         public void OpenAutofillSettings()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var intent = new Intent(Settings.ActionRequestSetAutofillService);
@@ -565,92 +531,10 @@ namespace Bit.Droid.Services
             // ref: https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime()
             return SystemClock.ElapsedRealtime();
         }
-
-        public async Task ExecuteFido2CredentialActionAsync(AppOptions appOptions)
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null || string.IsNullOrWhiteSpace(appOptions.Fido2CredentialAction))
-            {
-                return;
-            }
-
-            if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialGet)
-            {
-                await ExecuteFido2GetCredentialAsync(appOptions);
-            }
-            else if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialCreate)
-            {
-                await ExecuteFido2CreateCredentialAsync();
-            }
-
-            // Clear CredentialAction and FromFido2Framework values to avoid erratic behaviors in subsequent navigation/flows
-            // For Fido2CredentialGet these are no longer needed as a new Activity will be initiated.
-            // For Fido2CredentialCreate the app will rely on IFido2MakeCredentialConfirmationUserInterface.IsConfirmingNewCredential
-            appOptions.Fido2CredentialAction = null;
-            appOptions.FromFido2Framework = false;
-        }
-
-        private async Task ExecuteFido2GetCredentialAsync(AppOptions appOptions)
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null) 
-            {
-                return; 
-            }
-
-            try
-            {
-                var request = AndroidX.Credentials.Provider.PendingIntentHandler.RetrieveBeginGetCredentialRequest(activity.Intent);
-                var response = new AndroidX.Credentials.Provider.BeginGetCredentialResponse();;
-                var credentialEntries = new List<AndroidX.Credentials.Provider.CredentialEntry>();
-                foreach (var option in request.BeginGetCredentialOptions.OfType<AndroidX.Credentials.Provider.BeginGetPublicKeyCredentialOption>())
-                {
-                    credentialEntries.AddRange(await Bit.App.Platforms.Android.Autofill.CredentialHelpers.PopulatePasskeyDataAsync(request.CallingAppInfo, option, activity, appOptions.HasUnlockedInThisTransaction));
-                }
-
-                if (credentialEntries.Any())
-                {
-                    response = new AndroidX.Credentials.Provider.BeginGetCredentialResponse.Builder()
-                        .SetCredentialEntries(credentialEntries)
-                        .Build();
-                }
-
-                var result = new Android.Content.Intent();
-                AndroidX.Credentials.Provider.PendingIntentHandler.SetBeginGetCredentialResponse(result, response);
-                activity.SetResult(Result.Ok, result);
-                activity.Finish();
-            }
-            catch (Exception ex)
-            {
-                Bit.Core.Services.LoggerHelper.LogEvenIfCantBeResolved(ex);
-
-                activity.SetResult(Result.Canceled);
-                activity.Finish();
-            }
-        }
-
-        private async Task ExecuteFido2CreateCredentialAsync()
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null) { return; }
-
-            try
-            {
-                var getRequest = AndroidX.Credentials.Provider.PendingIntentHandler.RetrieveProviderCreateCredentialRequest(activity.Intent);
-                await Bit.App.Platforms.Android.Autofill.CredentialHelpers.CreateCipherPasskeyAsync(getRequest, activity);
-            }
-            catch (Exception ex)
-            {
-                Bit.Core.Services.LoggerHelper.LogEvenIfCantBeResolved(ex);
-
-                activity.SetResult(Result.Canceled);
-                activity.Finish();
-            }
-        }
         
         public void CloseMainApp()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return;
@@ -664,8 +548,6 @@ namespace Bit.Droid.Services
             return true;
         }
 
-        public bool SupportsCredentialProviderService() => Build.VERSION.SdkInt >= BuildVersionCodes.UpsideDownCake;
-
         public bool SupportsAutofillServices() => Build.VERSION.SdkInt >= BuildVersionCodes.O;
 
         public bool SupportsInlineAutofill() => Build.VERSION.SdkInt >= BuildVersionCodes.R;
@@ -691,7 +573,7 @@ namespace Bit.Droid.Services
 
         public float GetSystemFontSizeScale()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity as MainActivity;
             return activity?.Resources?.Configuration?.FontScale ?? 1;
         }
         

src/App/Platforms/Android/Tiles/AutofillTileService.cs

@@ -8,7 +8,6 @@ using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Bit.Droid.Accessibility;
 using Java.Lang;
-using Bit.App.Droid.Utilities;
 
 namespace Bit.Droid.Tile
 {
@@ -77,7 +76,7 @@ namespace Bit.Droid.Tile
             var intent = new Intent(this, typeof(AccessibilityActivity));
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
             intent.PutExtra("autofillTileClicked", true);
-            this.StartActivityAndCollapseWithIntent(intent, isMutable: true);
+            StartActivityAndCollapse(intent);
         }
 
         private void ShowConfigErrorDialog()

src/App/Platforms/Android/Tiles/GeneratorTileService.cs

@@ -1,8 +1,15 @@
-using Android.App;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
 using Android.Content;
+using Android.OS;
 using Android.Runtime;
 using Android.Service.QuickSettings;
-using Bit.App.Droid.Utilities;
+using Android.Views;
+using Android.Widget;
 using Java.Lang;
 
 namespace Bit.Droid.Tile
@@ -55,7 +62,7 @@ namespace Bit.Droid.Tile
             var intent = new Intent(this, typeof(MainActivity));
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
             intent.PutExtra("generatorTile", true);
-            this.StartActivityAndCollapseWithIntent(intent, isMutable: false);
+            StartActivityAndCollapse(intent);
         }
     }
 }

src/App/Platforms/Android/Tiles/MyVaultTileService.cs

@@ -1,8 +1,15 @@
-using Android.App;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
 using Android.Content;
+using Android.OS;
 using Android.Runtime;
 using Android.Service.QuickSettings;
-using Bit.App.Droid.Utilities;
+using Android.Views;
+using Android.Widget;
 using Java.Lang;
 
 namespace Bit.Droid.Tile
@@ -56,7 +63,7 @@ namespace Bit.Droid.Tile
             var intent = new Intent(this, typeof(MainActivity));
             intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
             intent.PutExtra("myVaultTile", true);
-            this.StartActivityAndCollapseWithIntent(intent, isMutable: false);
+            StartActivityAndCollapse(intent);
         }
     }
 }

src/App/Platforms/Android/Utilities/AndroidHelpers.cs

@@ -2,7 +2,6 @@
 using Android.Content;
 using Android.OS;
 using Android.Provider;
-using Android.Service.QuickSettings;
 using Bit.App.Utilities;
 
 namespace Bit.App.Droid.Utilities
@@ -65,26 +64,5 @@ namespace Bit.App.Droid.Utilities
 
             return pendingIntentFlags;
         }
-
-        public static void StartActivityAndCollapseWithIntent(this TileService service, Intent intent, bool isMutable)
-        {
-            //For Android 14+ We need to use PendingIntent instead of Intent directly. Older versions still need to use Intent.
-            if (Build.VERSION.SdkInt < BuildVersionCodes.UpsideDownCake)
-            {
-                service.StartActivityAndCollapse(intent);
-                return;
-            }
-            var pendingIntent = PendingIntent.GetActivity(
-                service.ApplicationContext,
-                0,
-                intent,
-                AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, isMutable)
-            );
-            if (pendingIntent == null) 
-            { 
-                return; 
-            }
-            service.StartActivityAndCollapse(pendingIntent);
-        }
     }
 }