[eas-cli] Add support for updated fingerprint policy to eas update

2026-11-13 20:28:08 -10:00 · 2024-02-14 21:36:15 -07:00
115 changed files with 981 additions and 4854 deletions
@@ -75,13 +75,10 @@ jobs:
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets darwin-x64,darwin-arm64
+          yarn oclif pack:tarballs --no-xz --targets darwin-x64
      - id: x64
        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm64
-        run: echo "filename=$(ls eas-*-arm64.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
      - name: Upload darwin-x64 tarball
        uses: actions/upload-release-asset@v1
        env:
@@ -91,15 +88,6 @@ jobs:
          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
          asset_name: ${{ steps.x64.outputs.filename }}
          asset_content_type: application/gzip
-      - name: Upload darwin-arm64 tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm64.outputs.filename }}
-          asset_name: ${{ steps.arm64.outputs.filename }}
-          asset_content_type: application/gzip
  build-windows:
    name: Build for Windows
    runs-on: ubuntu-latest
@@ -223,22 +211,3 @@ jobs:
          SLACK_USERNAME: 'EAS CLI CI'
          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
          SLACK_FOOTER: ''
-  open-pr-in-universe:
-    name: Open a PR with `@expo/eas-json` bump in universe
-    needs: publish-to-npm
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            eas-json:
-              - 'packages/eas-json/**'
-      - name: Open a PR with `@expo/eas-json` version bump in universe
-        if: steps.filter.outputs.eas-json == 'true'
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          repo: expo/universe
-          ref: main
-          workflow: update-eas-json.yml
-          token: ${{ secrets.EXPO_BOT_PAT }}
@@ -1,10 +0,0 @@
-{
-  "eslint.enable": true,
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/*.code-search": true,
-    "**/src/**/build/**": false,
-    "**/src/build/**": false,
-  }
-}
@@ -8,138 +8,11 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Add --no-channel flag for update and rollback to embedded. ([#2339](https://github.com/expo/eas-cli/pull/2339) by [@quinlanj](https://github.com/quinlanj))
-
 ### 🐛 Bug fixes

 ### 🧹 Chores

- Amend credential removal wording. ([#2334](https://github.com/expo/eas-cli/pull/2334) by [@quinlanj](https://github.com/quinlanj))
-
-## [7.8.2](https://github.com/expo/eas-cli/releases/tag/v7.8.2) - 2024-04-15
-
-### 🐛 Bug fixes
-
- Fix display of errors when expo-updates CLI command fails. ([#2324](https://github.com/expo/eas-cli/pull/2324) by [@wschurman](https://github.com/wschurman))
- Move credentials endpoints to paginated counterparts. ([#2327](https://github.com/expo/eas-cli/pull/2327) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
- Add progress bar for fetching paginated datasets. ([#2326](https://github.com/expo/eas-cli/pull/2326) by [@quinlanj](https://github.com/quinlanj))
-
-## [7.8.1](https://github.com/expo/eas-cli/releases/tag/v7.8.1) - 2024-04-11
-
-### 🐛 Bug fixes
-
- Fix command source files URLs in autogenerated `README`. ([#2318](https://github.com/expo/eas-cli/pull/2318) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2316](https://github.com/expo/eas-cli/pull/2316) by [@expo-bot](https://github.com/expo-bot))
- Stop querying `Build.resourceClass` field. ([#2320](https://github.com/expo/eas-cli/pull/2320) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.8.0](https://github.com/expo/eas-cli/releases/tag/v7.8.0) - 2024-04-08
-
-### 🎉 New features
-
- Add `auto`, `sdk-50` and `sdk-49` image tags. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
- Add `--build-logger-level` flag to `eas build` command. ([#2313](https://github.com/expo/eas-cli/pull/2313) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
- Deprecate iOS images with Xcode version lower then 15. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.7.0](https://github.com/expo/eas-cli/releases/tag/v7.7.0) - 2024-04-05
-
-### 🎉 New features
-
- Generate metadata file for project archive ([#2149](https://github.com/expo/eas-cli/pull/2149) by [@khamilowicz](https://github.com/khamilowicz))
- Add --verbose-fastlane flag to eas submit command for more robust fastlane pilot logs. ([#2276](https://github.com/expo/eas-cli/pull/2276) by [@khamilowicz](https://github.com/khamilowicz))
- Add `eas credentials:configure-build` subcommand. ([#2282](https://github.com/expo/eas-cli/pull/2282) by [@fiberjw](https://github.com/fiberjw))
-
-### 🧹 Chores
-
- Add info about the Xcode 15.3 image to `eas.schema.json`. ([#2312](https://github.com/expo/eas-cli/pull/2312) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.6.2](https://github.com/expo/eas-cli/releases/tag/v7.6.2) - 2024-03-27
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2301](https://github.com/expo/eas-cli/pull/2301) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2304](https://github.com/expo/eas-cli/pull/2304) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.6.1](https://github.com/expo/eas-cli/releases/tag/v7.6.1) - 2024-03-25
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2291](https://github.com/expo/eas-cli/pull/2291) by [@expo-bot](https://github.com/expo-bot))
- Fix asset limit punctuation. ([#2296](https://github.com/expo/eas-cli/pull/2296) by [@quinlanj](https://github.com/quinlanj))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2293](https://github.com/expo/eas-cli/pull/2293) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.6.0](https://github.com/expo/eas-cli/releases/tag/v7.6.0) - 2024-03-18
-
-### 🎉 New features
-
- Print uncommitted files in non-interactive mode if they fail the execution. ([#2288](https://github.com/expo/eas-cli/pull/2288) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🐛 Bug fixes
-
- Use a custom build config path with POSIX separator when sending data to the EAS Build server. ([#2285](https://github.com/expo/eas-cli/pull/2285) by [@szdziedzic](https://github.com/szdziedzic))
- Improve resolving vcsClient as a part of the project context. ([#2295](https://github.com/expo/eas-cli/pull/2295) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2277](https://github.com/expo/eas-cli/pull/2277) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2283](https://github.com/expo/eas-cli/pull/2283) by [@expo-bot](https://github.com/expo-bot))
- Bump the `@expo/apple-utils` version to switch between the `developer.apple.com` and `developer-mdn.apple.com` domains when one of them doesn't work. ([#2290](https://github.com/expo/eas-cli/pull/2290) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.5.0](https://github.com/expo/eas-cli/releases/tag/v7.5.0) - 2024-03-11
-
-### 🎉 New features
-
- Add `--auto-submit` option to `eas build:internal` command. ([#2271](https://github.com/expo/eas-cli/pull/2271) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2274](https://github.com/expo/eas-cli/pull/2274) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.4.0](https://github.com/expo/eas-cli/releases/tag/v7.4.0) - 2024-03-10
-
-### 🎉 New features
-
- Use new expo-updates configuration:syncnative for versioned native sync. ([#2269](https://github.com/expo/eas-cli/pull/2269) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Fix expo-updates package version detection for canaries. ([#2243](https://github.com/expo/eas-cli/pull/2243) by [@wschurman](https://github.com/wschurman))
- Add missing `config` property to `eas.json` schema. ([#2248](https://github.com/expo/eas-cli/pull/2248) by [@sjchmiela](https://github.com/sjchmiela))
- Use expo-updates runtime version CLI to generate runtime versions. ([#2251](https://github.com/expo/eas-cli/pull/2251) by [@wschurman](https://github.com/wschurman))
- Update @expo/apple-utils to handle changes in API. ([73ba19de6662763cc6bff9fac6b7700ffbd0e88a](https://github.com/expo/eas-cli/commit/73ba19de6662763cc6bff9fac6b7700ffbd0e88a) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2237](https://github.com/expo/eas-cli/pull/2237) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2240](https://github.com/expo/eas-cli/pull/2240) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2253](https://github.com/expo/eas-cli/pull/2253) by [@expo-bot](https://github.com/expo-bot))
- Include src/\*\*/build directories in vscode search and replace. ([#2250](https://github.com/expo/eas-cli/pull/2250) by [@wschurman](https://github.com/wschurman))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2259](https://github.com/expo/eas-cli/pull/2259) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.3.0](https://github.com/expo/eas-cli/releases/tag/v7.3.0) - 2024-02-19
-
-### 🎉 New features
-
- Fix expo-updates fingerprinting during update. ([#2231](https://github.com/expo/eas-cli/pull/2231) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Don't require expo on fresh react-native project. ([#2235](https://github.com/expo/eas-cli/pull/2235) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
 - Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2229](https://github.com/expo/eas-cli/pull/2229) by [@expo-bot](https://github.com/expo-bot))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2230](https://github.com/expo/eas-cli/pull/2230) by [@expo-bot](https://github.com/expo-bot))
- Reword update configuration warning. ([#2234](https://github.com/expo/eas-cli/pull/2234) by [@quinlanj](https://github.com/quinlanj))

 ## [7.2.0](https://github.com/expo/eas-cli/releases/tag/v7.2.0) - 2024-02-11

@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "7.8.2",
+  "version": "7.2.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -85,7 +85,6 @@ eas --help COMMAND
 * [`eas channel:view [NAME]`](#eas-channelview-name)
 * [`eas config`](#eas-config)
 * [`eas credentials`](#eas-credentials)
-* [`eas credentials:configure-build`](#eas-credentialsconfigure-build)
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:delete`](#eas-devicedelete)
 * [`eas device:list`](#eas-devicelist)
@@ -137,7 +136,7 @@ ALIASES
  $ eas login
 ```

-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -154,7 +153,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -171,7 +170,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -185,7 +184,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -216,7 +215,7 @@ EXAMPLES
  $ eas autocomplete --refresh-cache
 ```

-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/packages/eas-cli/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/src/commands/autocomplete/index.ts)_

 ## `eas branch:create [NAME]`

@@ -237,7 +236,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -258,7 +257,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -278,7 +277,7 @@ DESCRIPTION
  list all branches
 ```

-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -298,7 +297,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -321,7 +320,7 @@ DESCRIPTION
  view a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/view.ts)_

 ## `eas build`

@@ -330,33 +329,28 @@ start a build
 ```
 USAGE
  $ eas build [-p android|ios|all] [-e <value>] [--local] [--output <value>] [--wait] [--clear-cache]
-    [--auto-submit | --auto-submit-with-profile <value>] [-m <value>] [--build-logger-level
-    trace|debug|info|warn|error|fatal] [--json --non-interactive]
+    [--auto-submit | --auto-submit-with-profile <value>] [-m <value>] [--json --non-interactive]

 FLAGS
-  -e, --profile=PROFILE_NAME                                Name of the build profile from eas.json. Defaults to
-                                                            "production" if defined in eas.json.
-  -m, --message=<value>                                     A short message describing the build
+  -e, --profile=PROFILE_NAME               Name of the build profile from eas.json. Defaults to "production" if defined
+                                           in eas.json.
+  -m, --message=<value>                    A short message describing the build
  -p, --platform=(android|ios|all)
-  --auto-submit                                             Submit on build complete using the submit profile with the
-                                                            same name as the build profile
-  --auto-submit-with-profile=PROFILE_NAME                   Submit on build complete using the submit profile with
-                                                            provided name
-  --build-logger-level=(trace|debug|info|warn|error|fatal)  The level of logs to output during the build process.
-                                                            Defaults to "info".
-  --clear-cache                                             Clear cache before the build
-  --json                                                    Enable JSON output, non-JSON messages will be printed to
-                                                            stderr.
-  --local                                                   Run build locally [experimental]
-  --non-interactive                                         Run the command in non-interactive mode.
-  --output=<value>                                          Output path for local build
-  --[no-]wait                                               Wait for build(s) to complete
+  --auto-submit                            Submit on build complete using the submit profile with the same name as the
+                                           build profile
+  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
+  --clear-cache                            Clear cache before the build
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --local                                  Run build locally [experimental]
+  --non-interactive                        Run the command in non-interactive mode.
+  --output=<value>                         Output path for local build
+  --[no-]wait                              Wait for build(s) to complete

 DESCRIPTION
  start a build
 ```

-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -375,7 +369,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -392,7 +386,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/configure.ts)_

 ## `eas build:delete [BUILD_ID]`

@@ -411,7 +405,7 @@ DESCRIPTION
  delete a build
 ```

-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/delete.ts)_
+_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/delete.ts)_

 ## `eas build:inspect`

@@ -446,7 +440,7 @@ DESCRIPTION
  inspect the state of the project at specific build stages, useful for troubleshooting
 ```

-_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -487,7 +481,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/list.ts)_

 ## `eas build:resign`

@@ -513,7 +507,7 @@ DESCRIPTION
  re-sign a build archive
 ```

-_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -539,7 +533,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

-_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -548,7 +542,7 @@ submit app binary to App Store and/or Play Store
 ```
 USAGE
  $ eas build:submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
-    [--verbose] [--wait] [--verbose-fastlane] [--non-interactive]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
@@ -560,7 +554,6 @@ FLAGS
  --path=<value>                    Path to the .apk/.aab/.ipa file
  --url=<value>                     App archive url
  --verbose                         Always print logs from EAS Submit
-  --verbose-fastlane                Enable verbose logging for the submission process
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
@@ -589,7 +582,7 @@ DESCRIPTION
  get the latest version from EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/get.ts)_

 ## `eas build:version:set`

@@ -608,7 +601,7 @@ DESCRIPTION
  update version of an app
 ```

-_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/set.ts)_

 ## `eas build:version:sync`

@@ -627,7 +620,7 @@ DESCRIPTION
  update a version in native code with a value stored on EAS servers
 ```

-_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

@@ -644,7 +637,7 @@ DESCRIPTION
  view a build for your project
 ```

-_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -665,7 +658,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -687,7 +680,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -707,7 +700,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/list.ts)_

 ## `eas channel:rollout [CHANNEL]`

@@ -739,7 +732,7 @@ DESCRIPTION
  Roll a new branch out on a channel incrementally.
 ```

-_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -762,7 +755,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/view.ts)_

 ## `eas config`

@@ -783,7 +776,7 @@ DESCRIPTION
  display project configuration (app.json + eas.json)
 ```

-_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/config.ts)_

 ## `eas credentials`

@@ -800,25 +793,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/credentials/index.ts)_
-
-## `eas credentials:configure-build`
-
-Set up credentials for building your project.
-
-```
-USAGE
-  $ eas credentials:configure-build [-p android|ios] [-e <value>]
-
-FLAGS
-  -e, --profile=PROFILE_NAME    The name of the build profile in eas.json.
-  -p, --platform=(android|ios)
-
-DESCRIPTION
-  Set up credentials for building your project.
-```
-
-_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/credentials/configure-build.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -832,7 +807,7 @@ DESCRIPTION
  register new Apple Devices to use for internal distribution
 ```

-_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -852,7 +827,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -873,7 +848,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/list.ts)_

 ## `eas device:rename`

@@ -894,7 +869,7 @@ DESCRIPTION
  rename a registered device
 ```

-_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -908,7 +883,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -922,7 +897,7 @@ DESCRIPTION
  display environment info
 ```

-_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

@@ -942,7 +917,7 @@ DESCRIPTION
  Display help for eas.
 ```

-_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/packages/eas-cli/src/commands/help.ts)_
+_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/src/commands/help.ts)_

 ## `eas init`

@@ -1010,7 +985,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -1027,7 +1002,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -1044,7 +1019,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/push.ts)_

 ## `eas open`

@@ -1058,7 +1033,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

-_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/open.ts)_

 ## `eas project:info`

@@ -1072,7 +1047,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -1094,7 +1069,7 @@ ALIASES
  $ eas init
 ```

-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -1117,7 +1092,7 @@ DESCRIPTION
  create an environment secret on the current project or owner account
 ```

-_See code: [packages/eas-cli/src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -1135,7 +1110,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [packages/eas-cli/src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -1149,7 +1124,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [packages/eas-cli/src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/list.ts)_

 ## `eas secret:push`

@@ -1169,7 +1144,7 @@ DESCRIPTION
  read environment secrets from env file and store on the server
 ```

-_See code: [packages/eas-cli/src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/push.ts)_

 ## `eas submit`

@@ -1178,7 +1153,7 @@ submit app binary to App Store and/or Play Store
 ```
 USAGE
  $ eas submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
-    [--verbose] [--wait] [--verbose-fastlane] [--non-interactive]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
@@ -1190,7 +1165,6 @@ FLAGS
  --path=<value>                    Path to the .apk/.aab/.ipa file
  --url=<value>                     App archive url
  --verbose                         Always print logs from EAS Submit
-  --verbose-fastlane                Enable verbose logging for the submission process
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
@@ -1200,7 +1174,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/submit.ts)_

 ## `eas update`

@@ -1233,7 +1207,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1251,7 +1225,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1272,7 +1246,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1294,7 +1268,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1321,7 +1295,7 @@ DESCRIPTION
  roll back to an existing update
 ```

-_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/republish.ts)_

 ## `eas update:roll-back-to-embedded`

@@ -1348,7 +1322,7 @@ DESCRIPTION
  roll back to the embedded update
 ```

-_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/roll-back-to-embedded.ts)_

 ## `eas update:rollback`

@@ -1367,7 +1341,7 @@ DESCRIPTION
  roll back to an embedded update or an existing update
 ```

-_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/rollback.ts)_

 ## `eas update:view GROUPID`

@@ -1387,7 +1361,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1408,7 +1382,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1428,7 +1402,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1446,7 +1420,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1468,7 +1442,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1485,7 +1459,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.8.2/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -1,22 +1,22 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "7.8.2",
+  "version": "7.2.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "1.7.0",
+    "@expo/apple-utils": "1.4.0",
    "@expo/code-signing-certificates": "0.0.5",
    "@expo/config": "8.5.4",
    "@expo/config-plugins": "7.8.4",
    "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.95",
-    "@expo/eas-json": "7.8.0",
+    "@expo/eas-build-job": "1.0.70",
+    "@expo/eas-json": "7.1.3",
+    "@expo/fingerprint": "0.6.0",
    "@expo/json-file": "8.2.37",
-    "@expo/logger": "1.0.57",
    "@expo/multipart-body-parser": "1.1.0",
    "@expo/osascript": "2.0.33",
    "@expo/package-manager": "1.1.2",
@@ -28,7 +28,7 @@
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.95",
+    "@expo/steps": "1.0.70",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^1.26.2",
    "@oclif/plugin-autocomplete": "^2.3.10",
@@ -77,7 +77,7 @@
    "resolve-from": "5.0.0",
    "semver": "7.5.4",
    "slash": "3.0.0",
-    "tar": "6.2.1",
+    "tar": "6.2.0",
    "terminal-link": "2.1.1",
    "tslib": "2.6.2",
    "turndown": "7.1.2",
@@ -110,7 +110,7 @@
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.27.2",
    "eslint-plugin-graphql": "4.0.0",
-    "express": "4.19.2",
+    "express": "4.18.2",
    "memfs": "3.4.13",
    "mockdate": "3.0.5",
    "nock": "13.4.0",
@@ -3,7 +3,8 @@ const fs = require('fs/promises');
 (async () => {
  // Patch `oclif readme` path and link generation
  let readmeContent = await fs.readFile('README.md', 'utf8');
-  readmeContent = readmeContent.replace(/src\/commands/g, 'packages/eas-cli/src/commands');
+  readmeContent = readmeContent.replace(/\[build\//g, '[src/');
+  readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
  await fs.writeFile('README.md', readmeContent);

  // eslint-disable-next-line no-console
@@ -3,7 +3,13 @@ import { v4 as uuid } from 'uuid';

 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToCancelAsync } from '../../commands/build/cancel';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { confirmAsync, selectAsync } from '../../prompts';

@@ -85,6 +91,7 @@ function createMockBuildFragment({
      },
    },
    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
    isForIosSimulator: false,
  };
 }
@@ -3,7 +3,13 @@ import { v4 as uuid } from 'uuid';

 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToDeleteAsync } from '../../commands/build/delete';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { confirmAsync, selectAsync } from '../../prompts';

@@ -85,6 +91,7 @@ function createMockBuildFragment({
      },
    },
    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
    isForIosSimulator: false,
  };
 }
@@ -8,7 +8,7 @@ import os from 'os';
 import path from 'path';

 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -19,7 +19,7 @@ import {
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 afterAll(async () => {
  // do not remove the following line
@@ -1,4 +1,4 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -112,7 +112,7 @@ export async function prepareAndroidBuildAsync(
    prepareJobAsync: async (
      ctx: BuildContext<Platform.ANDROID>,
      jobData: JobData<AndroidCredentials>
-    ): Promise<Android.Job> => {
+    ): Promise<Job> => {
      return await prepareJobAsync(ctx, jobData);
    },
    sendBuildRequestAsync: async (
@@ -2,7 +2,6 @@ import { Android } from '@expo/eas-build-job';

 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
 import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
  transformBuildMode,
  transformBuildTrigger,
  transformProjectArchive,
@@ -30,9 +29,6 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    experimental: job.experimental,
    mode: transformBuildMode(job.mode),
    customBuildConfig: job.customBuildConfig,
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
  };
 }

@@ -3,15 +3,16 @@ import {
  ArchiveSource,
  BuildMode,
  BuildTrigger,
+  Job,
  Platform,
-  sanitizeBuildJob,
+  sanitizeJob,
 } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';

 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';

@@ -28,7 +29,7 @@ const cacheDefaults = {
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
-): Promise<Android.Job> {
+): Promise<Job> {
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
@@ -53,7 +54,7 @@ export async function prepareJobAsync(
  }

  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
+    ? getCustomBuildConfigPath(buildProfile.config)
    : undefined;

  const job: Android.Job = {
@@ -102,8 +103,7 @@ export async function prepareJobAsync(
        path: maybeCustomBuildConfigPath,
      },
    }),
-    loggerLevel: ctx.loggerLevel,
  };

-  return sanitizeBuildJob(job) as Android.Job;
+  return sanitizeJob(job);
 }
@@ -24,7 +24,9 @@ export async function syncProjectConfigurationAsync({
  localAutoIncrement?: AndroidVersionAutoIncrement;
  vcsClient: Client;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
@@ -100,7 +100,9 @@ export async function maybeResolveVersionsAsync(
  buildProfile: BuildProfile<Platform.ANDROID>,
  vcsClient: Client
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const buildGradle = await getAppBuildGradleAsync(projectDir);
    try {
@@ -1,10 +1,4 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  BuildJob,
-  Metadata,
-  Platform,
-} from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -32,12 +26,7 @@ import { transformMetadata } from './graphql';
 import { LocalBuildMode, runLocalBuildAsync } from './local';
 import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import {
-  LocalFile,
-  makeProjectMetadataFileAsync,
-  makeProjectTarballAsync,
-  reviewAndCommitChangesAsync,
-} from './utils/repository';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
@@ -76,14 +65,14 @@ export interface JobData<Credentials> {
  projectArchive: ArchiveSource;
 }

-interface Builder<TPlatform extends Platform, Credentials, TJob extends BuildJob> {
+interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
  ctx: BuildContext<TPlatform>;

  ensureCredentialsAsync(
    ctx: BuildContext<TPlatform>
  ): Promise<CredentialsResult<Credentials> | undefined>;
  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<BuildJob>;
+  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
  sendBuildRequestAsync(
    appId: string,
    job: TJob,
@@ -108,7 +97,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
  TPlatform extends Platform,
  Credentials,
-  TJob extends BuildJob,
+  TJob extends Job,
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
  const { ctx } = builder;
  const credentialsResult = await withAnalyticsAsync(
@@ -144,10 +133,9 @@ export async function prepareBuildRequestForPlatformAsync<

  let projectArchive: ArchiveSource | undefined;
  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    const projectPath = (await makeProjectTarballAsync(ctx.vcsClient)).path;
    projectArchive = {
      type: ArchiveSourceType.PATH,
-      path: projectPath,
+      path: (await makeProjectTarballAsync(ctx.vcsClient)).path,
    };
  } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
    projectArchive = {
@@ -157,7 +145,7 @@ export async function prepareBuildRequestForPlatformAsync<
  } else if (!ctx.localBuildOptions.localBuildMode) {
    projectArchive = {
      type: ArchiveSourceType.GCS,
-      ...(await uploadProjectAsync(ctx)),
+      bucketKey: await uploadProjectAsync(ctx),
    };
  }
  assert(projectArchive);
@@ -243,10 +231,7 @@ export function handleBuildRequestError(error: any, platform: Platform): never {

 async function uploadProjectAsync<TPlatform extends Platform>(
  ctx: BuildContext<TPlatform>
-): Promise<{
-  bucketKey: string;
-  metadataLocation?: string;
-}> {
+): Promise<string> {
  let projectTarballPath;
  try {
    return await withAnalyticsAsync(
@@ -275,6 +260,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        }

        projectTarballPath = projectTarball.path;
+
        const bucketKey = await uploadFileAtPathToGCSAsync(
          ctx.graphqlClient,
          UploadSessionType.EasBuildGcsProjectSources,
@@ -288,11 +274,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
            completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
          })
        );
-        const { metadataLocation } = await uploadMetadataFileAsync<TPlatform>(projectTarball, ctx);
-        if (metadataLocation) {
-          return { bucketKey, metadataLocation };
-        }
-        return { bucketKey };
+        return bucketKey;
      },
      {
        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
@@ -303,11 +285,9 @@ async function uploadProjectAsync<TPlatform extends Platform>(
    );
  } catch (err: any) {
    let errMessage = 'Failed to upload the project tarball to EAS Build';
-
    if (err.message) {
      errMessage += `\n\nReason: ${err.message}`;
    }
-
    throw new EasBuildProjectArchiveUploadError(errMessage);
  } finally {
    if (projectTarballPath) {
@@ -316,49 +296,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
  }
 }

-async function uploadMetadataFileAsync<TPlatform extends Platform>(
-  projectTarball: LocalFile,
-  ctx: BuildContext<TPlatform>
-): Promise<{ metadataLocation: string | null }> {
-  let projectMetadataFile: LocalFile | null = null;
-  try {
-    projectMetadataFile = await makeProjectMetadataFileAsync(projectTarball.path);
-
-    const metadataLocation = await uploadFileAtPathToGCSAsync(
-      ctx.graphqlClient,
-      UploadSessionType.EasBuildGcsProjectMetadata,
-      projectMetadataFile.path,
-      createProgressTracker({
-        total: projectMetadataFile.size,
-        message: ratio =>
-          `Uploading metadata to EAS Build (${formatBytes(
-            projectMetadataFile!.size * ratio
-          )} / ${formatBytes(projectMetadataFile!.size)})`,
-        completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
-      })
-    );
-    return { metadataLocation };
-  } catch (err: any) {
-    let errMessage = 'Failed to upload metadata to EAS Build';
-
-    if (err.message) {
-      errMessage += `\n\nReason: ${err.message}`;
-    }
-
-    Log.warn(errMessage);
-    return { metadataLocation: null };
-  } finally {
-    if (projectMetadataFile) {
-      await fs.remove(projectMetadataFile.path);
-    }
-  }
-}
-
-async function sendBuildRequestAsync<
-  TPlatform extends Platform,
-  Credentials,
-  TJob extends BuildJob,
->(
+async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
  builder: Builder<TPlatform, Credentials, TJob>,
  job: TJob,
  metadata: Metadata,
@@ -40,7 +40,7 @@ async function configureAsync({
  nonInteractive,
  vcsClient,
 }: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync(vcsClient, nonInteractive);
+  await maybeBailOnRepoStatusAsync(vcsClient);

  await createEasJsonAsync(projectDir, vcsClient);

@@ -1,7 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import { NodePackageManager } from '@expo/package-manager';

 import { LocalBuildOptions } from './local';
@@ -61,5 +60,4 @@ export interface BuildContext<T extends Platform> {
  developmentClient: boolean;
  requiredPackageManager: NodePackageManager['name'] | null;
  vcsClient: Client;
-  loggerLevel?: LoggerLevel;
 }
@@ -1,7 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
-import { LoggerLevel } from '@expo/logger';
 import { resolvePackageManager } from '@expo/package-manager';
 import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
@@ -40,7 +39,6 @@ export async function createBuildContextAsync<T extends Platform>({
  vcsClient,
  getDynamicPrivateProjectConfigAsync,
  customBuildConfigMetadata,
-  buildLoggerLevel,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -59,12 +57,13 @@ export async function createBuildContextAsync<T extends Platform>({
  vcsClient: Client;
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  buildLoggerLevel?: LoggerLevel;
 }): Promise<BuildContext<T>> {
  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);
  const developmentClient =
@@ -139,7 +138,6 @@ export async function createBuildContextAsync<T extends Platform>({
    customBuildConfigMetadata,
    developmentClient,
    requiredPackageManager,
-    loggerLevel: buildLoggerLevel,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -6,7 +6,6 @@ import {
  Metadata,
  Workflow,
 } from '@expo/eas-build-job';
-import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';

 import {
@@ -19,7 +18,6 @@ import {
  BuildTrigger as GraphQLBuildTrigger,
  ProjectArchiveSourceInput,
  ProjectArchiveSourceType,
-  WorkerLoggerLevel,
 } from '../graphql/generated';

 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
@@ -27,7 +25,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
    return {
      type: ProjectArchiveSourceType.Gcs,
      bucketKey: archiveSource.bucketKey,
-      metadataLocation: archiveSource.metadataLocation,
    };
  } else if (archiveSource.type === ArchiveSourceType.URL) {
    return {
@@ -110,12 +107,3 @@ export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildT
  }
  throw new Error('Unknown build trigger');
 }
-
-export const loggerLevelToGraphQLWorkerLoggerLevel: Record<LoggerLevel, WorkerLoggerLevel> = {
-  [LoggerLevel.TRACE]: WorkerLoggerLevel.Trace,
-  [LoggerLevel.DEBUG]: WorkerLoggerLevel.Debug,
-  [LoggerLevel.INFO]: WorkerLoggerLevel.Info,
-  [LoggerLevel.WARN]: WorkerLoggerLevel.Warn,
-  [LoggerLevel.ERROR]: WorkerLoggerLevel.Error,
-  [LoggerLevel.FATAL]: WorkerLoggerLevel.Fatal,
-};
@@ -6,7 +6,7 @@ import os from 'os';
 import type { XCBuildConfiguration } from 'xcode';

 import { readPlistAsync } from '../../../utils/plist';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -19,7 +19,7 @@ import {

 jest.mock('fs');

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 const getXCBuildConfigurationFromPbxproj = jest.spyOn(
  IOSConfig.Target,
@@ -1,4 +1,4 @@
-import { Ios, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';

 import { ensureIosCredentialsAsync } from './credentials';
@@ -94,7 +94,7 @@ export async function prepareIosBuildAsync(
    prepareJobAsync: async (
      ctx: BuildContext<Platform.IOS>,
      jobData: JobData<IosCredentials>
-    ): Promise<Ios.Job> => {
+    ): Promise<Job> => {
      return await prepareJobAsync(ctx, {
        ...jobData,
        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
@@ -3,7 +3,6 @@ import nullthrows from 'nullthrows';

 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
 import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
  transformBuildMode,
  transformBuildTrigger,
  transformProjectArchive,
@@ -32,9 +31,6 @@ export function transformJob(job: Ios.Job): IosJobInput {
    experimental: job.experimental,
    mode: transformBuildMode(job.mode),
    customBuildConfig: job.customBuildConfig,
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
  };
 }

@@ -3,8 +3,9 @@ import {
  BuildMode,
  BuildTrigger,
  Ios,
+  Job,
  Platform,
-  sanitizeBuildJob,
+  sanitizeJob,
 } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import nullthrows from 'nullthrows';
@@ -13,7 +14,7 @@ import slash from 'slash';

 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { IosJobSecretsInput } from '../../graphql/generated';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';

@@ -31,7 +32,7 @@ const cacheDefaults = {
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.IOS>,
  jobData: JobData
-): Promise<Ios.Job> {
+): Promise<Job> {
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
  const projectRootDirectory =
@@ -45,7 +46,7 @@ export async function prepareJobAsync(
  }

  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
+    ? getCustomBuildConfigPath(buildProfile.config)
    : undefined;

  const job: Ios.Job = {
@@ -97,9 +98,8 @@ export async function prepareJobAsync(
        path: maybeCustomBuildConfigPath,
      },
    }),
-    loggerLevel: ctx.loggerLevel,
  };
-  return sanitizeBuildJob(job) as Ios.Job;
+  return sanitizeJob(job);
 }

 export function prepareCredentialsToResign(credentials: IosCredentials): IosJobSecretsInput {
@@ -22,7 +22,9 @@ export async function syncProjectConfigurationAsync({
  localAutoIncrement?: IosVersionAutoIncrement;
  vcsClient: Client;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
@@ -114,7 +114,9 @@ export async function readShortVersionAsync(
  buildSettings: XCBuildConfiguration['buildSettings'],
  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);

@@ -136,7 +138,9 @@ export async function readBuildNumberAsync(
  buildSettings: XCBuildConfiguration['buildSettings'],
  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
    return (
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.100';
+const PLUGIN_PACKAGE_VERSION = '1.0.60';

 export enum LocalBuildMode {
  /**
@@ -1,3 +1,4 @@
+import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
@@ -14,7 +15,6 @@ import {
  isClassicUpdatesSupportedAsync,
  isExpoUpdatesInstalled,
 } from '../project/projectUtils';
-import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
 import {
  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -37,7 +37,9 @@ export async function collectMetadataAsync<T extends Platform>(
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: (await resolveRuntimeVersionAsync(ctx)) ?? undefined,
+    runtimeVersion:
+      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
+      undefined,
    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
    ...channelOrReleaseChannel,
    distribution,
@@ -9,7 +9,6 @@ import {
  ResourceClass,
  SubmitProfile,
 } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -20,7 +19,7 @@ import { ensureProjectConfiguredAsync } from './configure';
 import { BuildContext } from './context';
 import { createBuildContextAsync } from './createContext';
 import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildMode, LocalBuildOptions } from './local';
+import { LocalBuildOptions } from './local';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from './utils/repository';
@@ -94,7 +93,6 @@ export interface BuildFlags {
  localBuildOptions: LocalBuildOptions;
  resourceClass?: ResourceClass;
  message?: string;
-  buildLoggerLevel?: LoggerLevel;
 }

 export async function runBuildAndSubmitAsync(
@@ -134,36 +132,6 @@ export async function runBuildAndSubmitAsync(
    }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
  );

-  for (const buildProfile of buildProfiles) {
-    if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${buildProfile.profile.image}". This tag is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/`
-      );
-    }
-
-    if (
-      buildProfile.profile.image &&
-      [
-        'macos-monterey-12.4-xcode-13.4',
-        'macos-monterey-12.3-xcode-13.3',
-        'macos-monterey-12.1-xcode-13.2',
-        'macos-ventura-13.4-xcode-14.3.1',
-        'macos-ventura-13.3-xcode-14.3',
-        'macos-monterey-12.6-xcode-14.2',
-        'macos-monterey-12.6-xcode-14.1',
-        'macos-monterey-12.6-xcode-14.0',
-      ].includes(buildProfile.profile.image)
-    ) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${
-          buildProfile.profile.image
-        }". This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting "macos-sonoma-14.4-xcode-15.3" or "latest" as your image value. This image will be removed from EAS Build on May 29th, 2024. ${learnMore(
-          'https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates'
-        )}`
-      );
-    }
-  }
-
  await ensureExpoDevClientInstalledForDevClientBuildsAsync({
    projectDir,
    nonInteractive: flags.nonInteractive,
@@ -212,23 +180,13 @@ export async function runBuildAndSubmitAsync(
    buildCtxByPlatform[platform] = buildCtx;
  }

-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
+  if (flags.localBuildOptions.localBuildMode) {
    return;
  }

-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-    const startedBuild = await BuildQuery.byIdAsync(
-      graphqlClient,
-      nullthrows(process.env.EAS_BUILD_ID, 'EAS_BUILD_ID is not defined')
-    );
-    startedBuilds.push({ build: startedBuild, buildProfile: buildProfiles[0] });
-  }
-
-  if (!flags.localBuildOptions.localBuildMode) {
-    Log.newLine();
-    printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
-    Log.newLine();
-  }
+  Log.newLine();
+  printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
+  Log.newLine();

  const submissions: SubmissionFragment[] = [];
  if (flags.autoSubmit) {
@@ -261,15 +219,9 @@ export async function runBuildAndSubmitAsync(
      submissions.push(submission);
    }

-    if (!flags.localBuildOptions.localBuildMode) {
-      Log.newLine();
-      printSubmissionDetailsUrls(submissions);
-      Log.newLine();
-    }
-  }
-
-  if (flags.localBuildOptions.localBuildMode) {
-    return;
+    Log.newLine();
+    printSubmissionDetailsUrls(submissions);
+    Log.newLine();
  }

  if (!flags.wait) {
@@ -362,7 +314,6 @@ async function prepareAndStartBuildAsync({
    vcsClient,
    getDynamicPrivateProjectConfigAsync,
    customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel,
  });

  if (moreBuilds) {
@@ -470,7 +421,6 @@ async function prepareAndStartSubmissionAsync({
    projectId: buildCtx.projectId,
    exp: buildCtx.exp,
    vcsClient: buildCtx.vcsClient,
-    isVerboseFastlaneEnabled: false,
  });

  if (moreBuilds) {
@@ -43,7 +43,11 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  );

  const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
+    platformsToCheck.map(platform =>
+      resolveWorkflowAsync(projectDir, platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    )
  );

  Log.newLine();
@@ -12,10 +12,7 @@ import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
 import { Client } from '../../vcs/vcs';

-export async function maybeBailOnRepoStatusAsync(
-  vcsClient: Client,
-  nonInteractive: boolean
-): Promise<void> {
+export async function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<void> {
  if (!(await vcsClient.isCommitRequiredAsync())) {
    return;
  }
@@ -31,11 +28,6 @@ export async function maybeBailOnRepoStatusAsync(
  });

  if (!answer) {
-    if (nonInteractive) {
-      Log.log('The following files need to be committed:');
-      await vcsClient.showChangedFilesAsync();
-    }
-
    throw new Error('Commit all changes. Aborting...');
  }
 }
@@ -55,9 +47,6 @@ export async function ensureRepoIsCleanAsync(
    )}.`
  );
  if (nonInteractive) {
-    Log.log('The following files need to be committed:');
-    await vcsClient.showChangedFilesAsync();
-
    throw new Error('Commit all changes. Aborting...');
  }
  const answer = await confirmAsync({
@@ -94,55 +83,9 @@ export async function commitPromptAsync(
  });
 }

-export type LocalFile = {
-  path: string;
-  size: number;
-};
-
-export async function makeProjectMetadataFileAsync(archivePath: string): Promise<LocalFile> {
-  const spinner = ora('Creating project metadata file');
-  const timerLabel = 'makeProjectMetadataFileAsync';
-  const timer = setTimeout(
-    () => {
-      spinner.start();
-    },
-    Log.isDebug ? 1 : 1000
-  );
-  startTimer(timerLabel);
-
-  const metadataLocation = path.join(getTmpDirectory(), `${uuidv4()}-eas-build-metadata.json`);
-  const archiveContent: string[] = [];
-
-  try {
-    await tar.list({
-      file: archivePath,
-      onentry: (entry: tar.ReadEntry) => {
-        if (entry.type === 'File' && !entry.path.includes('.git/')) {
-          archiveContent.push(entry.path);
-        }
-      },
-    });
-
-    await fs.writeJSON(metadataLocation, {
-      archiveContent,
-    });
-  } catch (e) {
-    clearTimeout(timer);
-    if (spinner.isSpinning) {
-      spinner.fail();
-    }
-    throw e;
-  }
-  clearTimeout(timer);
-
-  const duration = endTimer(timerLabel);
-  const prettyTime = formatMilliseconds(duration);
-  spinner.succeed(`Created project metadata file ${chalk.dim(prettyTime)}`);
-
-  return { path: metadataLocation, size: await fs.stat(metadataLocation).then(stat => stat.size) };
-}
-
-export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalFile> {
+export async function makeProjectTarballAsync(
+  vcsClient: Client
+): Promise<{ path: string; size: number }> {
  const spinner = ora('Compressing project files');

  await fs.mkdirp(getTmpDirectory());
@@ -164,7 +107,9 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
  startTimer(compressTimerLabel);

  try {
-    await vcsClient.makeShallowCopyAsync(shallowClonePath);
+    await vcsClient.makeShallowCopyAsync(shallowClonePath, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
    await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
      '.',
    ]);
@@ -32,7 +32,9 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
  if (
    (await fs.pathExists(absGoogleServicesFilePath)) &&
    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath), {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })))
  ) {
    Log.warn(
      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -24,7 +24,6 @@ import {
 } from '../analytics/AnalyticsManager';
 import Log from '../log';
 import SessionManager from '../user/SessionManager';
-import { Client } from '../vcs/vcs';

 export type ContextInput<
  T extends {
@@ -140,7 +139,7 @@ export default abstract class EasCommand extends Command {
    } = object,
  >(
    commandClass: { contextDefinition: ContextInput<C> },
-    { nonInteractive, vcsClientOverride }: { nonInteractive: boolean; vcsClientOverride?: Client }
+    { nonInteractive }: { nonInteractive: boolean }
  ): Promise<ContextOutput<C>> {
    const contextDefinition = commandClass.contextDefinition;

@@ -153,7 +152,6 @@ export default abstract class EasCommand extends Command {
          nonInteractive,
          sessionManager: this.sessionManager,
          analytics: this.analytics,
-          vcsClientOverride,
        }),
      ]);
    }
@@ -1,12 +1,10 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
 import SessionManager from '../../user/SessionManager';
-import { Client } from '../../vcs/vcs';

 export interface ContextOptions {
  sessionManager: SessionManager;
  analytics: Analytics;
  nonInteractive: boolean;
-  vcsClientOverride?: Client;
 }

 export default abstract class ContextField<T> {
@@ -1,18 +1,9 @@
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-
 import ContextField from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { resolveVcsClient } from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { Client } from '../../vcs/vcs';

 export default class VcsClientContextField extends ContextField<Client> {
-  async getValueAsync({ vcsClientOverride }: { vcsClientOverride?: Client }): Promise<Client> {
-    if (vcsClientOverride) {
-      return vcsClientOverride;
-    }
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
-    return resolveVcsClient(config?.requireCommit);
+  async getValueAsync(): Promise<Client> {
+    return getVcsClient();
  }
 }
@@ -8,7 +8,8 @@ import semver from 'semver';

 import { learnMore } from '../../../log';
 import { easCliVersion } from '../../../utils/easCli';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient, setVcsClient } from '../../../vcs';
+import GitClient from '../../../vcs/clients/git';

 async function applyCliConfigAsync(projectDir: string): Promise<void> {
  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
@@ -18,6 +19,9 @@ async function applyCliConfigAsync(projectDir: string): Promise<void> {
      `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
    );
  }
+  if (config?.requireCommit) {
+    setVcsClient(new GitClient());
+  }
 }

 async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
@@ -88,7 +92,7 @@ export async function findProjectRootAsync({
  } else {
    let vcsRoot;
    try {
-      vcsRoot = path.normalize(await resolveVcsClient().getRootPathAsync());
+      vcsRoot = path.normalize(await getVcsClient().getRootPathAsync());
    } catch {}
    if (vcsRoot && vcsRoot.startsWith(projectRootDir) && vcsRoot !== projectRootDir) {
      throw new Error(
@@ -72,14 +72,18 @@ export default class BuildConfigure extends EasCommand {
    // configure expo-updates
    if (expoUpdatesIsInstalled) {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
        if (workflow === Workflow.GENERIC) {
          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
        if (workflow === Workflow.GENERIC) {
          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
        }
@@ -1,6 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import figures from 'figures';
@@ -34,7 +33,6 @@ interface RawBuildFlags {
  'auto-submit-with-profile'?: string;
  'resource-class'?: ResourceClass;
  message?: string;
-  'build-logger-level'?: LoggerLevel;
 }

 export default class Build extends EasCommand {
@@ -100,10 +98,6 @@ export default class Build extends EasCommand {
      char: 'm',
      description: 'A short message describing the build',
    }),
-    'build-logger-level': Flags.enum({
-      description: 'The level of logs to output during the build process. Defaults to "info".',
-      options: Object.values(LoggerLevel),
-    }),
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -216,7 +210,6 @@ export default class Build extends EasCommand {
      submitProfile: flags['auto-submit-with-profile'] ?? profile,
      resourceClass: flags['resource-class'],
      message,
-      buildLoggerLevel: flags['build-logger-level'],
    };
  }

@@ -94,7 +94,9 @@ export default class BuildInspect extends EasCommand {

    if (flags.stage === InspectStage.ARCHIVE) {
      await vcsClient.ensureRepoExistsAsync();
-      await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
+      await vcsClient.makeShallowCopyAsync(tmpWorkingdir, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
    } else {
      try {
@@ -6,6 +6,7 @@ import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
+import { setVcsClient } from '../../vcs';
 import GitNoCommitClient from '../../vcs/clients/gitNoCommit';

 /**
@@ -29,17 +30,6 @@ export default class BuildInternal extends EasCommand {
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
-    'auto-submit': Flags.boolean({
-      default: false,
-      description:
-        'Submit on build complete using the submit profile with the same name as the build profile',
-      exclusive: ['auto-submit-with-profile'],
-    }),
-    'auto-submit-with-profile': Flags.string({
-      description: 'Submit on build complete using the submit profile with provided name',
-      helpValue: 'PROFILE_NAME',
-      exclusive: ['auto-submit'],
-    }),
  };

  static override contextDefinition = {
@@ -63,9 +53,10 @@ export default class BuildInternal extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildInternal, {
      nonInteractive: true,
-      vcsClientOverride: new GitNoCommitClient(),
    });

+    setVcsClient(new GitNoCommitClient());
+
    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);

    await runBuildAndSubmitAsync(
@@ -80,11 +71,10 @@ export default class BuildInternal extends EasCommand {
        wait: false,
        clearCache: false,
        json: true,
-        autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
+        autoSubmit: false,
        localBuildOptions: {
          localBuildMode: LocalBuildMode.INTERNAL,
        },
-        submitProfile: flags['auto-submit-with-profile'] ?? flags.profile,
      },
      actor,
      getDynamicPrivateProjectConfigAsync
@@ -109,7 +109,9 @@ export default class BuildVersionSyncView extends EasCommand {
        toAppPlatform(profileInfo.platform),
        applicationIdentifier
      );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
      if (!remoteVersions?.buildVersion) {
        Log.warn(
          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
@@ -1,7 +1,7 @@
 import { Flags } from '@oclif/core';

-import EasCommand from '../../commandUtils/EasCommand';
-import { SelectPlatform } from '../../credentials/manager/SelectPlatform';
+import EasCommand from '../commandUtils/EasCommand';
+import { SelectPlatform } from '../credentials/manager/SelectPlatform';

 export default class Credentials extends EasCommand {
  static override description = 'manage credentials';
@@ -1,64 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { Flags } from '@oclif/core';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { SelectBuildProfileFromEasJson } from '../../credentials/manager/SelectBuildProfileFromEasJson';
-import { SetUpBuildCredentialsCommandAction } from '../../credentials/manager/SetUpBuildCredentialsCommandAction';
-import { selectPlatformAsync } from '../../platform';
-
-export default class InitializeBuildCredentials extends EasCommand {
-  static override description = 'Set up credentials for building your project.';
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: [Platform.ANDROID, Platform.IOS],
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description: 'The name of the build profile in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(InitializeBuildCredentials);
-    const {
-      loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
-      getDynamicPrivateProjectConfigAsync,
-      analytics,
-      vcsClient,
-    } = await this.getContextAsync(InitializeBuildCredentials, {
-      nonInteractive: false,
-    });
-
-    const platform = await selectPlatformAsync(flags.platform);
-
-    const buildProfile =
-      flags.profile ??
-      (await new SelectBuildProfileFromEasJson(
-        privateProjectConfig.projectDir,
-        Platform.IOS
-      ).getProfileNameFromEasConfigAsync());
-
-    await new SetUpBuildCredentialsCommandAction(
-      actor,
-      graphqlClient,
-      vcsClient,
-      analytics,
-      privateProjectConfig ?? null,
-      getDynamicPrivateProjectConfigAsync,
-      platform,
-      buildProfile
-    ).runAsync();
-  }
-}
@@ -50,8 +50,12 @@ export default class Diagnostics extends EasCommand {
  }

  private async printWorkflowAsync(projectDir: string, vcsClient: Client): Promise<void> {
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });

    if (androidWorkflow === iosWorkflow) {
      Log.log(`    Project workflow: ${androidWorkflow}`);
@@ -1,4 +1,4 @@
-import { ConfigError, getProjectConfigDescription } from '@expo/config';
+import { getProjectConfigDescription } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -60,19 +60,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    modifications: Partial<ExpoConfig>
  ): Promise<void> {
-    let result;
-    try {
-      result = await createOrModifyExpoConfigAsync(projectDir, modifications);
-    } catch (error) {
-      if (error instanceof ConfigError && error.code === 'MODULE_NOT_FOUND') {
-        Log.warn(
-          'Cannot determine which native SDK version your project uses because the module `expo` is not installed.'
-        );
-        return;
-      } else {
-        throw error;
-      }
-    }
+    const result = await createOrModifyExpoConfigAsync(projectDir, modifications);
    switch (result.type) {
      case 'success':
        break;
@@ -33,7 +33,6 @@ interface RawCommandFlags {
  verbose: boolean;
  wait: boolean;
  'non-interactive': boolean;
-  'verbose-fastlane': boolean;
 }

 interface CommandFlags {
@@ -43,7 +42,6 @@ interface CommandFlags {
  verbose: boolean;
  wait: boolean;
  nonInteractive: boolean;
-  isVerboseFastlaneEnabled: boolean;
 }

 export default class Submit extends EasCommand {
@@ -85,10 +83,6 @@ export default class Submit extends EasCommand {
      default: true,
      allowNo: true,
    }),
-    'verbose-fastlane': Flags.boolean({
-      default: false,
-      description: 'Enable verbose logging for the submission process',
-    }),
    'non-interactive': Flags.boolean({
      default: false,
      description: 'Run command in non-interactive mode',
@@ -138,7 +132,6 @@ export default class Submit extends EasCommand {
        profile: submissionProfile.profile,
        archiveFlags: flagsWithPlatform.archiveFlags,
        nonInteractive: flagsWithPlatform.nonInteractive,
-        isVerboseFastlaneEnabled: flagsWithPlatform.isVerboseFastlaneEnabled,
        actor,
        graphqlClient,
        analytics,
@@ -182,7 +175,6 @@ export default class Submit extends EasCommand {
      wait,
      profile,
      'non-interactive': nonInteractive,
-      'verbose-fastlane': isVerboseFastlaneEnabled,
      ...archiveFlags
    } = flags;

@@ -203,7 +195,6 @@ export default class Submit extends EasCommand {
      wait,
      profile,
      nonInteractive,
-      isVerboseFastlaneEnabled,
    };
  }

@@ -7,13 +7,11 @@ import { instance, mock } from 'ts-mockito';

 import UpdatePublish from '..';
 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import { ensureChannelExistsAsync } from '../../../channel/queries';
 import {
  DynamicPrivateProjectConfigContextField,
  DynamicPublicProjectConfigContextField,
 } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import VcsClientContextField from '../../../commandUtils/context/VcsClientContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -23,7 +21,6 @@ import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { collectAssetsAsync, uploadAssetsAsync } from '../../../project/publish';
 import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
-import { resolveVcsClient } from '../../../vcs';

 const projectRoot = '/test-project';
 const commandOptions = { root: projectRoot } as any;
@@ -46,7 +43,6 @@ jest.mock('fs');
 jest.mock('@expo/config');
 jest.mock('@expo/config-plugins');
 jest.mock('../../../branch/queries');
-jest.mock('../../../channel/queries');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
 jest.mock('../../../update/configure');
 jest.mock('../../../update/getBranchNameFromChannelNameAsync');
@@ -96,16 +92,6 @@ describe(UpdatePublish.name, () => {
    );
  });

-  it('errors with both --channel and --no-channel', async () => {
-    const flags = ['--channel=channel123', '--no-channel'];
-
-    mockTestProject();
-
-    await expect(new UpdatePublish(flags, commandOptions).run()).rejects.toThrow(
-      'Cannot use --channel with --no-channel'
-    );
-  });
-
  it('creates a new update with --non-interactive, --branch, and --message', async () => {
    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];

@@ -159,31 +145,6 @@ describe(UpdatePublish.name, () => {
    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
  });

-  it('creates a new update with --no-channel', async () => {
-    const flags = ['--non-interactive', '--branch=branch123', '--message=abc', '--no-channel'];
-
-    const { platforms, runtimeVersion } = mockTestExport();
-
-    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
-    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
-      createdBranch: true,
-    });
-
-    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
-      platforms.map(platform => ({
-        ...updateStub,
-        runtimeVersion,
-        platform,
-      }))
-    );
-
-    await new UpdatePublish(flags, commandOptions).run();
-
-    expect(ensureChannelExistsAsync).not.toHaveBeenCalled();
-    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
-  });
-
  it('creates a new update with the public expo config', async () => {
    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];

@@ -304,9 +265,6 @@ function mockTestProject({
    featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
    graphqlClient,
  });
-  jest
-    .spyOn(VcsClientContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(resolveVcsClient());

  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
    id: '1234',
@@ -6,13 +6,11 @@ import path from 'path';
 import { instance, mock } from 'ts-mockito';

 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import { ensureChannelExistsAsync } from '../../../channel/queries';
 import {
  DynamicPrivateProjectConfigContextField,
  DynamicPublicProjectConfigContextField,
 } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import VcsClientContextField from '../../../commandUtils/context/VcsClientContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -21,7 +19,6 @@ import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
-import { resolveVcsClient } from '../../../vcs';
 import UpdateRollBackToEmbedded from '../roll-back-to-embedded';

 const projectRoot = '/test-project';
@@ -45,7 +42,6 @@ jest.mock('fs');
 jest.mock('@expo/config');
 jest.mock('@expo/config-plugins');
 jest.mock('../../../branch/queries');
-jest.mock('../../../channel/queries');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
 jest.mock('../../../project/projectUtils', () => ({
  ...jest.requireActual('../../../project/projectUtils'),
@@ -82,16 +78,6 @@ describe(UpdateRollBackToEmbedded.name, () => {
    );
  });

-  it('errors with both --channel and --no-channel', async () => {
-    const flags = ['--channel=channel123', '--no-channel'];
-
-    mockTestProject();
-
-    await expect(new UpdateRollBackToEmbedded(flags, commandOptions).run()).rejects.toThrow(
-      'Cannot use --channel with --no-channel'
-    );
-  });
-
  it('creates a roll back to embedded with --non-interactive, --branch, and --message', async () => {
    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];

@@ -149,42 +135,6 @@ describe(UpdateRollBackToEmbedded.name, () => {
    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
  });

-  it('creates a roll back to embedded with --no-channel', async () => {
-    const flags = ['--non-interactive', '--branch=branch123', '--message=abc', '--no-channel'];
-
-    const { projectId } = mockTestProject();
-    const platforms = ['android', 'ios'];
-    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
-
-    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
-    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
-      createdBranch: true,
-    });
-
-    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
-      platforms.map(platform => ({
-        ...updateStub,
-        runtimeVersion,
-        platform,
-      }))
-    );
-
-    await new UpdateRollBackToEmbedded(flags, commandOptions).run();
-
-    expect(ensureChannelExistsAsync).not.toHaveBeenCalled();
-    expect(ensureBranchExistsAsync).toHaveBeenCalledWith(
-      expect.any(Object), // graphql client
-      {
-        appId: projectId,
-        branchName: 'branchFromChannel',
-      }
-    );
-
-    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
-  });
-
  it('creates a roll back to embedded with the public expo config', async () => {
    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];

@@ -300,9 +250,6 @@ function mockTestProject({
    featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
    graphqlClient,
  });
-  jest
-    .spyOn(VcsClientContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(resolveVcsClient());

  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
    id: '1234',
@@ -64,7 +64,6 @@ type RawUpdateFlags = {
  'skip-bundler': boolean;
  'clear-cache': boolean;
  'private-key-path'?: string;
-  'no-channel': boolean;
  'non-interactive': boolean;
  json: boolean;
  /** @deprecated see UpdateRepublish command */
@@ -82,7 +81,6 @@ type UpdateFlags = {
  inputDir: string;
  skipBundler: boolean;
  clearCache: boolean;
-  noChannel: boolean;
  privateKeyPath?: string;
  json: boolean;
  nonInteractive: boolean;
@@ -145,10 +143,6 @@ export default class UpdatePublish extends EasCommand {
      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
      required: false,
    }),
-    'no-channel': Flags.boolean({
-      description: `Skip EAS channel creation.`,
-      default: false,
-    }),
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -170,7 +164,6 @@ export default class UpdatePublish extends EasCommand {
      skipBundler,
      clearCache,
      privateKeyPath,
-      noChannel: noChannelFlag,
      json: jsonFlag,
      nonInteractive,
      branchName: branchNameArg,
@@ -358,7 +351,7 @@ export default class UpdatePublish extends EasCommand {
      Log.withInfo(
        `${platformString} (maximum: ${assetLimitPerUpdateGroup} total per update). ${learnMore(
          'https://expo.fyi/eas-update-asset-limits',
-          { learnMoreMessage: 'Learn more about asset limits' }
+          { learnMoreMessage: 'Learn more about asset limits.' }
        )}`
      );
    } catch (e) {
@@ -371,6 +364,7 @@ export default class UpdatePublish extends EasCommand {
      platforms: realizedPlatforms,
      projectDir,
      vcsClient,
+      nonInteractive,
    });
    const runtimeToPlatformMapping =
      getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
@@ -379,7 +373,7 @@ export default class UpdatePublish extends EasCommand {
      appId: projectId,
      branchName,
    });
-    if (createdBranch && !noChannelFlag) {
+    if (createdBranch) {
      await ensureChannelExistsAsync(graphqlClient, {
        appId: projectId,
        branchId,
@@ -555,10 +549,6 @@ export default class UpdatePublish extends EasCommand {
      );
    }

-    if (channelName && flags['no-channel']) {
-      Errors.error('Cannot use --channel with --no-channel', { exit: 1 });
-    }
-
    if (flags.group || flags.republish) {
      // Pick the first flag set that is defined, in this specific order
      const args = [
@@ -586,7 +576,6 @@ export default class UpdatePublish extends EasCommand {
      clearCache: flags['clear-cache'],
      platform: flags.platform as RequestedPlatform,
      privateKeyPath: flags['private-key-path'],
-      noChannel: flags['no-channel'],
      nonInteractive,
      json: flags.json ?? false,
    };
@@ -54,7 +54,6 @@ type RawUpdateFlags = {
  message?: string;
  platform: string;
  'private-key-path'?: string;
-  'no-channel': boolean;
  'non-interactive': boolean;
  json: boolean;
 };
@@ -66,7 +65,6 @@ type UpdateFlags = {
  channelName?: string;
  updateMessage?: string;
  privateKeyPath?: string;
-  noChannel: boolean;
  json: boolean;
  nonInteractive: boolean;
 };
@@ -106,10 +104,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
      required: false,
    }),
-    'no-channel': Flags.boolean({
-      description: `Skip EAS channel creation.`,
-      default: false,
-    }),
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -128,7 +122,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      channelName: channelNameArg,
      updateMessage: updateMessageArg,
      privateKeyPath,
-      noChannel: noChannelFlag,
      json: jsonFlag,
      nonInteractive,
      branchName: branchNameArg,
@@ -195,17 +188,16 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      appId: projectId,
      branchName,
    });
-    if (createdBranch && !noChannelFlag) {
+    if (createdBranch) {
      await ensureChannelExistsAsync(graphqlClient, {
        appId: projectId,
        branchId,
        channelName: branchName,
      });
-      Log.withTick(
-        `Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`
-      );
    }

+    Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);
+
    const gitCommitHash = await vcsClient.getCommitHashAsync();
    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();

@@ -214,6 +206,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      platforms: realizedPlatforms,
      projectDir,
      vcsClient,
+      nonInteractive,
    });

    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
@@ -395,10 +388,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      );
    }

-    if (channelName && flags['no-channel']) {
-      Errors.error('Cannot use --channel with --no-channel', { exit: 1 });
-    }
-
    return {
      auto,
      branchName,
@@ -406,7 +395,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      updateMessage,
      platform: flags.platform as RequestedPlatform,
      privateKeyPath: flags['private-key-path'],
-      noChannel: flags['no-channel'],
      nonInteractive,
      json: flags.json ?? false,
    };
@@ -4,76 +4,27 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  GoogleServiceAccountKeyByAccountQuery,
  GoogleServiceAccountKeyFragment,
-  GoogleServiceAccountKeysPaginatedByAccountQuery,
 } from '../../../../../graphql/generated';
 import { GoogleServiceAccountKeyFragmentNode } from '../../../../../graphql/types/credentials/GoogleServiceAccountKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const GoogleServiceAccountKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<GoogleServiceAccountKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<GoogleServiceAccountKeyFragment>> => {
-      return await GoogleServiceAccountKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Google Service Account Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    GoogleServiceAccountKeysPaginatedByAccountQuery['account']['byName']['googleServiceAccountKeysPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<GoogleServiceAccountKeysPaginatedByAccountQuery>(
+        .query<GoogleServiceAccountKeyByAccountQuery>(
          gql`
-            query GoogleServiceAccountKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query GoogleServiceAccountKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  googleServiceAccountKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...GoogleServiceAccountKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  googleServiceAccountKeys {
+                    id
+                    ...GoogleServiceAccountKeyFragment
                  }
                }
              }
@@ -82,10 +33,6 @@ export const GoogleServiceAccountKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['GoogleServiceAccountKey'],
@@ -93,6 +40,6 @@ export const GoogleServiceAccountKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.googleServiceAccountKeysPaginated;
+    return data.account.byName.googleServiceAccountKeys;
  },
 };
@@ -48,13 +48,8 @@ export function formatDistributionCertificate(
    buildCredentials => buildCredentials.iosAppCredentials.app
  );
  if (apps.length) {
-    // iosAppBuildCredentialsList is capped at 20 on www
-    const appFullNames = apps
-      .map(app => app.fullName)
-      .slice(0, 19)
-      .join(',');
-    const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-    line += chalk.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
+    const appFullNames = apps.map(app => app.fullName).join(',');
+    line += chalk.gray(`\n    📲 Used by: ${appFullNames}`);
  }

  if (validSerialNumbers?.includes(serialNumber)) {
@@ -185,13 +185,8 @@ export function formatPushKey(

  const apps = pushKey.iosAppCredentialsList.map(appCredentials => appCredentials.app);
  if (apps.length) {
-    // iosAppCredentialsList is capped at 20 on www
-    const appFullNames = apps
-      .map(app => app.fullName)
-      .slice(0, 19)
-      .join(',');
-    const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-    line += chalk.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
+    const appFullNames = apps.map(app => app.fullName).join(',');
+    line += chalk.gray(`\n    📲 Used by: ${appFullNames}`);
  }

  if (validPushKeyIdentifiers?.includes(keyIdentifier)) {
@@ -34,20 +34,14 @@ export class RemoveDistributionCertificate {
      buildCredentials => buildCredentials.iosAppCredentials.app
    );
    if (apps.length !== 0) {
-      // iosAppBuildCredentialsList is capped at 20 on www
-      const appFullNames = apps
-        .map(app => app.fullName)
-        .slice(0, 19)
-        .join(',');
-      const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
-
+      const appFullNames = apps.map(app => app.fullName).join(',');
      if (ctx.nonInteractive) {
        throw new Error(
-          `Certificate is currently used by ${appFullNames}${andMaybeMore} and cannot be deleted in non-interactive mode.`
+          `Certificate is currently used by ${appFullNames} and cannot be deleted in non-interactive mode.`
        );
      }
      const confirm = await confirmAsync({
-        message: `You are removing certificate used by ${appFullNames}${andMaybeMore}. Do you want to continue?`,
+        message: `You are removing certificate used by ${appFullNames}. Do you want to continue?`,
      });
      if (!confirm) {
        Log.log('Aborting');
@@ -27,14 +27,9 @@ export class RemovePushKey {

    const apps = this.pushKey.iosAppCredentialsList.map(appCredentials => appCredentials.app);
    if (apps.length !== 0) {
-      // iosAppCredentialsList is capped at 20 on www
-      const appFullNames = apps
-        .map(app => app.fullName)
-        .slice(0, 19)
-        .join(',');
-      const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
+      const appFullNames = apps.map(app => app.fullName).join(',');
      const confirm = await confirmAsync({
-        message: `Removing this push key will disable push notifications for ${appFullNames}${andMaybeMore}. Do you want to continue?`,
+        message: `Removing this push key will disable push notifications for ${appFullNames}. Do you want to continue?`,
      });
      if (!confirm) {
        Log.log('Aborting');
@@ -326,7 +326,7 @@ export async function getDevicesForAppleTeamAsync(
 ): Promise<AppleDeviceFragment[]> {
  return await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(
    graphqlClient,
-    account.name,
+    account.id,
    appleTeamIdentifier,
    {
      useCache,
@@ -4,76 +4,27 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  AppStoreConnectApiKeyByAccountQuery,
  AppStoreConnectApiKeyFragment,
-  AppStoreConnectApiKeysPaginatedByAccountQuery,
 } from '../../../../../graphql/generated';
 import { AppStoreConnectApiKeyFragmentNode } from '../../../../../graphql/types/credentials/AppStoreConnectApiKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const AppStoreConnectApiKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<AppStoreConnectApiKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppStoreConnectApiKeyFragment>> => {
-      return await AppStoreConnectApiKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching ASC Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    AppStoreConnectApiKeysPaginatedByAccountQuery['account']['byName']['appStoreConnectApiKeysPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<AppStoreConnectApiKeysPaginatedByAccountQuery>(
+        .query<AppStoreConnectApiKeyByAccountQuery>(
          gql`
-            query AppStoreConnectApiKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query AppStoreConnectApiKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  appStoreConnectApiKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppStoreConnectApiKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  appStoreConnectApiKeys {
+                    id
+                    ...AppStoreConnectApiKeyFragment
                  }
                }
              }
@@ -82,10 +33,6 @@ export const AppStoreConnectApiKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['AppStoreConnectApiKey'],
@@ -93,6 +40,6 @@ export const AppStoreConnectApiKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.appStoreConnectApiKeysPaginated;
+    return data.account.byName.appStoreConnectApiKeys;
  },
 };
@@ -1,3 +1,4 @@
+import assert from 'assert';
 import { print } from 'graphql';
 import gql from 'graphql-tag';

@@ -6,16 +7,15 @@ import { DeviceNotFoundError } from '../../../../../devices/utils/errors';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
  AppleDevice,
-  AppleDeviceFilterInput,
  AppleDeviceFragment,
+  AppleDevicesByAppleTeamQuery,
+  AppleDevicesByIdentifierQuery,
  AppleDevicesByTeamIdentifierQuery,
  AppleDevicesByTeamIdentifierQueryVariables,
-  AppleDevicesPaginatedByAccountQuery,
  AppleTeamFragment,
 } from '../../../../../graphql/generated';
 import { AppleDeviceFragmentNode } from '../../../../../graphql/types/credentials/AppleDevice';
 import { AppleTeamFragmentNode } from '../../../../../graphql/types/credentials/AppleTeam';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';
 import { formatAppleTeam } from '../../../actions/AppleTeamFormatting';

 export type AppleDeviceFragmentWithAppleTeam = AppleDeviceFragment & {
@@ -38,25 +38,51 @@ export type AppleDevicesByIdentifierQueryResult = AppleDeviceQueryResult & {
 export const AppleDeviceQuery = {
  async getAllByAppleTeamIdentifierAsync(
    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
+    accountId: string,
    appleTeamIdentifier: string,
    { useCache = true }: { useCache?: boolean } = {}
  ): Promise<AppleDeviceFragmentWithAppleTeam[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDeviceFragmentWithAppleTeam>> => {
-      return await AppleDeviceQuery.getAllForAccountPaginatedAsync(graphqlClient, accountName, {
-        ...relayArgs,
-        filter: {
-          appleTeamIdentifier,
-        },
-        useCache,
-      });
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'Fetching Apple devices...',
-    });
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<AppleDevicesByAppleTeamQuery>(
+          gql`
+            query AppleDevicesByAppleTeamQuery($accountId: ID!, $appleTeamIdentifier: String!) {
+              appleTeam {
+                byAppleTeamIdentifier(accountId: $accountId, identifier: $appleTeamIdentifier) {
+                  id
+                  ...AppleTeamFragment
+                  appleDevices {
+                    id
+                    ...AppleDeviceFragment
+                    appleTeam {
+                      id
+                      ...AppleTeamFragment
+                    }
+                  }
+                }
+              }
+            }
+            ${print(AppleTeamFragmentNode)}
+            ${print(AppleDeviceFragmentNode)}
+          `,
+          {
+            accountId,
+            appleTeamIdentifier,
+          },
+          {
+            additionalTypenames: ['AppleDevice'],
+            requestPolicy: useCache ? 'cache-first' : 'network-only',
+          }
+        )
+        .toPromise()
+    );
+    assert(
+      data.appleTeam.byAppleTeamIdentifier,
+      'byAppleTeamIdentifier should be defined in this context - enforced by GraphQL'
+    );
+    const { appleDevices } = data.appleTeam.byAppleTeamIdentifier;
+    assert(appleDevices, 'Apple Devices should be defined in this context - enforced by GraphQL');
+    return appleDevices;
  },

  async getAllForAppleTeamAsync(
@@ -87,7 +113,6 @@ export const AppleDeviceQuery = {
                      deviceClass
                      enabled
                      model
-                      createdAt
                    }
                  }
                }
@@ -113,21 +138,41 @@ export const AppleDeviceQuery = {
    graphqlClient: ExpoGraphqlClient,
    accountName: string,
    identifier: string
-  ): Promise<AppleDeviceFragmentWithAppleTeam> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDeviceFragmentWithAppleTeam>> => {
-      return await AppleDeviceQuery.getAllForAccountPaginatedAsync(graphqlClient, accountName, {
-        ...relayArgs,
-        filter: {
-          identifier,
-        },
-      });
-    };
-    const devices = await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-    });
-    const device = devices[0];
+  ): Promise<AppleDevicesByIdentifierQueryResult> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<AppleDevicesByIdentifierQuery>(
+          gql`
+            query AppleDevicesByIdentifier($accountName: String!, $identifier: String!) {
+              account {
+                byName(accountName: $accountName) {
+                  id
+                  appleDevices(identifier: $identifier) {
+                    id
+                    model
+                    identifier
+                    name
+                    deviceClass
+                    enabled
+                    appleTeam {
+                      id
+                      appleTeamIdentifier
+                      appleTeamName
+                    }
+                  }
+                }
+              }
+            }
+          `,
+          { accountName, identifier },
+          {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+          }
+        )
+        .toPromise()
+    );
+
+    const device = data.account.byName.appleDevices[0];
    if (!device) {
      throw new DeviceNotFoundError(
        `Device with id ${identifier} was not found on account ${accountName}.`
@@ -135,86 +180,4 @@ export const AppleDeviceQuery = {
    }
    return device;
  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-      filter,
-      useCache = true,
-    }: {
-      after?: string;
-      first?: number;
-      before?: string;
-      last?: number;
-      filter?: AppleDeviceFilterInput;
-      useCache?: boolean;
-    }
-  ): Promise<AppleDevicesPaginatedByAccountQuery['account']['byName']['appleDevicesPaginated']> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .query<AppleDevicesPaginatedByAccountQuery>(
-          gql`
-            query AppleDevicesPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-              $filter: AppleDeviceFilterInput
-            ) {
-              account {
-                byName(accountName: $accountName) {
-                  id
-                  appleDevicesPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                    filter: $filter
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppleDeviceFragment
-                        appleTeam {
-                          id
-                          ...AppleTeamFragment
-                        }
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
-                  }
-                }
-              }
-            }
-            ${print(AppleTeamFragmentNode)}
-            ${print(AppleDeviceFragmentNode)}
-          `,
-          {
-            accountName,
-            after,
-            first,
-            before,
-            last,
-            filter,
-          },
-          {
-            additionalTypenames: ['AppleDevice'],
-            requestPolicy: useCache ? 'cache-first' : 'network-only',
-          }
-        )
-        .toPromise()
-    );
-    return data.account.byName.appleDevicesPaginated;
-  },
 };
@@ -5,14 +5,13 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
+  AppleDistributionCertificateByAccountQuery,
  AppleDistributionCertificateByAppQuery,
  AppleDistributionCertificateFragment,
-  AppleDistributionCertificatesPaginatedByAccountQuery,
  IosDistributionType,
 } from '../../../../../graphql/generated';
 import { AppleDistributionCertificateFragmentNode } from '../../../../../graphql/types/credentials/AppleDistributionCertificate';
 import { AppleTeamFragmentNode } from '../../../../../graphql/types/credentials/AppleTeam';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const AppleDistributionCertificateQuery = {
  async getForAppAsync(
@@ -82,65 +81,17 @@ export const AppleDistributionCertificateQuery = {
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<AppleDistributionCertificateFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<AppleDistributionCertificateFragment>> => {
-      return await AppleDistributionCertificateQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Apple Distribution Certificates...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<
-    AppleDistributionCertificatesPaginatedByAccountQuery['account']['byName']['appleDistributionCertificatesPaginated']
-  > {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<AppleDistributionCertificatesPaginatedByAccountQuery>(
+        .query<AppleDistributionCertificateByAccountQuery>(
          gql`
-            query AppleDistributionCertificatesPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query AppleDistributionCertificateByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  appleDistributionCertificatesPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...AppleDistributionCertificateFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  appleDistributionCertificates {
+                    id
+                    ...AppleDistributionCertificateFragment
                  }
                }
              }
@@ -149,10 +100,6 @@ export const AppleDistributionCertificateQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['AppleDistributionCertificate'],
@@ -160,6 +107,6 @@ export const AppleDistributionCertificateQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.appleDistributionCertificatesPaginated;
+    return data.account.byName.appleDistributionCertificates;
  },
 };
@@ -3,75 +3,25 @@ import gql from 'graphql-tag';

 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
-import {
-  ApplePushKeyFragment,
-  ApplePushKeysPaginatedByAccountQuery,
-} from '../../../../../graphql/generated';
+import { ApplePushKeyByAccountQuery, ApplePushKeyFragment } from '../../../../../graphql/generated';
 import { ApplePushKeyFragmentNode } from '../../../../../graphql/types/credentials/ApplePushKey';
-import { Connection, QueryParams, fetchEntireDatasetAsync } from '../../../../../utils/relay';

 export const ApplePushKeyQuery = {
  async getAllForAccountAsync(
    graphqlClient: ExpoGraphqlClient,
    accountName: string
  ): Promise<ApplePushKeyFragment[]> {
-    const paginatedGetterAsync = async (
-      relayArgs: QueryParams
-    ): Promise<Connection<ApplePushKeyFragment>> => {
-      return await ApplePushKeyQuery.getAllForAccountPaginatedAsync(
-        graphqlClient,
-        accountName,
-        relayArgs
-      );
-    };
-    return await fetchEntireDatasetAsync({
-      paginatedGetterAsync,
-      progressBarLabel: 'fetching Apple Push Keys...',
-    });
-  },
-  async getAllForAccountPaginatedAsync(
-    graphqlClient: ExpoGraphqlClient,
-    accountName: string,
-    {
-      after,
-      first,
-      before,
-      last,
-    }: { after?: string; first?: number; before?: string; last?: number }
-  ): Promise<ApplePushKeysPaginatedByAccountQuery['account']['byName']['applePushKeysPaginated']> {
    const data = await withErrorHandlingAsync(
      graphqlClient
-        .query<ApplePushKeysPaginatedByAccountQuery>(
+        .query<ApplePushKeyByAccountQuery>(
          gql`
-            query ApplePushKeysPaginatedByAccountQuery(
-              $accountName: String!
-              $after: String
-              $first: Int
-              $before: String
-              $last: Int
-            ) {
+            query ApplePushKeyByAccountQuery($accountName: String!) {
              account {
                byName(accountName: $accountName) {
                  id
-                  applePushKeysPaginated(
-                    after: $after
-                    first: $first
-                    before: $before
-                    last: $last
-                  ) {
-                    edges {
-                      cursor
-                      node {
-                        id
-                        ...ApplePushKeyFragment
-                      }
-                    }
-                    pageInfo {
-                      hasNextPage
-                      hasPreviousPage
-                      startCursor
-                      endCursor
-                    }
+                  applePushKeys {
+                    id
+                    ...ApplePushKeyFragment
                  }
                }
              }
@@ -80,10 +30,6 @@ export const ApplePushKeyQuery = {
          `,
          {
            accountName,
-            after,
-            first,
-            before,
-            last,
          },
          {
            additionalTypenames: ['ApplePushKey'],
@@ -91,6 +37,6 @@ export const ApplePushKeyQuery = {
        )
        .toPromise()
    );
-    return data.account.byName.applePushKeysPaginated;
+    return data.account.byName.applePushKeys;
  },
 };
@@ -35,7 +35,6 @@ export enum AndroidActionType {
  SetUpGsaKeyForFcmV1,
  UpdateCredentialsJson,
  SetUpBuildCredentialsFromCredentialsJson,
-  SetUpBuildCredentials,
 }

 export enum IosActionType {
@@ -1,46 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-
-import Log from '../../log';
-
-export class CheckBuildProfileFlagAgainstEasJson<T extends Platform> {
-  private easJsonAccessor: EasJsonAccessor;
-
-  constructor(
-    projectDir: string,
-    private platform: T,
-    private profileNameFromFlag: string
-  ) {
-    this.easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-  }
-
-  async runAsync(): Promise<BuildProfile<T>> {
-    const profileName = await this.getProfileNameFromEasConfigAsync();
-    const easConfig = await EasJsonUtils.getBuildProfileAsync<T>(
-      this.easJsonAccessor,
-      this.platform,
-      profileName
-    );
-    Log.succeed(`Using build profile: ${profileName}`);
-    return easConfig;
-  }
-
-  async getProfileNameFromEasConfigAsync(): Promise<string> {
-    const buildProfileNames = await EasJsonUtils.getBuildProfileNamesAsync(this.easJsonAccessor);
-    if (buildProfileNames.length === 0) {
-      throw new Error(
-        'You need at least one iOS build profile declared in eas.json. Go to https://docs.expo.dev/build/eas-json/ for more details'
-      );
-    } else if (buildProfileNames.length === 1) {
-      return buildProfileNames[0];
-    }
-
-    if (buildProfileNames.includes(this.profileNameFromFlag)) {
-      return this.profileNameFromFlag;
-    } else {
-      throw new Error(
-        `Build profile ${this.profileNameFromFlag} does not exist in eas.json. Go to https://docs.expo.dev/build/eas-json/ for more details`
-      );
-    }
-  }
-}
@@ -34,7 +34,6 @@ import { DownloadKeystore } from '../android/actions/DownloadKeystore';
 import { RemoveFcm } from '../android/actions/RemoveFcm';
 import { SelectAndRemoveGoogleServiceAccountKey } from '../android/actions/RemoveGoogleServiceAccountKey';
 import { RemoveKeystore } from '../android/actions/RemoveKeystore';
-import { SetUpBuildCredentials } from '../android/actions/SetUpBuildCredentials';
 import { SetUpBuildCredentialsFromCredentialsJson } from '../android/actions/SetUpBuildCredentialsFromCredentialsJson';
 import { SetUpGoogleServiceAccountKeyForFcmV1 } from '../android/actions/SetUpGoogleServiceAccountKeyForFcmV1';
 import { SetUpGoogleServiceAccountKeyForSubmissions } from '../android/actions/SetUpGoogleServiceAccountKeyForSubmissions';
@@ -49,8 +48,8 @@ import { AndroidPackageNotDefinedError } from '../errors';

 export class ManageAndroid {
  constructor(
-    protected callingAction: Action,
-    protected projectDir: string
+    private callingAction: Action,
+    private projectDir: string
  ) {}

  async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
@@ -165,7 +164,7 @@ export class ManageAndroid {
    }
  }

-  protected async createProjectContextAsync(
+  private async createProjectContextAsync(
    ctx: CredentialsContext,
    buildProfile: BuildProfile<Platform.ANDROID>
  ): Promise<GradleBuildContext | undefined> {
@@ -173,7 +172,7 @@ export class ManageAndroid {
    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile, ctx.vcsClient);
  }

-  protected async runProjectSpecificActionAsync(
+  private async runProjectSpecificActionAsync(
    ctx: CredentialsContext,
    action: AndroidActionType,
    gradleContext?: GradleBuildContext
@@ -240,8 +239,6 @@ export class ManageAndroid {
      }
    } else if (action === AndroidActionType.SetUpBuildCredentialsFromCredentialsJson) {
      await new SetUpBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
-    } else if (action === AndroidActionType.SetUpBuildCredentials) {
-      await new SetUpBuildCredentials({ app: appLookupParams }).runAsync(ctx);
    }
  }
 }
@@ -56,8 +56,8 @@ import { displayIosCredentials } from '../ios/utils/printCredentials';

 export class ManageIos {
  constructor(
-    protected callingAction: Action,
-    protected projectDir: string
+    private callingAction: Action,
+    private projectDir: string
  ) {}

  async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
@@ -182,7 +182,7 @@ export class ManageIos {
    }
  }

-  protected async createProjectContextAsync(
+  private async createProjectContextAsync(
    ctx: CredentialsContext,
    account: AccountFragment,
    buildProfile: BuildProfile<Platform.IOS>
@@ -215,7 +215,7 @@ export class ManageIos {
    };
  }

-  protected async runAccountSpecificActionAsync(
+  private async runAccountSpecificActionAsync(
    ctx: CredentialsContext,
    account: AccountFragment,
    action: IosActionType
@@ -235,7 +235,7 @@ export class ManageIos {
    }
  }

-  protected async runProjectSpecificActionAsync(
+  private async runProjectSpecificActionAsync(
    ctx: CredentialsContext,
    app: App,
    targets: Target[],
@@ -396,7 +396,7 @@ export class ManageIos {
    }
  }

-  protected async setupProvisioningProfileWithSpecificDistCertAsync(
+  private async setupProvisioningProfileWithSpecificDistCertAsync(
    ctx: CredentialsContext,
    target: Target,
    appLookupParams: AppLookupParams,
@@ -419,7 +419,7 @@ export class ManageIos {
    }
  }

-  protected async selectTargetAsync(targets: Target[]): Promise<Target> {
+  private async selectTargetAsync(targets: Target[]): Promise<Target> {
    if (targets.length === 1) {
      return targets[0];
    }
@@ -1,60 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import assert from 'assert';
-
-import { AndroidActionType } from './Actions';
-import { CheckBuildProfileFlagAgainstEasJson } from './CheckBuildProfileFlagAgainstEasJson';
-import { Action } from './HelperActions';
-import { ManageAndroid } from './ManageAndroid';
-import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
-
-export class SetUpAndroidBuildCredentials extends ManageAndroid {
-  constructor(
-    callingAction: Action,
-    projectDir: string,
-    private setUpBuildCredentialsWithProfileNameFromFlag: string
-  ) {
-    super(callingAction, projectDir);
-  }
-
-  override async runAsync(): Promise<void> {
-    const hasProjectContext = !!this.callingAction.projectInfo;
-    const buildProfile = hasProjectContext
-      ? await new CheckBuildProfileFlagAgainstEasJson(
-          this.projectDir,
-          Platform.ANDROID,
-          this.setUpBuildCredentialsWithProfileNameFromFlag
-        ).runAsync()
-      : null;
-    let projectInfo: CredentialsContextProjectInfo | null = null;
-    if (hasProjectContext) {
-      const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
-        env: buildProfile?.env,
-      });
-      projectInfo = { exp, projectId };
-    }
-    const ctx = new CredentialsContext({
-      projectDir: process.cwd(),
-      projectInfo,
-      user: this.callingAction.actor,
-      graphqlClient: this.callingAction.graphqlClient,
-      analytics: this.callingAction.analytics,
-      env: buildProfile?.env,
-      nonInteractive: false,
-      vcsClient: this.callingAction.vcsClient,
-    });
-
-    let gradleContext;
-    if (ctx.hasProjectContext) {
-      assert(buildProfile, 'buildProfile must be defined in a project context');
-      gradleContext = await this.createProjectContextAsync(ctx, buildProfile);
-    }
-
-    if (this.setUpBuildCredentialsWithProfileNameFromFlag) {
-      await this.runProjectSpecificActionAsync(
-        ctx,
-        AndroidActionType.SetUpBuildCredentials,
-        gradleContext
-      );
-    }
-  }
-}
@@ -1,30 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-
-import { Analytics } from '../../analytics/AnalyticsManager';
-import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { Actor } from '../../user/User';
-import { Client } from '../../vcs/vcs';
-import { CredentialsContextProjectInfo } from '../context';
-import { SetUpAndroidBuildCredentials } from '../manager/SetUpAndroidBuildCredentials';
-import { SetUpIosBuildCredentials } from '../manager/SetUpIosBuildCredentials';
-
-export class SetUpBuildCredentialsCommandAction {
-  constructor(
-    public readonly actor: Actor,
-    public readonly graphqlClient: ExpoGraphqlClient,
-    public readonly vcsClient: Client,
-    public readonly analytics: Analytics,
-    public readonly projectInfo: CredentialsContextProjectInfo | null,
-    public readonly getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn,
-    private readonly platform: Platform,
-    private readonly profileName: string
-  ) {}
-
-  async runAsync(): Promise<void> {
-    if (this.platform === Platform.IOS) {
-      return await new SetUpIosBuildCredentials(this, process.cwd(), this.profileName).runAsync();
-    }
-    return await new SetUpAndroidBuildCredentials(this, process.cwd(), this.profileName).runAsync();
-  }
-}
@@ -1,78 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import assert from 'assert';
-import nullthrows from 'nullthrows';
-
-import { IosActionType } from './Actions';
-import { CheckBuildProfileFlagAgainstEasJson } from './CheckBuildProfileFlagAgainstEasJson';
-import { Action } from './HelperActions';
-import { ManageIos } from './ManageIos';
-import { AccountFragment } from '../../graphql/generated';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
-import { ensureActorHasPrimaryAccount } from '../../user/actions';
-import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
-
-export class SetUpIosBuildCredentials extends ManageIos {
-  constructor(
-    callingAction: Action,
-    projectDir: string,
-    private setUpBuildCredentialsWithProfileNameFromFlag: string
-  ) {
-    super(callingAction, projectDir);
-  }
-
-  override async runAsync(): Promise<void> {
-    const buildProfile = this.callingAction.projectInfo
-      ? await new CheckBuildProfileFlagAgainstEasJson(
-          this.projectDir,
-          Platform.IOS,
-          this.setUpBuildCredentialsWithProfileNameFromFlag
-        ).runAsync()
-      : null;
-
-    let projectInfo: CredentialsContextProjectInfo | null = null;
-    if (this.callingAction.projectInfo) {
-      const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
-        env: buildProfile?.env,
-      });
-      projectInfo = { exp, projectId };
-    }
-
-    const ctx = new CredentialsContext({
-      projectDir: process.cwd(),
-      projectInfo,
-      user: this.callingAction.actor,
-      graphqlClient: this.callingAction.graphqlClient,
-      analytics: this.callingAction.analytics,
-      env: buildProfile?.env,
-      nonInteractive: false,
-      vcsClient: this.callingAction.vcsClient,
-    });
-
-    await ctx.bestEffortAppStoreAuthenticateAsync();
-
-    const getAccountForProjectAsync = async (projectId: string): Promise<AccountFragment> => {
-      return await getOwnerAccountForProjectIdAsync(ctx.graphqlClient, projectId);
-    };
-
-    const account = ctx.hasProjectContext
-      ? await getAccountForProjectAsync(ctx.projectId)
-      : ensureActorHasPrimaryAccount(ctx.user);
-
-    let app = null;
-    let targets = null;
-    if (ctx.hasProjectContext) {
-      assert(buildProfile, 'buildProfile must be defined in project context');
-      const projectContext = await this.createProjectContextAsync(ctx, account, buildProfile);
-      app = projectContext.app;
-      targets = projectContext.targets;
-    }
-
-    await this.runProjectSpecificActionAsync(
-      ctx,
-      nullthrows(app, 'app must be defined in project context'),
-      nullthrows(targets, 'targets must be defined in project context'),
-      nullthrows(buildProfile, 'buildProfile must be defined in project context'),
-      IosActionType.SetUpBuildCredentials
-    );
-  }
-}
@@ -34,7 +34,7 @@ export default class DeviceCreateAction {
      await runDeveloperPortalMethodAsync(
        this.graphqlClient,
        this.appStoreApi,
-        this.account,
+        this.account.id,
        this.appleTeam
      );
    } else if (method === RegistrationMethod.INPUT) {
@@ -9,7 +9,7 @@ import {
 import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
 import { getRequestContext } from '../../../credentials/ios/appstore/authenticate';
 import { AuthCtx } from '../../../credentials/ios/appstore/authenticateTypes';
-import { AccountFragment, AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
 import Log from '../../../log';
 import { ora } from '../../../ora';
 import { promptAsync } from '../../../prompts';
@@ -25,14 +25,14 @@ const DEVICE_CLASS_TO_GRAPHQL_TYPE: Partial<Record<DeviceClass, AppleDeviceClass
 export async function runDeveloperPortalMethodAsync(
  graphqlClient: ExpoGraphqlClient,
  appStoreApi: AppStoreApi,
-  account: AccountFragment,
+  accountId: string,
  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
 ): Promise<void> {
  const appleAuthCtx = await appStoreApi.ensureAuthenticatedAsync();
  const unregisteredPortalDevices = await findUnregisteredPortalDevicesAsync(
    graphqlClient,
    appleAuthCtx,
-    account.name,
+    accountId,
    appleTeam
  );
  if (unregisteredPortalDevices.length === 0) {
@@ -40,7 +40,7 @@ export async function runDeveloperPortalMethodAsync(
    return;
  }
  const devicesToImport = await chooseDevicesToImportAsync(unregisteredPortalDevices);
-  await importDevicesAsync(graphqlClient, account.id, appleTeam, devicesToImport);
+  await importDevicesAsync(graphqlClient, accountId, appleTeam, devicesToImport);
 }

 async function importDevicesAsync(
@@ -88,12 +88,12 @@ async function importDeviceChunkAsync(
 async function findUnregisteredPortalDevicesAsync(
  graphqlClient: ExpoGraphqlClient,
  appleAuthCtx: AuthCtx,
-  accountName: string,
+  accountId: string,
  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
 ): Promise<Device[]> {
  const expoRegisteredDevices = await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(
    graphqlClient,
-    accountName,
+    accountId,
    appleTeam.appleTeamIdentifier,
    { useCache: false }
  );
@@ -10,7 +10,6 @@ const DEVICE_CLASS_DISPLAY_NAMES: Record<AppleDeviceClass, string> = {
  [AppleDeviceClass.Iphone]: 'iPhone',
  [AppleDeviceClass.Ipad]: 'iPad',
  [AppleDeviceClass.Mac]: 'Mac',
-  [AppleDeviceClass.Unknown]: 'Unknown',
 };

 function formatDeviceClass(device: Device | NewDevice): string {
@@ -55,6 +55,7 @@ export const BuildFragmentNode = gql`
    updatedAt
    message
    completedAt
+    resourceClass
    expirationDate
    isForIosSimulator
  }
@@ -6,7 +6,6 @@ export const APPLE_DEVICE_CLASS_LABELS: Record<AppleDeviceClass, string> = {
  [AppleDeviceClass.Ipad]: 'iPad',
  [AppleDeviceClass.Iphone]: 'iPhone',
  [AppleDeviceClass.Mac]: 'Mac',
-  [AppleDeviceClass.Unknown]: 'Unknown',
 };

 export const AppleDeviceFragmentNode = gql`
@@ -1,13 +1,13 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { vol } from 'memfs';

-import { resolveVcsClient } from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { resolveWorkflowAsync, resolveWorkflowPerPlatformAsync } from '../workflow';

 jest.mock('fs');

 const projectDir = '/app';
-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 describe(resolveWorkflowAsync, () => {
  beforeEach(() => {
@@ -23,12 +23,16 @@ describe(resolveWorkflowAsync, () => {
      projectDir
    );

-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
-      Workflow.GENERIC
-    );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
-      Workflow.GENERIC
-    );
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.GENERIC);
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.GENERIC);
  });

  test('bare workflow for single platform', async () => {
@@ -39,12 +43,16 @@ describe(resolveWorkflowAsync, () => {
      projectDir
    );

-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
-      Workflow.MANAGED
-    );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
-      Workflow.GENERIC
-    );
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.MANAGED);
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.GENERIC);
  });

  test('android/ios directories are ignored', async () => {
@@ -57,12 +65,16 @@ describe(resolveWorkflowAsync, () => {
      projectDir
    );

-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
-      Workflow.MANAGED
-    );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
-      Workflow.MANAGED
-    );
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.MANAGED);
+    await expect(
+      resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toBe(Workflow.MANAGED);
  });
 });

@@ -80,7 +92,11 @@ describe(resolveWorkflowPerPlatformAsync, () => {
      projectDir
    );

-    await expect(resolveWorkflowPerPlatformAsync(projectDir, vcsClient)).resolves.toEqual({
+    await expect(
+      resolveWorkflowPerPlatformAsync(projectDir, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    ).resolves.toEqual({
      android: Workflow.GENERIC,
      ios: Workflow.GENERIC,
    });
@@ -7,7 +7,7 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
 import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../prompts';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  ensureApplicationIdIsDefinedForManagedProjectAsync,
  getApplicationIdAsync,
@@ -18,7 +18,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 beforeEach(async () => {
  vol.reset();
@@ -4,14 +4,14 @@ import os from 'os';

 import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { promptAsync } from '../../../prompts';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import { resolveGradleBuildContextAsync } from '../gradle';

 jest.mock('fs');
 jest.mock('../../../prompts');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 beforeEach(async () => {
  vol.reset();
@@ -35,7 +35,9 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync({
  exp: ExpoConfig;
  vcsClient: Client;
 }): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');

  try {
@@ -101,7 +103,9 @@ export async function getApplicationIdAsync(
  vcsClient: Client,
  gradleContext?: GradleBuildContext
 ): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);

@@ -16,7 +16,9 @@ export async function resolveGradleBuildContextAsync(
  buildProfile: BuildProfile<Platform.ANDROID>,
  vcsClient: Client
 ): Promise<GradleBuildContext | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    try {
      if (buildProfile.gradleCommand) {
@@ -36,7 +36,9 @@ export async function getApplicationIdentifierAsync({
 }): Promise<string> {
  if (platform === Platform.ANDROID) {
    const profile = buildProfile as BuildProfile<Platform.ANDROID>;
-    const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+    const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });

    if (workflow === Workflow.MANAGED) {
      return await ensureApplicationIdIsDefinedForManagedProjectAsync({
@@ -51,7 +53,9 @@ export async function getApplicationIdentifierAsync({
    const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile, vcsClient);
    return await getApplicationIdAsync(projectDir, exp, vcsClient, gradleContext);
  } else {
-    const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+    const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
    const profile = buildProfile as BuildProfile<Platform.IOS>;
    if (workflow === Workflow.MANAGED) {
      return await ensureBundleIdentifierIsDefinedForManagedProjectAsync({
@@ -31,7 +31,11 @@ export async function validateCustomBuildConfigAsync({
      `Custom build configuration file ${chalk.bold(relativeConfigPath)} does not exist.`
    );
  }
-  if (await vcsClient.isFileIgnoredAsync(relativeConfigPath)) {
+  if (
+    await vcsClient.isFileIgnoredAsync(relativeConfigPath, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    })
+  ) {
    throw new Error(
      `Custom build configuration file ${chalk.bold(
        relativeConfigPath
@@ -68,7 +72,3 @@ export async function validateCustomBuildConfigAsync({
 export function getCustomBuildConfigPath(configFilename: string): string {
  return path.join('.eas/build', configFilename);
 }
-
-export function getCustomBuildConfigPathForJob(configFilename: string): string {
-  return path.posix.join('.eas/build', configFilename);
-}
@@ -8,7 +8,7 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
 import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../prompts';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
  getBundleIdentifierAsync,
@@ -20,7 +20,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 beforeEach(async () => {
  vol.reset();
@@ -28,7 +28,9 @@ export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync({
  exp: ExpoConfig;
  vcsClient: Client;
 }): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');

  try {
@@ -55,7 +57,9 @@ export async function getBundleIdentifierAsync(
  vcsClient: Client,
  xcodeContext?: { targetName?: string; buildConfiguration?: string }
 ): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);

@@ -28,7 +28,9 @@ export async function getManagedApplicationTargetEntitlementsAsync(
      projectRoot: projectDir,
      platforms: ['ios'],
      introspect: true,
-      ignoreExistingNativeFiles: await hasIgnoredIosProjectAsync(projectDir, vcsClient),
+      ignoreExistingNativeFiles: await hasIgnoredIosProjectAsync(projectDir, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      }),
    });
    return expWithMods.ios?.entitlements || {};
  } finally {
@@ -24,7 +24,9 @@ export async function resolveXcodeBuildContextAsync(
  }: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean; vcsClient: Client },
  buildProfile: BuildProfile<Platform.IOS>
 ): Promise<XcodeBuildContext> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    const buildScheme =
      buildProfile.scheme ??
@@ -145,7 +145,9 @@ export async function resolveBareProjectTargetsAsync({
 }

 export async function resolveTargetsAsync(opts: ResolveTargetOptions): Promise<Target[]> {
-  const workflow = await resolveWorkflowAsync(opts.projectDir, Platform.IOS, opts.vcsClient);
+  const workflow = await resolveWorkflowAsync(opts.projectDir, Platform.IOS, opts.vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
  if (workflow === Workflow.GENERIC) {
    return await resolveBareProjectTargetsAsync(opts);
  } else if (workflow === Workflow.MANAGED) {
@@ -108,11 +108,7 @@ export async function validateAppVersionRuntimePolicySupportAsync(
  }

  const expoUpdatesPackageVersion = await getExpoUpdatesPackageVersionIfInstalledAsync(projectDir);
-  if (
-    expoUpdatesPackageVersion !== null &&
-    (semver.gte(expoUpdatesPackageVersion, '0.14.4') ||
-      expoUpdatesPackageVersion.includes('canary'))
-  ) {
+  if (expoUpdatesPackageVersion !== null && semver.gte(expoUpdatesPackageVersion, '0.14.4')) {
    return;
  }

@@ -125,11 +121,7 @@ export async function enforceRollBackToEmbeddedUpdateSupportAsync(
  projectDir: string
 ): Promise<void> {
  const expoUpdatesPackageVersion = await getExpoUpdatesPackageVersionIfInstalledAsync(projectDir);
-  if (
-    expoUpdatesPackageVersion !== null &&
-    (semver.gte(expoUpdatesPackageVersion, '0.19.0') ||
-      expoUpdatesPackageVersion.includes('canary'))
-  ) {
+  if (expoUpdatesPackageVersion !== null && semver.gte(expoUpdatesPackageVersion, '0.19.0')) {
    return;
  }

@@ -146,29 +138,9 @@ export async function isClassicUpdatesSupportedAsync(projectDir: string): Promis
    return false;
  }

-  if (expoUpdatesPackageVersion.includes('canary')) {
-    return false;
-  }
-
  return semver.lt(expoUpdatesPackageVersion, '0.19.0');
 }

-export async function isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync(
-  projectDir: string
-): Promise<boolean> {
-  const expoUpdatesPackageVersion = await getExpoUpdatesPackageVersionIfInstalledAsync(projectDir);
-  if (expoUpdatesPackageVersion === null) {
-    return false;
-  }
-
-  if (expoUpdatesPackageVersion.includes('canary')) {
-    return true;
-  }
-
-  // TODO(wschurman): add semver check once we know the SDK51 version of expo-updates that supports this
-  return false;
-}
-
 export async function installExpoUpdatesAsync(
  projectDir: string,
  options?: { silent: boolean }
@@ -1,6 +1,7 @@
 import { ExpoConfig, Platform } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { Platform as EASBuildJobPlatform, Workflow } from '@expo/eas-build-job';
+import * as Fingerprint from '@expo/fingerprint';
 import JsonFile from '@expo/json-file';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -8,11 +9,9 @@ import crypto from 'crypto';
 import fs from 'fs-extra';
 import Joi from 'joi';
 import mime from 'mime';
-import nullthrows from 'nullthrows';
 import path from 'path';
 import promiseLimit from 'promise-limit';

-import { isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync } from './projectUtils';
 import { resolveWorkflowAsync } from './workflow';
 import { selectBranchOnAppAsync } from '../branch/queries';
 import { getDefaultBranchNameAsync } from '../branch/utils';
@@ -23,7 +22,7 @@ import { PublishMutation } from '../graphql/mutations/PublishMutation';
 import { PublishQuery } from '../graphql/queries/PublishQuery';
 import Log, { learnMore } from '../log';
 import { RequestedPlatform, requestedPlatformDisplayNames } from '../platform';
-import { promptAsync } from '../prompts';
+import { confirmAsync, promptAsync } from '../prompts';
 import { getBranchNameFromChannelNameAsync } from '../update/getBranchNameFromChannelNameAsync';
 import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../update/utils';
 import { PresignedPost, uploadWithPresignedPostWithRetryAsync } from '../uploads';
@@ -32,10 +31,6 @@ import {
  shouldUseVersionedExpoCLI,
  shouldUseVersionedExpoCLIWithExplicitPlatforms,
 } from '../utils/expoCli';
-import {
-  ExpoUpdatesCLIModuleNotFoundError,
-  expoUpdatesCommandAsync,
-} from '../utils/expoUpdatesCli';
 import chunk from '../utils/expodash/chunk';
 import { truthy } from '../utils/expodash/filter';
 import uniqBy from '../utils/expodash/uniqBy';
@@ -685,25 +680,32 @@ export async function getRuntimeVersionObjectAsync({
  platforms,
  projectDir,
  vcsClient,
+  nonInteractive,
 }: {
  exp: ExpoConfig;
  platforms: Platform[];
  projectDir: string;
  vcsClient: Client;
+  nonInteractive: boolean;
 }): Promise<{ platform: string; runtimeVersion: string }[]> {
-  return await Promise.all(
-    platforms.map(async platform => {
-      return {
+  const runtimeVersionObjects: { platform: string; runtimeVersion: string }[] = [];
+
+  // calculate these serially since in some cases (fingerprint) we need to prompt the user to confirm that
+  // the runtime version is ready to be calculated
+  for (const platform of platforms) {
+    runtimeVersionObjects.push({
+      platform,
+      runtimeVersion: await getRuntimeVersionForPlatformAsync({
+        exp,
        platform,
-        runtimeVersion: await getRuntimeVersionForPlatformAsync({
-          exp,
-          platform,
-          projectDir,
-          vcsClient,
-        }),
-      };
-    })
-  );
+        projectDir,
+        vcsClient,
+        nonInteractive,
+      }),
+    });
+  }
+
+  return runtimeVersionObjects;
 }

 async function getRuntimeVersionForPlatformAsync({
@@ -711,54 +713,65 @@ async function getRuntimeVersionForPlatformAsync({
  platform,
  projectDir,
  vcsClient,
+  nonInteractive,
 }: {
  exp: ExpoConfig;
  platform: Platform;
  projectDir: string;
  vcsClient: Client;
+  nonInteractive: boolean;
 }): Promise<string> {
  if (platform === 'web') {
    return 'UNVERSIONED';
  }

-  if (await isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync(projectDir)) {
-    try {
-      Log.debug('Using expo-updates runtimeversion:resolve CLI for runtime version resolution');
-
-      const extraArgs = Log.isDebug ? ['--debug'] : [];
-
-      const resolvedRuntimeVersionJSONResult = await expoUpdatesCommandAsync(projectDir, [
-        'runtimeversion:resolve',
-        '--platform',
-        platform,
-        ...extraArgs,
-      ]);
-      const runtimeVersionResult = JSON.parse(resolvedRuntimeVersionJSONResult);
-
-      Log.debug('runtimeversion:resolve output:');
-      Log.debug(resolvedRuntimeVersionJSONResult);
-
-      return nullthrows(
-        runtimeVersionResult.runtimeVersion,
-        `Unable to determine runtime version for ${
-          requestedPlatformDisplayNames[platform]
-        }. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
-      );
-    } catch (e: any) {
-      // if it's a known set of errors thrown by the CLI it means that we need to default back to the
-      // previous behavior, otherwise we throw the error since something is wrong
-      if (!(e instanceof ExpoUpdatesCLIModuleNotFoundError)) {
-        throw e;
-      }
-    }
-  }
-
  const runtimeVersion = exp[platform]?.runtimeVersion ?? exp.runtimeVersion;
  if (typeof runtimeVersion === 'object') {
+    const workflowIgnoringEASIgnoreToMatchExpoUpdatesDetection = await resolveWorkflowAsync(
+      projectDir,
+      platform as EASBuildJobPlatform,
+      vcsClient,
+      { useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: false }
+    );
+    const policy = runtimeVersion.policy;
+
+    if (policy === 'fingerprintExperimental') {
+      if (workflowIgnoringEASIgnoreToMatchExpoUpdatesDetection === Workflow.GENERIC) {
+        if (nonInteractive) {
+          // log to inform the user that the fingerprint has been calculated
+          Log.warn(
+            `Calculating native fingerprint for platform ${platform} using current state of the "${platform}" directory.`
+          );
+        } else {
+          // prompt the user to confirm that their native projects are in a state that is ready
+          // for the fingerprint to be calculated
+          const confirm = await confirmAsync({
+            message: `Calculating native fingerprint for platform ${platform} using current state of the "${platform}" directory. Do you want to continue?`,
+          });
+          if (!confirm) {
+            throw new Error('Aborted');
+          }
+        }
+        return await Fingerprint.createProjectHashAsync(projectDir, {
+          platforms: [platform],
+        });
+      } else if (workflowIgnoringEASIgnoreToMatchExpoUpdatesDetection === Workflow.MANAGED) {
+        // ignore everything in native directories to ensure fingerprint is the same
+        // no matter whether project has been prebuilt
+        return await Fingerprint.createProjectHashAsync(projectDir, {
+          platforms: [platform],
+          ignorePaths: ['/android/**/*', '/ios/**/*'],
+        });
+      } else {
+        throw new Error('Unknown workflow');
+      }
+    }
+
    const workflow = await resolveWorkflowAsync(
      projectDir,
      platform as EASBuildJobPlatform,
-      vcsClient
+      vcsClient,
+      { useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true }
    );
    if (workflow !== Workflow.MANAGED) {
      throw new Error(
@@ -1,50 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { Updates } from '@expo/config-plugins';
-
-import { isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync } from './projectUtils';
-import Log from '../log';
-import {
-  ExpoUpdatesCLIModuleNotFoundError,
-  expoUpdatesCommandAsync,
-} from '../utils/expoUpdatesCli';
-
-export async function resolveRuntimeVersionAsync({
-  exp,
-  platform,
-  projectDir,
-}: {
-  exp: ExpoConfig;
-  platform: 'ios' | 'android';
-  projectDir: string;
-}): Promise<string | null> {
-  if (!(await isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync(projectDir))) {
-    // fall back to the previous behavior (using the @expo/config-plugins eas-cli dependency rather
-    // than the versioned @expo/config-plugins dependency in the project)
-    return await Updates.getRuntimeVersionNullableAsync(projectDir, exp, platform);
-  }
-
-  try {
-    Log.debug('Using expo-updates runtimeversion:resolve CLI for runtime version resolution');
-
-    const extraArgs = Log.isDebug ? ['--debug'] : [];
-
-    const resolvedRuntimeVersionJSONResult = await expoUpdatesCommandAsync(projectDir, [
-      'runtimeversion:resolve',
-      '--platform',
-      platform,
-      ...extraArgs,
-    ]);
-    const runtimeVersionResult = JSON.parse(resolvedRuntimeVersionJSONResult);
-
-    Log.debug('runtimeversion:resolve output:');
-    Log.debug(resolvedRuntimeVersionJSONResult);
-
-    return runtimeVersionResult.runtimeVersion ?? null;
-  } catch (e: any) {
-    // if expo-updates is not installed, there's no need for a runtime version in the build
-    if (e instanceof ExpoUpdatesCLIModuleNotFoundError) {
-      return null;
-    }
-    throw e;
-  }
-}
@@ -8,7 +8,10 @@ import { Client } from '../vcs/vcs';
 export async function resolveWorkflowAsync(
  projectDir: string,
  platform: Platform,
-  vcsClient: Client
+  vcsClient: Client,
+  options: {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: boolean;
+  }
 ): Promise<Workflow> {
  let platformWorkflowMarkers: string[];
  try {
@@ -27,7 +30,7 @@ export async function resolveWorkflowAsync(
  for (const marker of platformWorkflowMarkers) {
    if (
      (await fs.pathExists(marker)) &&
-      !(await vcsClient.isFileIgnoredAsync(path.relative(vcsRootPath, marker)))
+      !(await vcsClient.isFileIgnoredAsync(path.relative(vcsRootPath, marker), options))
    ) {
      return Workflow.GENERIC;
    }
@@ -37,24 +40,30 @@ export async function resolveWorkflowAsync(

 export async function resolveWorkflowPerPlatformAsync(
  projectDir: string,
-  vcsClient: Client
+  vcsClient: Client,
+  options: {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: boolean;
+  }
 ): Promise<Record<Platform, Workflow>> {
  const [android, ios] = await Promise.all([
-    resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient),
-    resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient),
+    resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, options),
+    resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, options),
  ]);
  return { android, ios };
 }

 export async function hasIgnoredIosProjectAsync(
  projectDir: string,
-  vcsClient: Client
+  vcsClient: Client,
+  options: {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: boolean;
+  }
 ): Promise<boolean> {
  const vcsRootPath = path.normalize(await vcsClient.getRootPathAsync());

  try {
    const pbxProjectPath = IOSConfig.Paths.getPBXProjectPath(projectDir);
-    return await vcsClient.isFileIgnoredAsync(path.relative(vcsRootPath, pbxProjectPath));
+    return await vcsClient.isFileIgnoredAsync(path.relative(vcsRootPath, pbxProjectPath), options);
  } finally {
    return false;
  }
@@ -1,3 +1,4 @@
+import { Updates } from '@expo/config-plugins';
 import assert from 'assert';

 import { SelectRuntime } from './SelectRuntime';
@@ -23,7 +24,6 @@ import {
 } from '../../graphql/queries/ChannelQuery';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { resolveRuntimeVersionAsync } from '../../project/resolveRuntimeVersionAsync';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { truthy } from '../../utils/expodash/filter';
 import {
@@ -275,7 +275,7 @@ export class CreateRollout implements EASUpdateAction<UpdateChannelBasicInfoFrag
    const runtimes = (
      await Promise.all(
        platforms.map(platform =>
-          resolveRuntimeVersionAsync({ projectDir: ctx.app.projectDir, exp: ctx.app.exp, platform })
+          Updates.getRuntimeVersionAsync(ctx.app.projectDir, ctx.app.exp, platform)
        )
      )
    ).filter(truthy);
@@ -112,7 +112,6 @@ export default class AndroidSubmitter extends BaseSubmitter<
      changesNotSentForReview,
      releaseStatus,
      rollout,
-      isVerboseFastlaneEnabled: this.ctx.isVerboseFastlaneEnabled,
      ...serviceAccountKeyResult.result,
    };
  }
@@ -20,7 +20,7 @@ import {
 import { SubmissionMutation } from '../../../graphql/mutations/SubmissionMutation';
 import { createTestProject } from '../../../project/__tests__/project-utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  ArchiveResolverContext,
  ArchiveSource,
@@ -57,7 +57,7 @@ jest.mock('../../commons', () => {
  };
 });

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 describe(AndroidSubmitCommand, () => {
  const testProject = createTestProject(testProjectId, mockJester.accounts[0].name, {
@@ -123,7 +123,6 @@ describe(AndroidSubmitCommand, () => {
          changesNotSentForReview: false,
        },
        nonInteractive: true,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -160,7 +159,6 @@ describe(AndroidSubmitCommand, () => {
          changesNotSentForReview: false,
        },
        nonInteractive: false,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -180,7 +178,6 @@ describe(AndroidSubmitCommand, () => {
          releaseStatus: SubmissionAndroidReleaseStatus.Draft,
          track: SubmissionAndroidTrack.Internal,
          changesNotSentForReview: false,
-          isVerboseFastlaneEnabled: false,
        },
      });
    });
@@ -206,7 +203,6 @@ describe(AndroidSubmitCommand, () => {
          changesNotSentForReview: false,
        },
        nonInteractive: false,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -226,7 +222,6 @@ describe(AndroidSubmitCommand, () => {
          releaseStatus: SubmissionAndroidReleaseStatus.InProgress,
          track: SubmissionAndroidTrack.Internal,
          changesNotSentForReview: false,
-          isVerboseFastlaneEnabled: false,
        },
      });
    });
@@ -255,7 +250,6 @@ describe(AndroidSubmitCommand, () => {
          changesNotSentForReview: false,
        },
        nonInteractive: false,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -273,7 +267,6 @@ describe(AndroidSubmitCommand, () => {
          releaseStatus: SubmissionAndroidReleaseStatus.Draft,
          track: SubmissionAndroidTrack.Internal,
          changesNotSentForReview: false,
-          isVerboseFastlaneEnabled: false,
        },
        submittedBuildId: fakeBuildFragment.id,
      });
@@ -319,7 +312,6 @@ describe(AndroidSubmitCommand, () => {
            changesNotSentForReview: false,
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -342,7 +334,6 @@ describe(AndroidSubmitCommand, () => {
              track: SubmissionAndroidTrack.Beta,
              changesNotSentForReview: false,
              rollout: undefined,
-              isVerboseFastlaneEnabled: false,
            },
            submittedBuildId: selectedBuild.id,
          }
@@ -381,7 +372,6 @@ describe(AndroidSubmitCommand, () => {
            changesNotSentForReview: false,
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -404,7 +394,6 @@ describe(AndroidSubmitCommand, () => {
              track: SubmissionAndroidTrack.Internal,
              changesNotSentForReview: false,
              rollout: undefined,
-              isVerboseFastlaneEnabled: false,
            },
            submittedBuildId: selectedBuild.id,
          }
@@ -450,7 +439,6 @@ describe(AndroidSubmitCommand, () => {
            changesNotSentForReview: false,
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -474,7 +462,6 @@ describe(AndroidSubmitCommand, () => {
              track: SubmissionAndroidTrack.Internal,
              changesNotSentForReview: false,
              rollout: undefined,
-              isVerboseFastlaneEnabled: false,
            },
            submittedBuildId: selectedBuild.id,
          }
@@ -15,7 +15,7 @@ import { SetUpGoogleServiceAccountKeyForSubmissions } from '../../../credentials
 import { createTestProject } from '../../../project/__tests__/project-utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import { createSubmissionContextAsync } from '../../context';
 import {
  ServiceAccountSource,
@@ -45,7 +45,7 @@ const mockDetectableServiceAccountJson = JSON.stringify({
  client_email: '[email protected]',
 });

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 beforeAll(() => {
  vol.fromJSON({
@@ -156,7 +156,6 @@ describe(getServiceAccountKeyResultAsync, () => {
        changesNotSentForReview: false,
      },
      nonInteractive: true,
-      isVerboseFastlaneEnabled: false,
      actor: mockJester,
      graphqlClient,
      analytics,
@@ -199,7 +198,6 @@ describe(getServiceAccountKeyResultAsync, () => {
        changesNotSentForReview: false,
      },
      nonInteractive: true,
-      isVerboseFastlaneEnabled: false,
      actor: mockJester,
      graphqlClient,
      analytics,
@@ -238,7 +236,6 @@ describe(getServiceAccountKeyResultAsync, () => {
        changesNotSentForReview: false,
      },
      nonInteractive: true,
-      isVerboseFastlaneEnabled: false,
      actor: mockJester,
      graphqlClient,
      analytics,
@@ -21,7 +21,6 @@ export interface SubmissionContext<T extends Platform> {
  analyticsEventProperties: AnalyticsEventProperties;
  exp: ExpoConfig;
  nonInteractive: boolean;
-  isVerboseFastlaneEnabled: boolean;
  platform: T;
  profile: SubmitProfile<T>;
  projectDir: string;
@@ -47,7 +46,6 @@ export async function createSubmissionContextAsync<T extends Platform>(params: {
  credentialsCtx?: CredentialsContext;
  env?: Record<string, string>;
  nonInteractive: boolean;
-  isVerboseFastlaneEnabled: boolean;
  platform: T;
  profile: SubmitProfile<T>;
  projectDir: string;
@@ -32,7 +32,6 @@ export interface IosSubmissionOptions
  archiveSource: ArchiveSource;
  appSpecificPasswordSource?: AppSpecificPasswordSource;
  ascApiKeySource?: AscApiKeySource;
-  isVerboseFastlaneEnabled?: boolean;
 }

 interface ResolvedSourceOptions {
@@ -125,11 +124,9 @@ export default class IosSubmitter extends BaseSubmitter<
  ): IosSubmissionConfigInput {
    const { appSpecificPassword, ascApiKeyResult } = credentials;
    const { appleIdUsername, ascAppIdentifier } = options;
-    const { isVerboseFastlaneEnabled } = this.ctx;
    return {
      ascAppIdentifier,
      appleIdUsername,
-      isVerboseFastlaneEnabled,
      ...(appSpecificPassword ? this.formatAppSpecificPassword(appSpecificPassword) : null),
      ...(ascApiKeyResult?.result ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
    };
@@ -17,7 +17,7 @@ import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { createTestProject } from '../../../project/__tests__/project-utils';
 import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
 import { promptAsync } from '../../../prompts';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import { SubmissionContext, createSubmissionContextAsync } from '../../context';
 import {
  AscApiKeySource,
@@ -42,7 +42,7 @@ const testProject = createTestProject(testProjectId, mockJester.accounts[0].name
 });
 const projectId = uuidv4();

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 async function getIosSubmissionContextAsync(): Promise<SubmissionContext<Platform.IOS>> {
  const graphqlClient = instance(mock<ExpoGraphqlClient>());
@@ -57,7 +57,6 @@ async function getIosSubmissionContextAsync(): Promise<SubmissionContext<Platfor
      language: 'en-US',
    },
    nonInteractive: true,
-    isVerboseFastlaneEnabled: false,
    actor: mockJester,
    graphqlClient,
    analytics,
@@ -250,7 +249,6 @@ describe(getAscApiKeyResultAsync, () => {
        language: 'en-US',
      },
      nonInteractive: true,
-      isVerboseFastlaneEnabled: false,
      actor: mockJester,
      graphqlClient,
      analytics,
@@ -13,7 +13,7 @@ import { BuildFragment, SubmissionArchiveSourceType } from '../../../graphql/gen
 import { SubmissionMutation } from '../../../graphql/mutations/SubmissionMutation';
 import { createTestProject } from '../../../project/__tests__/project-utils';
 import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils';
-import { resolveVcsClient } from '../../../vcs';
+import { getVcsClient } from '../../../vcs';
 import {
  ArchiveResolverContext,
  ArchiveSource,
@@ -53,7 +53,7 @@ jest.mock('../../commons', () => {
  };
 });

-const vcsClient = resolveVcsClient();
+const vcsClient = getVcsClient();

 describe(IosSubmitCommand, () => {
  const testProject = createTestProject(testProjectId, mockJester.accounts[0].name, {});
@@ -100,7 +100,6 @@ describe(IosSubmitCommand, () => {
        ascAppId: '12345678',
      },
      nonInteractive: false,
-      isVerboseFastlaneEnabled: false,
      actor: mockJester,
      graphqlClient,
      analytics,
@@ -135,7 +134,6 @@ describe(IosSubmitCommand, () => {
          language: 'en-US',
        },
        nonInteractive: true,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -171,7 +169,6 @@ describe(IosSubmitCommand, () => {
          ascAppId: '12345678',
        },
        nonInteractive: false,
-        isVerboseFastlaneEnabled: false,
        actor: mockJester,
        graphqlClient,
        analytics,
@@ -189,9 +186,7 @@ describe(IosSubmitCommand, () => {
          appleIdUsername: '[email protected]',
          appleAppSpecificPassword: 'abcd-abcd-abcd-abcd',
          ascAppIdentifier: '12345678',
-          isVerboseFastlaneEnabled: false,
        },
-        submittedBuildId: undefined,
      });

      delete process.env.EXPO_APPLE_APP_SPECIFIC_PASSWORD;
@@ -236,7 +231,6 @@ describe(IosSubmitCommand, () => {
            ascAppId: '12345678',
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -254,7 +248,6 @@ describe(IosSubmitCommand, () => {
            appleIdUsername: '[email protected]',
            appleAppSpecificPassword: 'abcd-abcd-abcd-abcd',
            ascAppIdentifier: '87654321',
-            isVerboseFastlaneEnabled: false,
          },
          archiveSource: undefined,
        });
@@ -295,7 +288,6 @@ describe(IosSubmitCommand, () => {
            ascAppId: '12345678',
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -313,7 +305,6 @@ describe(IosSubmitCommand, () => {
            appleIdUsername: '[email protected]',
            appleAppSpecificPassword: 'abcd-abcd-abcd-abcd',
            ascAppIdentifier: '12345678',
-            isVerboseFastlaneEnabled: false,
          },
          archiveSource: undefined,
        });
@@ -359,7 +350,6 @@ describe(IosSubmitCommand, () => {
            ascAppId: '12345678',
          },
          nonInteractive: false,
-          isVerboseFastlaneEnabled: false,
          actor: mockJester,
          graphqlClient,
          analytics,
@@ -378,7 +368,6 @@ describe(IosSubmitCommand, () => {
            appleIdUsername: '[email protected]',
            appleAppSpecificPassword: 'abcd-abcd-abcd-abcd',
            ascAppIdentifier: '12345678',
-            isVerboseFastlaneEnabled: false,
          },
          archiveSource: undefined,
        });
@@ -109,7 +109,6 @@ function mockUpdateChannel({
 function mockUpdateBranches(branchNames: string[]): UpdateBranch[] {
  return branchNames.map(branchName => ({
    id: 'f9dc4dbb-663f-4a19-8cf2-a783b484d2db',
-    latestActivity: '2022-12-07T02:24:29.786Z',
    name: branchName ?? 'default-branch-name',
    app: {} as App,
    appId: '123',
@@ -153,7 +152,6 @@ function mockUpdateBranches(branchNames: string[]): UpdateBranch[] {
            updates: [],
            runtimes: { edges: [], pageInfo: { hasNextPage: false, hasPreviousPage: false } },
            __typename: 'UpdateBranch' as const,
-            latestActivity: '2022-12-07T02:24:29.786Z',
          },
          codeSigningInfo: null,
          __typename: 'Update' as const,
@@ -2,8 +2,6 @@ import { ExpoConfig } from '@expo/config';
 import { AndroidConfig, AndroidManifest, XML } from '@expo/config-plugins';

 import { RequestedPlatform } from '../../platform';
-import { isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync } from '../../project/projectUtils';
-import { expoUpdatesCommandAsync } from '../../utils/expoUpdatesCli';
 import { ensureValidVersions } from '../utils';

 /**
@@ -15,15 +13,6 @@ export async function syncUpdatesConfigurationAsync(
 ): Promise<void> {
  ensureValidVersions(exp, RequestedPlatform.Android);

-  if (await isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync(projectDir)) {
-    await expoUpdatesCommandAsync(projectDir, [
-      'configuration:syncnative',
-      '--platform',
-      'android',
-    ]);
-    return;
-  }
-
  // sync AndroidManifest.xml
  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
  const androidManifest = await getAndroidManifestAsync(projectDir);
@@ -43,7 +32,6 @@ export async function syncUpdatesConfigurationAsync(
    path: stringsJSONPath,
  });

-  // TODO(wschurman): this dependency needs to be updated for fingerprint
  const updatedStringsResourceXML =
    await AndroidConfig.Updates.applyRuntimeVersionFromConfigForProjectRootAsync(
      projectDir,