[eas-cli] eas updates: warn users if they near plan limits

2026-11-14 10:08:06 -10:00 · 2023-04-19 16:55:35 -07:00
155 changed files with 1417 additions and 4281 deletions
@@ -1,5 +1,8 @@
-<!-- If this PR requires a changelog entry, add it by commenting the PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`. -->
-<!-- You can skip the changelog check by labeling the PR with "no changelog". -->
+<!-- Thanks for contributing to _EAS CLI_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->
+
+# Checklist
+
+- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.

 # Why

@@ -1,48 +0,0 @@
-name: Changelog bot
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  pr-commented:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18
-      - name: Checkout Pull Request
-        run: hub pr checkout ${{ github.event.issue.number }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install dependencies
-        working-directory: ./scripts
-        run: yarn install --frozen-lockfile --check-files
-      - name: Add changelog entry
-        working-directory: ./scripts
-        run: |
-          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
-          if [[ ! "$PARAMS" =~ " " ]]; then
-            echo "Invalid /changelog-entry command"
-            exit 1
-          fi
-          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
-          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
-          yarn changelog-entry "$CATEGORY" "$MESSAGE"
-        env:
-          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
-          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
-          PR_COMMENT_BODY: ${{ github.event.comment.body }}
-      - name: Commit and push
-        run: |
-          # use the last commit author name and email
-          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
-          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
-
-          git add CHANGELOG.md
-          git commit -m "update CHANGELOG.md"
-          git push
@@ -1,37 +1,48 @@
-name: CHANGELOG.md PR check
-
 on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - labeled
-      - unlabeled
+  issue_comment:
+    types: [created]
+
+name: Changelog

 jobs:
-  pr-changelog-entry:
-    name: Check CHANGELOG.md updated
+  pr-commented:
    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
    steps:
      - uses: actions/checkout@v2
-      - name: Check if CHANGELOG.md was updated
-        id: changelog-updated
-        uses: tj-actions/changed-files@v35
        with:
-          files: CHANGELOG.md
-      - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent
-        if: steps.changelog-updated.outputs.any_changed == 'false' && !contains(github.event.pull_request.labels.*.name, 'no changelog')
-        uses: actions/github-script@v6
+          token: ${{ secrets.EXPO_BOT_PAT }}
+      - uses: actions/setup-node@v2
        with:
-          script: |
-            core.setFailed('Please add a changelog entry!')
-      - uses: mshick/[email protected]
-        if: always()
-        with:
-          message-id: changelog-entry-check
-          refresh-message-position: true
-          message: ${{ contains(github.event.pull_request.labels.*.name, 'no changelog') && '⏩ The changelog entry check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding the changelog entry!' }}
-          message-failure: |
-            ❌ It looks like a changelog entry is missing for this PR. You have two options: you can add it manually, or you can use the changelog bot to do it for you.
-            🤖 To use the bot, simply comment on this PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`.
-            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.
+          node-version: 18
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push
@@ -1,5 +1,4 @@
 name: Run tests
-
 on:
  push:
    branches: [main]
@@ -26,23 +25,20 @@ jobs:
      - run: yarn typecheck
      - run: yarn test
        if: ${{ !matrix.coverage }}
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
      - run: yarn test --coverage
        if: ${{ matrix.coverage }}
        env:
          # Oclif seems to cause OOM errors when testing with coverage enabled.
          # Remove this whenever we solved those OOM errors.
-          NODE_OPTIONS: --max-old-space-size=8192
+          NODE_OPTIONS: --max-old-space-size=4096
      - run: yarn lint --max-warnings=0
      - run: yarn install --frozen-lockfile --check-files
        working-directory: ./scripts
+      - run: yarn lint-changelog
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
-      - run: yarn lint-changelog
-
  notify-slack:
    runs-on: ubuntu-latest
    needs: test
@@ -12,105 +12,6 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🧹 Chores

-## [3.13.3](https://github.com/expo/eas-cli/releases/tag/v3.13.3) - 2023-06-05
-
-### 🐛 Bug fixes
-
- Show original GraphQL error message in case of an unexpected error. ([#1862](https://github.com/expo/eas-cli/pull/1862) by [@dsokal](https://github.com/dsokal))
- Fix updates synchronization of native files to include strings.xml for bare projects. ([#1865](https://github.com/expo/eas-cli/pull/1865) by [@wschurman](https://github.com/wschurman))
-
-## [3.13.2](https://github.com/expo/eas-cli/releases/tag/v3.13.2) - 2023-05-26
-
-### 🧹 Chores
-
- Refactor getExpoConfig to remove dangerous default. ([#1857](https://github.com/expo/eas-cli/pull/1857) by [@wschurman](https://github.com/wschurman))
- Add support for pending-cancel build status. ([#1855](https://github.com/expo/eas-cli/pull/1855) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [3.13.1](https://github.com/expo/eas-cli/releases/tag/v3.13.1) - 2023-05-24
-
-### 🧹 Chores
-
- Short format for selecting devices prompt. ([#1840](https://github.com/expo/eas-cli/pull/1840) by [@khamilowicz](https://github.com/khamilowicz))
- Improve typescript types for user display. ([#1851](https://github.com/expo/eas-cli/pull/1851) by [@wschurman](https://github.com/wschurman))
- Add error for `large` resource class not available on the free plan to server-side defined errors. ([#1848](https://github.com/expo/eas-cli/pull/1848) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.13.0](https://github.com/expo/eas-cli/releases/tag/v3.13.0) - 2023-05-17
-
-### 🎉 New features
-
- Add clear cache flag to eas update. ([#1839](https://github.com/expo/eas-cli/pull/1839) by [@quinlanj](https://github.com/quinlanj))
- Print EAS Update assets that timed out during upload or processing. ([#1849](https://github.com/expo/eas-cli/pull/1849) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Fix building iOS projects with framework targets. ([#1835](https://github.com/expo/eas-cli/pull/1835) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
- Ignore dirty workingdir when building from GitHub. ([#1842](https://github.com/expo/eas-cli/pull/1842) by [@wkozyra95](https://github.com/wkozyra95))
- Remove App Specific Password prompt. ([#1843](https://github.com/expo/eas-cli/pull/1843) by [@quinlanj](https://github.com/quinlanj))
- Validate `CFBundleShortVersionString`. ([#1846](https://github.com/expo/eas-cli/pull/1846) by [@khamilowicz](https://github.com/khamilowicz))
-
-## [3.12.1](https://github.com/expo/eas-cli/releases/tag/v3.12.1) - 2023-05-15
-
-### 🐛 Bug fixes
-
- Don't submit expired builds. ([#1837](https://github.com/expo/eas-cli/pull/1837) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
- Change red apple icon to green apple icon on successful build. ([#1828](https://github.com/expo/eas-cli/pull/1828) by [@dchhetri](https://github.com/dchhetri))
-
-## [3.12.0](https://github.com/expo/eas-cli/releases/tag/v3.12.0) - 2023-05-08
-
-### 🎉 New features
-
- Add `build:version:get` command. ([#1815](https://github.com/expo/eas-cli/pull/1815) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Upgrade dependencies. ([#1824](https://github.com/expo/eas-cli/pull/1824) by [@dsokal](https://github.com/dsokal))
-
-## [3.11.0](https://github.com/expo/eas-cli/releases/tag/v3.11.0) - 2023-05-05
-
-### 🎉 New features
-
- Add account list to `eas whoami`/`eas account:view`. ([#1814](https://github.com/expo/eas-cli/pull/1814) by [@wschurman](https://github.com/wschurman))
- Add `large` resource class for iOS as allowed value in `eas.json`. ([#1817](https://github.com/expo/eas-cli/pull/1817) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Print request ID on unforeseen GraphQL error for easier tracking and follow up. ([#1813](https://github.com/expo/eas-cli/pull/1813) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [3.10.2](https://github.com/expo/eas-cli/releases/tag/v3.10.2) - 2023-04-25
-
-### 🧹 Chores
-
- Add info about Xcode 14.3 image to `eas.schema.json`. ([#1808](https://github.com/expo/eas-cli/pull/1808) by [@szdziedzic](https://github.com/szdziedzic))
- Allow users to select an app to run using the `build:run` command if multiple apps are found in the tarball. ([#1807](https://github.com/expo/eas-cli/pull/1807) by [@szdziedzic](https://github.com/szdziedzic))
- Don't resolve `default` resource class for iOS in CLI. ([#1734](https://github.com/expo/eas-cli/pull/1734) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.10.1](https://github.com/expo/eas-cli/releases/tag/v3.10.1) - 2023-04-25
-
-### 🧹 Chores
-
- Add `cache.paths` field and deprecate `cache.customPaths`. ([#1794](https://github.com/expo/eas-cli/pull/1794) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [3.10.0](https://github.com/expo/eas-cli/releases/tag/v3.10.0) - 2023-04-21
-
-### 🎉 New features
-
- Added eas device:rename command. ([#1787](https://github.com/expo/eas-cli/pull/1787) by [@keith-kurak](https://github.com/keith-kurak))
-
-### 🐛 Bug fixes
-
- Fix `device:delete` not disabling on Apple. ([#1803](https://github.com/expo/eas-cli/pull/1803) by [@keith-kurak](https://github.com/keith-kurak))
- Fix message truncation for updates. ([#1801](https://github.com/expo/eas-cli/pull/1801) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Throw an error if somebody tries to start iOS build with the `large` resource class selected using the deprecated `--resource-class` flag. ([#1795](https://github.com/expo/eas-cli/pull/1795) by [@szdziedzic](https://github.com/szdziedzic))
-
 ## [3.9.3](https://github.com/expo/eas-cli/releases/tag/v3.9.3) - 2023-04-18

 ### 🐛 Bug fixes
@@ -188,7 +89,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Support variant detection for package\*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))
+- Support variant detection for package*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))

 ## [3.6.1](https://github.com/expo/eas-cli/releases/tag/v3.6.1) - 2023-02-20

@@ -1,10 +1,10 @@
-* @szdziedzic @wkozyra95
+* @dsokal @wkozyra95

-packages/eas-cli/src/build @szdziedzic @wkozyra95
-packages/eas-cli/src/commands/build @szdziedzic @wkozyra95
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95

-packages/eas-cli/src/submit @szdziedzic
-packages/eas-cli/src/commands/submit.ts @szdziedzic
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal

 packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
 packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
@@ -13,4 +13,4 @@ packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric

-packages/eas-json @szdziedzic @wkozyra95
+packages/eas-json @dsokal @wkozyra95
@@ -1,6 +1,6 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "3.13.3",
+  "version": "3.9.3",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -73,7 +73,6 @@ eas --help COMMAND
 * [`eas build:resign`](#eas-buildresign)
 * [`eas build:run`](#eas-buildrun)
 * [`eas build:submit`](#eas-buildsubmit)
-* [`eas build:version:get`](#eas-buildversionget)
 * [`eas build:version:set`](#eas-buildversionset)
 * [`eas build:version:sync`](#eas-buildversionsync)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
@@ -87,7 +86,6 @@ eas --help COMMAND
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:delete`](#eas-devicedelete)
 * [`eas device:list`](#eas-devicelist)
-* [`eas device:rename`](#eas-devicerename)
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
 * [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
@@ -133,7 +131,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

@@ -150,7 +148,7 @@ ALIASES
  $ eas logout
 ```

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

 ## `eas account:view`

@@ -167,7 +165,7 @@ ALIASES
  $ eas whoami
 ```

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

 ## `eas analytics [STATUS]`

@@ -181,7 +179,7 @@ DESCRIPTION
  display or change analytics settings
 ```

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

 ## `eas autocomplete [SHELL]`

@@ -231,7 +229,7 @@ DESCRIPTION
  create a branch
 ```

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

 ## `eas branch:delete [NAME]`

@@ -252,7 +250,7 @@ DESCRIPTION
  delete a branch
 ```

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

 ## `eas branch:list`

@@ -272,7 +270,7 @@ DESCRIPTION
  list all branches
 ```

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

 ## `eas branch:rename`

@@ -292,7 +290,7 @@ DESCRIPTION
  rename a branch
 ```

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

 ## `eas branch:view [NAME]`

@@ -315,7 +313,7 @@ DESCRIPTION
  view a branch
 ```

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

 ## `eas build`

@@ -345,7 +343,7 @@ DESCRIPTION
  start a build
 ```

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

 ## `eas build:cancel [BUILD_ID]`

@@ -362,7 +360,7 @@ DESCRIPTION
  cancel a build
 ```

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

 ## `eas build:configure`

@@ -379,7 +377,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

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

 ## `eas build:inspect`

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

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

 ## `eas build:list`

@@ -422,11 +420,10 @@ list all builds for your project

 ```
 USAGE
-  $ eas build:list [--platform all|android|ios] [--status
-    new|in-queue|in-progress|pending-cancel|errored|finished|canceled] [--distribution store|internal|simulator]
-    [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>] [--sdkVersion <value>] [--runtimeVersion
-    <value>] [--appIdentifier <value>] [--buildProfile <value>] [--gitCommitHash <value>] [--offset <value>] [--limit
-    <value>] [--json --non-interactive]
+  $ eas build:list [--platform all|android|ios] [--status new|in-queue|in-progress|errored|finished|canceled]
+    [--distribution store|internal|simulator] [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>]
+    [--sdkVersion <value>] [--runtimeVersion <value>] [--appIdentifier <value>] [--buildProfile <value>]
+    [--gitCommitHash <value>] [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
  --appBuildVersion=<value>
@@ -436,23 +433,23 @@ FLAGS
  --channel=<value>
  --distribution=(store|internal|simulator)
  --gitCommitHash=<value>
-  --json                                                                        Enable JSON output, non-JSON messages
-                                                                                will be printed to stderr.
-  --limit=<value>                                                               The number of items to fetch each query.
-                                                                                Defaults to 10 and is capped at 50.
-  --non-interactive                                                             Run the command in non-interactive mode.
-  --offset=<value>                                                              Start queries from specified index. Use
-                                                                                for paginating results. Defaults to 0.
+  --json                                                         Enable JSON output, non-JSON messages will be printed
+                                                                 to stderr.
+  --limit=<value>                                                The number of items to fetch each query. Defaults to 10
+                                                                 and is capped at 50.
+  --non-interactive                                              Run the command in non-interactive mode.
+  --offset=<value>                                               Start queries from specified index. Use for paginating
+                                                                 results. Defaults to 0.
  --platform=(all|android|ios)
  --runtimeVersion=<value>
  --sdkVersion=<value>
-  --status=(new|in-queue|in-progress|pending-cancel|errored|finished|canceled)
+  --status=(new|in-queue|in-progress|errored|finished|canceled)

 DESCRIPTION
  list all builds for your project
 ```

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

 ## `eas build:resign`

@@ -478,7 +475,7 @@ DESCRIPTION
  re-sign a build archive
 ```

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

 ## `eas build:run`

@@ -502,7 +499,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

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

 ## `eas build:submit`

@@ -532,30 +529,9 @@ ALIASES
  $ eas build:submit
 ```

-## `eas build:version:get`
-
-get the latest version from EAS servers
-
-```
-USAGE
-  $ eas build:version:get [-p android|ios|all] [-e <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.
-  -p, --platform=(android|ios|all)
-  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive                 Run the command in non-interactive mode.
-
-DESCRIPTION
-  get the latest version from EAS servers
-```
-
-_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v3.13.3/packages/eas-cli/src/commands/build/version/get.ts)_
-
 ## `eas build:version:set`

-update version of an app
+Update version of an app.

 ```
 USAGE
@@ -567,14 +543,14 @@ FLAGS
  -p, --platform=(android|ios)

 DESCRIPTION
-  update version of an app
+  Update version of an app.
 ```

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

 ## `eas build:version:sync`

-update a version in native code with a value stored on EAS servers
+Update a version in native code with a value stored on EAS servers

 ```
 USAGE
@@ -586,10 +562,10 @@ FLAGS
  -p, --platform=(android|ios|all)

 DESCRIPTION
-  update a version in native code with a value stored on EAS servers
+  Update a version in native code with a value stored on EAS servers
 ```

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

 ## `eas build:view [BUILD_ID]`

@@ -606,7 +582,7 @@ DESCRIPTION
  view a build for your project
 ```

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

 ## `eas channel:create [NAME]`

@@ -627,7 +603,7 @@ DESCRIPTION
  create a channel
 ```

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

 ## `eas channel:edit [NAME]`

@@ -649,7 +625,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

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

 ## `eas channel:list`

@@ -669,7 +645,7 @@ DESCRIPTION
  list all channels
 ```

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

 ## `eas channel:rollout [CHANNEL]`

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

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

 ## `eas channel:view [NAME]`

@@ -716,7 +692,7 @@ DESCRIPTION
  view a channel
 ```

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

 ## `eas config`

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

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

 ## `eas credentials`

@@ -754,7 +730,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.13.3/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/credentials.ts)_

 ## `eas device:create`

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

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

 ## `eas device:delete`

@@ -788,7 +764,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

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

 ## `eas device:list`

@@ -809,28 +785,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.13.3/packages/eas-cli/src/commands/device/list.ts)_
-
-## `eas device:rename`
-
-rename a registered device
-
-```
-USAGE
-  $ eas device:rename [--apple-team-id <value>] [--udid <value>] [--name <value>] [--json --non-interactive]
-
-FLAGS
-  --apple-team-id=<value>  The Apple team ID on which to find the device
-  --json                   Enable JSON output, non-JSON messages will be printed to stderr.
-  --name=<value>           The new name for the device
-  --non-interactive        Run the command in non-interactive mode.
-  --udid=<value>           The Apple device ID to rename
-
-DESCRIPTION
-  rename a registered device
-```
-
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v3.13.3/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:view [UDID]`

@@ -844,7 +799,7 @@ DESCRIPTION
  view a device for your project
 ```

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

 ## `eas diagnostics`

@@ -858,7 +813,7 @@ DESCRIPTION
  display environment info
 ```

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

 ## `eas help [COMMAND]`

@@ -946,7 +901,7 @@ DESCRIPTION
  validate the local store configuration
 ```

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

 ## `eas metadata:pull`

@@ -963,7 +918,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

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

 ## `eas metadata:push`

@@ -980,7 +935,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

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

 ## `eas open`

@@ -994,7 +949,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

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

 ## `eas project:info`

@@ -1008,7 +963,7 @@ DESCRIPTION
  information about the current project
 ```

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

 ## `eas project:init`

@@ -1030,7 +985,7 @@ ALIASES
  $ eas init
 ```

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

 ## `eas secret:create`

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

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

 ## `eas secret:delete`

@@ -1071,7 +1026,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

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

 ## `eas secret:list`

@@ -1085,7 +1040,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

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

 ## `eas secret:push`

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

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

 ## `eas submit`

@@ -1135,7 +1090,7 @@ ALIASES
  $ eas build:submit
 ```

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

 ## `eas update`

@@ -1144,15 +1099,14 @@ publish an update group
 ```
 USAGE
  $ eas update [--branch <value>] [--channel <value>] [--message <value>] [--republish | --input-dir <value>
-    | --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
-    [--json --non-interactive]
+    | --skip-bundler] [--group <value> |  | ] [-p android|ios|all] [--auto] [--private-key-path <value>] [--json
+    --non-interactive]

 FLAGS
  -p, --platform=(android|ios|all)  [default: all]
  --auto                            Use the current git branch and commit message for the EAS branch and update message
  --branch=<value>                  Branch to publish the update group on
  --channel=<value>                 Channel that the published update should affect
-  --clear-cache                     Clear the bundler cache before publishing
  --group=<value>                   Update group to republish (deprecated, see republish command)
  --input-dir=<value>               [default: dist] Location of the bundle
  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
@@ -1168,7 +1122,7 @@ DESCRIPTION
  publish an update group
 ```

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

 ## `eas update:configure`

@@ -1186,7 +1140,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

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

 ## `eas update:delete GROUPID`

@@ -1207,7 +1161,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

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

 ## `eas update:list`

@@ -1229,7 +1183,7 @@ DESCRIPTION
  view the recent updates
 ```

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

 ## `eas update:republish`

@@ -1253,7 +1207,7 @@ DESCRIPTION
  roll back to an existing update
 ```

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

 ## `eas update:view GROUPID`

@@ -1273,7 +1227,7 @@ DESCRIPTION
  update group details
 ```

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

 ## `eas webhook:create`

@@ -1294,7 +1248,7 @@ DESCRIPTION
  create a webhook
 ```

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

 ## `eas webhook:delete [ID]`

@@ -1314,7 +1268,7 @@ DESCRIPTION
  delete a webhook
 ```

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

 ## `eas webhook:list`

@@ -1332,7 +1286,7 @@ DESCRIPTION
  list webhooks
 ```

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

 ## `eas webhook:update`

@@ -1354,7 +1308,7 @@ DESCRIPTION
  update a webhook
 ```

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

 ## `eas webhook:view ID`

@@ -1371,7 +1325,7 @@ DESCRIPTION
  view a webhook
 ```

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

 ## `eas whoami`

@@ -2648,18 +2648,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "endSessionEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "id",
            "description": null,
@@ -2844,18 +2832,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "endSessionEndpoint",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "issuer",
            "description": null,
@@ -3132,18 +3108,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "endSessionEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "id",
            "description": null,
@@ -4881,39 +4845,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "deleteAndroidAppCredentials",
-            "description": "Delete a set of credentials for an Android app",
-            "args": [
-              {
-                "name": "id",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "DeleteAndroidAppCredentialsResult",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "setFcm",
            "description": "Set the FCM push key to be used in an Android app",
@@ -7552,22 +7483,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "insights",
-            "description": "App query field for querying EAS Insights about this app",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "AppInsights",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "iosAppCredentials",
            "description": "iOS app credentials for the project",
@@ -9245,112 +9160,6 @@
        "enumValues": null,
        "possibleTypes": null
      },
-      {
-        "kind": "OBJECT",
-        "name": "AppInsights",
-        "description": null,
-        "fields": [
-          {
-            "name": "totalUniqueUsers",
-            "description": null,
-            "args": [
-              {
-                "name": "timespan",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "InsightsTimespan",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "uniqueUsersByAppVersionOverTime",
-            "description": null,
-            "args": [
-              {
-                "name": "timespan",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "InsightsTimespan",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "UniqueUsersOverTimeData",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "uniqueUsersByPlatformOverTime",
-            "description": null,
-            "args": [
-              {
-                "name": "timespan",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "InsightsTimespan",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "UniqueUsersOverTimeData",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
      {
        "kind": "OBJECT",
        "name": "AppMutation",
@@ -13654,22 +13463,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "app",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "App",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "appBuildVersion",
            "description": null,
@@ -13823,18 +13616,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "customWorkflowName",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "distribution",
            "description": null,
@@ -14064,9 +13845,13 @@
            "description": "Retry time starts after completedAt",
            "args": [],
            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
            },
            "isDeprecated": false,
            "deprecationReason": null
@@ -14247,31 +14032,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "retryDisabledReason",
-            "description": null,
-            "args": [
-              {
-                "name": "newMode",
-                "description": null,
-                "type": {
-                  "kind": "ENUM",
-                  "name": "BuildMode",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "ENUM",
-              "name": "BuildRetryDisabledReason",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "runFromCI",
            "description": null,
@@ -15486,18 +15246,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "customWorkflowName",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "distribution",
            "description": null,
@@ -16797,47 +16545,6 @@
        ],
        "possibleTypes": null
      },
-      {
-        "kind": "ENUM",
-        "name": "BuildRetryDisabledReason",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "ALREADY_RETRIED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "INVALID_STATUS",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "IS_GITHUB_BUILD",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "NOT_COMPLETED_YET",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "TOO_MUCH_TIME_ELAPSED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
      {
        "kind": "ENUM",
        "name": "BuildStatus",
@@ -16881,12 +16588,6 @@
            "description": null,
            "isDeprecated": false,
            "deprecationReason": null
-          },
-          {
-            "name": "PENDING_CANCEL",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
          }
        ],
        "possibleTypes": null
@@ -18012,33 +17713,6 @@
        "enumValues": null,
        "possibleTypes": null
      },
-      {
-        "kind": "OBJECT",
-        "name": "DeleteAndroidAppCredentialsResult",
-        "description": null,
-        "fields": [
-          {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
      {
        "kind": "OBJECT",
        "name": "DeleteAndroidKeystoreResult",
@@ -18573,18 +18247,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "latestUpdate",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "Update",
-              "ofType": null
-            },
-            "isDeprecated": true,
-            "deprecationReason": "Not required for the new Deployment UI"
-          },
          {
            "name": "runtime",
            "description": null,
@@ -22068,49 +21730,6 @@
        "enumValues": null,
        "possibleTypes": null
      },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "InsightsTimespan",
-        "description": null,
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "end",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "start",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "DateTime",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
      {
        "kind": "SCALAR",
        "name": "Int",
@@ -23553,6 +23172,50 @@
        "enumValues": null,
        "possibleTypes": null
      },
+      {
+        "kind": "OBJECT",
+        "name": "IosAppCredentialsQuery",
+        "description": null,
+        "fields": [
+          {
+            "name": "byId",
+            "description": null,
+            "args": [
+              {
+                "name": "iosAppCredentialsId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "IosAppCredentials",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
      {
        "kind": "ENUM",
        "name": "IosBuildType",
@@ -24777,128 +24440,6 @@
        "enumValues": null,
        "possibleTypes": null
      },
-      {
-        "kind": "OBJECT",
-        "name": "LineChartData",
-        "description": null,
-        "fields": [
-          {
-            "name": "datasets",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "LineDataset",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "labels",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "String",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "LineDataset",
-        "description": null,
-        "fields": [
-          {
-            "name": "data",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "label",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
      {
        "kind": "ENUM",
        "name": "MailchimpAudience",
@@ -25687,12 +25228,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "BUILD_PLAN_CREDIT_THRESHOLD_EXCEEDED",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "SUBMISSION_COMPLETE",
            "description": null,
@@ -28791,6 +28326,22 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "iosAppCredentials",
+            "description": "Top-level query object for querying IosAppCredentials.",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "IosAppCredentialsQuery",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "me",
            "description": "If authenticated as a typical end user, this is the appropriate top-level\nquery object",
@@ -32575,33 +32126,6 @@
        "enumValues": null,
        "possibleTypes": null
      },
-      {
-        "kind": "OBJECT",
-        "name": "UniqueUsersOverTimeData",
-        "description": null,
-        "fields": [
-          {
-            "name": "data",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "LineChartData",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
      {
        "kind": "OBJECT",
        "name": "UnsubscribeFromNotificationResult",
@@ -32662,22 +32186,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "app",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "App",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "awaitingCodeSigningInfo",
            "description": null,
@@ -33931,26 +33439,6 @@
            "defaultValue": null,
            "isDeprecated": false,
            "deprecationReason": null
-          },
-          {
-            "name": "sdkVersions",
-            "description": null,
-            "type": {
-              "kind": "LIST",
-              "name": null,
-              "ofType": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
          }
        ],
        "interfaces": null,
@@ -36447,13 +35935,9 @@
            "description": null,
            "args": [],
            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "Role",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "Role",
+              "ofType": null
            },
            "isDeprecated": false,
            "deprecationReason": null
@@ -2,5 +2,4 @@ module.exports = async () => {
  process.env.TZ = 'UTC';
  process.env.EAS_NO_VCS = '1';
  process.env.EAS_PROJECT_ROOT = '/app';
-  process.env.FORCE_COLOR = '1';
 };
@@ -1,7 +1,7 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "3.13.3",
+  "version": "3.9.3",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
@@ -11,10 +11,10 @@
    "@expo/apple-utils": "1.2.0",
    "@expo/code-signing-certificates": "0.0.5",
    "@expo/config": "7.0.3",
-    "@expo/config-plugins": "6.0.2",
+    "@expo/config-plugins": "5.0.4",
    "@expo/config-types": "47.0.0",
-    "@expo/eas-build-job": "1.0.13",
-    "@expo/eas-json": "3.13.0",
+    "@expo/eas-build-job": "1.0.7",
+    "@expo/eas-json": "3.9.2",
    "@expo/json-file": "8.2.37",
    "@expo/multipart-body-parser": "1.1.0",
    "@expo/osascript": "2.0.33",
@@ -27,7 +27,7 @@
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.13",
+    "@expo/steps": "1.0.8",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "1.23.2",
    "@oclif/plugin-autocomplete": "1.3.10",
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BuildVersionGetView reading version when appVersionSource is set to local  1`] = `"This project is not configured for using remote version source. Add [1m{"cli": { "appVersionSource": "remote" }}[22m in eas.json or re-run this command without "--non-interactive" flag."`;
@@ -1,161 +0,0 @@
-import { AppVersionSource, EasJson } from '@expo/eas-json';
-import chalk from 'chalk';
-
-import BuildVersionGetView from '../../commands/build/version/get';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
-
-jest.mock('../../project/applicationIdentifier');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../utils/json');
-jest.mock('../../graphql/queries/AppVersionQuery');
-
-function withRemoteVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.REMOTE,
-    },
-  };
-}
-
-describe(BuildVersionGetView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('reading version for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`Android versionCode - ${chalk.bold('100')}`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
-  test('reading version for platform android when no remote version is set', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`No remote versions are configured for this project.`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
-  test('reading version with --json flag for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      versionCode: '100',
-    });
-  });
-
-  test('reading version with --json flag for platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=ios'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      buildNumber: '100',
-    });
-  });
-
-  test('reading version with --json flag when no remote version is set', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({});
-  });
-
-  test('reading version when appVersionSource is set to local ', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
-  });
-});
@@ -1,140 +0,0 @@
-import { AppVersionSource, EasJson } from '@expo/eas-json';
-import fs from 'fs-extra';
-import path from 'path';
-
-import BuildVersionSetView from '../../commands/build/version/set';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import * as prompts from '../../prompts';
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
-
-jest.mock('../../project/applicationIdentifier');
-jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../graphql/queries/AppQuery');
-jest.mock('../../graphql/mutations/AppVersionMutation');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../prompts');
-jest.mock('../../utils/json');
-
-function withRemoteVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.REMOTE,
-    },
-  };
-}
-
-describe(BuildVersionSetView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('setting version for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(AppVersionMutation.createAppVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      expect.objectContaining({
-        buildVersion: '1000',
-        storeVersion: '1.0.0',
-      })
-    );
-  });
-
-  test('printing current remote version before prompting for a new one', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(Log.log).toHaveBeenCalledWith(expect.stringMatching('configured with versionCode 100'));
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-  });
-
-  test('printing info that there is no remote version configured', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringMatching('does not have any versionCode configured')
-    );
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-  });
-
-  test('setting version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('setting version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-});
@@ -1,204 +0,0 @@
-import { Workflow } from '@expo/eas-build-job';
-import { AppVersionSource, EasJson } from '@expo/eas-json';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
-import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
-import BuildVersionSyncView from '../../commands/build/version/sync';
-import { Target } from '../../credentials/ios/types';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
-import { resolveTargetsAsync } from '../../project/ios/target';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import * as prompts from '../../prompts';
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
-
-jest.mock('../../build/android/version');
-jest.mock('../../build/ios/version');
-jest.mock('../../project/applicationIdentifier');
-jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../graphql/queries/AppQuery');
-jest.mock('../../graphql/mutations/AppVersionMutation');
-jest.mock('../../project/workflow');
-jest.mock('../../project/android/gradleUtils');
-jest.mock('../../project/ios/target');
-jest.mock('../../project/ios/scheme');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../prompts');
-jest.mock('../../utils/json');
-
-function withRemoteVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.REMOTE,
-    },
-  };
-}
-
-describe(BuildVersionSyncView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('syncing version for managed project on platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).not.toHaveBeenCalled();
-  });
-
-  test('syncing version for bare project on platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
-    jest.mocked(getAppBuildGradleAsync).mockImplementation(async () => ({
-      android: {},
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).toHaveBeenCalled();
-    expect(updateAndroidNativeVersionsAsync).toHaveBeenCalledWith({
-      projectDir: ctx.projectDir,
-      versionCode: 1000,
-    });
-  });
-
-  test('syncing version for managed project on platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
-    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(syncIosAsync).not.toHaveBeenCalled();
-  });
-
-  test('syncing version for bare project on platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    const fakeTarget: Target = {
-      targetName: 'testapp',
-      bundleIdentifier: 'eas.test.com',
-      entitlements: {},
-    };
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
-    jest.mocked(resolveTargetsAsync).mockImplementation(async () => [fakeTarget]);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
-    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(syncIosAsync).toHaveBeenCalled();
-    expect(updateIosNativeVersionsAsync).toHaveBeenCalledWith({
-      buildNumber: '1000',
-      projectDir: ctx.projectDir,
-      targets: [fakeTarget],
-    });
-  });
-
-  test('syncing version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('syncing version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-});
@@ -1,149 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-import { EasJson } from '@expo/eas-json';
-import { Command, Config } from '@oclif/core';
-import { vol } from 'memfs';
-import path from 'path';
-import { v4 as uuidv4 } from 'uuid';
-
-import { ContextInput, ContextOutput } from '../../commandUtils/EasCommand';
-import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import { AppFragment, Role } from '../../graphql/generated';
-
-export function getMockEasJson(): EasJson {
-  return {
-    cli: {},
-    build: {
-      production: {},
-    },
-  };
-}
-
-export const mockProjectId = 'fake-project-id';
-
-export function getMockAppFragment(): AppFragment {
-  return {
-    id: mockProjectId,
-    slug: 'testapp',
-    fullName: '@testuser/testpp',
-    ownerAccount: {
-      id: 'test-account-id',
-      name: 'testuser',
-      users: [
-        {
-          role: Role.Owner,
-          actor: {
-            id: 'test-user-id',
-          },
-        },
-      ],
-    },
-  };
-}
-
-export function getMockExpoConfig(): ExpoConfig {
-  return {
-    name: 'testapp',
-    slug: 'tetsapp',
-    extra: {
-      projectId: mockProjectId,
-    },
-  };
-}
-
-export interface LocalProjectContext {
-  projectDir: string;
-  exp?: ExpoConfig;
-  appId?: string;
-}
-
-export function mockCommandContext<
-  C extends {
-    [name: string]: any;
-  } = object
->(
-  commandClass: { contextDefinition: ContextInput<C> },
-  overrides: {
-    easJson?: EasJson;
-    exp?: ExpoConfig;
-    projectId?: string;
-    getDynamicPrivateProjectConfigAsync?: DynamicConfigContextFn;
-    getDynamicPublicProjectConfigAsync?: DynamicConfigContextFn;
-  }
-): ContextOutput<C> {
-  const projectDir = path.join('/test', uuidv4());
-  vol.reset();
-  vol.fromJSON({ 'eas.json': JSON.stringify(overrides.easJson ?? getMockEasJson()) }, projectDir);
-  const contextDefinition = commandClass.contextDefinition;
-
-  const result: any = {};
-  for (const [contextKey] of Object.entries(contextDefinition)) {
-    if (contextKey === 'loggedIn') {
-      result.loggedIn = {};
-    }
-
-    if (contextKey === 'projectDir') {
-      result.projectDir = projectDir;
-    }
-    if (contextKey === 'maybeLoggedIn') {
-      result.maybeLoggedIn = {};
-    }
-    if (contextKey === 'sessionManager') {
-      result.sessionManager = {};
-    }
-    if (contextKey === 'projectConfig') {
-      result.projectConfig = {
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      };
-    }
-    if (contextKey === 'getDynamicPrivateProjectConfigAsync') {
-      result.getDynamicPrivateProjectConfigAsync = () => ({
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      });
-    }
-
-    if (contextKey === 'getDynamicPublicProjectConfigAsync') {
-      result.getDynamicPublicProjectConfigAsync = () => ({
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      });
-    }
-  }
-  return result;
-}
-
-export function mockTestCommand<T extends Command>(
-  commandConstructor: new (argv: string[], config: Config) => T,
-  argv: string[],
-  ctx: any
-): T {
-  const cmd = new commandConstructor(argv, new Config({ root: __dirname }));
-  (cmd as any).getContextAsync = jest.fn(() => ctx);
-  return cmd;
-}
-
-export class NoErrorThrownError extends Error {}
-
-export const getErrorAsync = async <TError = any>(
-  call: () => unknown
-): Promise<TError | NoErrorThrownError> => {
-  try {
-    await call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};
-
-export const getError = <TError = any>(call: () => unknown): TError | NoErrorThrownError => {
-  try {
-    call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};
@@ -1,9 +1,7 @@
 import { Platform } from '@expo/eas-build-job';
 import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
-import { v4 as uuidv4 } from 'uuid';

-import { getError } from '../../__tests__/commands/utils';
 import { EasCommandError } from '../../commandUtils/errors';
 import Build from '../../commands/build';
 import Log, { link } from '../../log';
@@ -13,7 +11,6 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
  TurtleDeprecatedJobFormatError,
@@ -45,11 +42,9 @@ const EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS = `You have already reached the maxim
 const EXPECTED_GENERIC_MESSAGE =
  'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.';

-const mockRequestId = uuidv4();
 const getGraphQLError = (message: string, errorCode: string): GraphQLError => {
  return new GraphQLError(message, null, null, null, null, null, {
    errorCode,
-    requestId: mockRequestId,
  });
 };

@@ -119,135 +114,64 @@ describe(Build.name, () => {
    });

    describe('error is server-side defined error', () => {
-      describe('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
+      describe('throws correct EasCommandError subclass', () => {
+        describe('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
+          it('does it with Android', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
+            }
          });

-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
+          it('does it with iOS', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
-          });
-
-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
+            }
          });
        });
-      });

-      describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
+        describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
+          it('does it with Android', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
+            }
          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
+
+          it('does it with iOS', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
+            }
          });
        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_DISABLED_IOS', () => {
-        it('throws correct EasCommandError subclass', async () => {
+
+        it('does it for EAS_BUILD_FREE_TIER_DISABLED_IOS', async () => {
          const platform = Platform.IOS;
          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_IOS');
          const graphQLErrors = [graphQLError];
@@ -256,247 +180,181 @@ describe(Build.name, () => {
          try {
            handleBuildRequestError(error, platform);
          } catch (caughtError) {
-            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledIOSError, 'Error 1');
+            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledIOSError);
          }
        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', () => {
-        it('throws correct EasCommandError subclass', async () => {
+
+        it('does it for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', async () => {
          const platform = Platform.ANDROID;
          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });

-          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledAndroidError>(
-            () => {
-              handleBuildRequestError(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierDisabledAndroidError,
-            'Error 1'
-          );
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledAndroidError);
+          }
        });
-      });

-      describe('for VALIDATION_ERROR', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
+        describe('for VALIDATION_ERROR', () => {
+          it('does it with Android', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
+            try {
              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, RequestValidationError);
+            }
          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
+
+          it('does it with iOS', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
+            try {
              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, RequestValidationError);
+            }
          });
        });
      });
    });

    describe('error is other expected graphQL-related error', () => {
-      describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
+      describe('throws correct EasCommandError subclass', () => {
+        describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
+          it('does it with Android', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildDownForMaintenanceError,
+                EXPECTED_EAS_BUILD_DOWN_MESSAGE
+              );
+            }
          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
+
+          it('does it with iOS', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildDownForMaintenanceError,
+                EXPECTED_EAS_BUILD_DOWN_MESSAGE
+              );
+            }
          });
        });
-      });

-      describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
+        describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
+          it('does it with Android', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildTooManyPendingBuildsError,
+                EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
+              );
+            }
          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
+
+          it('does it with iOS', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildTooManyPendingBuildsError,
+                EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
+              );
+            }
          });
        });
      });
    });

    describe('error is unexpected graphQL-related error', () => {
-      describe('with Android', () => {
-        it('throws base Error class with custom message', async () => {
+      describe('throws base Error class with custom message', () => {
+        it('does it with Android', async () => {
          const platform = Platform.ANDROID;
          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;

-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+          }
        });
-        describe('without request ID', () => {
-          it('throws base Error class with custom message without request ID line', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-            delete graphQLError.extensions.requestId;
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;

-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-          });
-        });
-      });
-      describe('with iOS', () => {
-        it('throws base Error class with custom message', async () => {
+        it('does it with iOS', async () => {
          const platform = Platform.IOS;
          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;

-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        describe('without request ID', () => {
-          it('throws base Error class with custom message without request ID line', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-            delete graphQLError.extensions.requestId;
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
-
-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-          });
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+          }
        });
      });
    });

    describe('error is unexpected non-graphQL-related error', () => {
-      describe('with Android', () => {
-        it('throws base Error class with propagated message', async () => {
+      describe('throws base Error class with propagated message', () => {
+        it('does it with Android', async () => {
          const platform = Platform.ANDROID;
          const error = new Error('Non-graphQL-related error');

-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
            handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
+          } catch (caughtError) {
+            expect(caughtError).toStrictEqual(error);
+          }
        });
-      });
-      describe('with iOS', () => {
-        it('throws base Error class with propagated message', async () => {
+
+        it('does it with iOS', async () => {
          const platform = Platform.IOS;
          const error = new Error('Non-graphQL-related error');

-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
            handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
+          } catch (caughtError) {
+            expect(caughtError).toStrictEqual(error);
+          }
        });
      });
    });
@@ -24,7 +24,7 @@ interface JobData {

 const cacheDefaults = {
  disabled: false,
-  paths: [],
+  customPaths: [],
 };

 export async function prepareJobAsync(
@@ -42,7 +42,6 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
  TurtleDeprecatedJobFormatError,
@@ -81,14 +80,9 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {

 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;

-function resolveBuildParamsInput<T extends Platform>(
-  ctx: BuildContext<T>,
-  metadata: Metadata
-): BuildParamsInput {
+function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): BuildParamsInput {
  return {
    resourceClass: ctx.resourceClass,
-    sdkVersion: metadata.sdkVersion,
-    reactNativeVersion: metadata.reactNativeVersion,
  };
 }

@@ -148,7 +142,7 @@ export async function prepareBuildRequestForPlatformAsync<
  assert(projectArchive);

  const metadata = await collectMetadataAsync(ctx);
-  const buildParams = resolveBuildParamsInput(ctx, metadata);
+  const buildParams = resolveBuildParamsInput(ctx);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
    credentials: credentialsResult?.credentials,
@@ -182,8 +176,6 @@ const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
  EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
  EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
  EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
-  EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER:
-    EasBuildResourceClassNotAvailableInFreeTierError,
  VALIDATION_ERROR: RequestValidationError,
 };

@@ -205,15 +197,8 @@ export function handleBuildRequestError(error: any, platform: Platform): never {
      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
    );
  } else if (error?.graphQLErrors) {
-    const graphQLError = error.graphQLErrors[0];
-    const requestIdLine = graphQLError?.extensions?.requestId
-      ? `\nRequest ID: ${graphQLError.extensions.requestId}`
-      : '';
-    const originalErrorMessage = graphQLError?.message
-      ? `\nError message: ${graphQLError.message}`
-      : '';
    throw new Error(
-      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${requestIdLine}${originalErrorMessage}`
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
    );
  }
  throw error;
@@ -498,7 +483,6 @@ async function handleSingleBuildProgressAsync(
      }
      break;
    }
-    case BuildStatus.PendingCancel:
    case BuildStatus.Canceled:
      spinner.fail('Build canceled');
      return { refetch: false };
@@ -529,7 +513,6 @@ const statusToDisplayName: Record<BuildStatus, string> = {
  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
  [BuildStatus.InQueue]: 'in queue',
  [BuildStatus.InProgress]: 'in progress',
-  [BuildStatus.PendingCancel]: 'canceled',
  [BuildStatus.Canceled]: 'canceled',
  [BuildStatus.Finished]: 'finished',
  [BuildStatus.Errored]: 'failed',
@@ -548,12 +531,7 @@ async function handleMultipleBuildsProgressAsync(
    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
  const allSettled =
    builds.filter(build =>
-      [
-        BuildStatus.Finished,
-        BuildStatus.Errored,
-        BuildStatus.Canceled,
-        BuildStatus.PendingCancel,
-      ].includes(build.status)
+      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
    ).length === buildCount;

  if (allSettled) {
@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor, ResourceClass } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

@@ -53,11 +53,21 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
    development: {
      developmentClient: true,
      distribution: 'internal',
+      ios: {
+        resourceClass: ResourceClass.M_MEDIUM,
+      },
    },
    preview: {
      distribution: 'internal',
+      ios: {
+        resourceClass: ResourceClass.M_MEDIUM,
+      },
+    },
+    production: {
+      ios: {
+        resourceClass: ResourceClass.M_MEDIUM,
+      },
    },
-    production: {},
  },
  submit: {
    production: {},
@@ -76,12 +86,20 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
      },
      ios: {
        buildConfiguration: 'Debug',
+        resourceClass: ResourceClass.M_MEDIUM,
      },
    },
    preview: {
      distribution: 'internal',
+      ios: {
+        resourceClass: ResourceClass.M_MEDIUM,
+      },
+    },
+    production: {
+      ios: {
+        resourceClass: ResourceClass.M_MEDIUM,
+      },
    },
-    production: {},
  },
  submit: {
    production: {},
@@ -8,7 +8,6 @@ import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
 import { BuildResourceClass } from '../graphql/generated';
 import { GradleBuildContext } from '../project/android/gradle';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { LocalBuildOptions } from './local';
@@ -52,7 +51,6 @@ export interface BuildContext<T extends Platform> {
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
  workflow: Workflow;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
  ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }
@@ -9,7 +9,6 @@ import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/An
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
@@ -34,8 +33,7 @@ export async function createBuildContextAsync<T extends Platform>({
  actor,
  graphqlClient,
  analytics,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
+  getDynamicProjectConfigAsync,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -51,10 +49,9 @@ export async function createBuildContextAsync<T extends Platform>({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
+  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform);
@@ -93,6 +90,8 @@ export async function createBuildContextAsync<T extends Platform>({
  const resourceClass = await resolveBuildResourceClassAsync(
    buildProfile,
    platform,
+    projectDir,
+    exp,
    resourceClassFlag
  );

@@ -119,7 +118,6 @@ export async function createBuildContextAsync<T extends Platform>({
    workflow,
    message,
    runFromCI,
-    customBuildConfigMetadata,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -8,8 +8,6 @@ export class EasBuildFreeTierDisabledIOSError extends EasCommandError {}

 export class EasBuildFreeTierDisabledAndroidError extends EasCommandError {}

-export class EasBuildResourceClassNotAvailableInFreeTierError extends EasCommandError {}
-
 export class RequestValidationError extends EasCommandError {}

 export class EasBuildDownForMaintenanceError extends EasCommandError {}
@@ -77,7 +77,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
      targets: [
        {
@@ -88,9 +88,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -113,7 +113,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
      targets: [
        {
@@ -124,9 +124,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info2.plist'
+      '/repo/ios/myproject/Info2.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -148,7 +148,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
      targets: [
        {
@@ -159,9 +159,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.1');
    expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -183,7 +183,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
      targets: [
        {
@@ -194,9 +194,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -214,11 +214,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -230,11 +230,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('1.0.1');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.1');
@@ -246,11 +246,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/app',
+      projectDir: '/repo',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -262,7 +262,7 @@ describe(readBuildNumberAsync, () => {
  describe('bare project', () => {
    it('reads the build number from native code', async () => {
      const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {});
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -270,7 +270,7 @@ describe(readBuildNumberAsync, () => {
  describe('managed project', () => {
    it('reads the build number from expo config', async () => {
      const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {});
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -280,38 +280,24 @@ describe(readShortVersionAsync, () => {
  describe('bare project', () => {
    it('reads the short version from native code', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {});
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
    it('evaluates interpolated build number', async () => {
      const exp = initBareWorkflowProject({
        appVersion: '$(CURRENT_PROJECT_VERSION)',
      });
-      const buildNumber = await readShortVersionAsync('/app', exp, {
+      const buildNumber = await readShortVersionAsync('/repo', exp, {
        CURRENT_PROJECT_VERSION: '1.0.0',
      });
      expect(buildNumber).toBe('1.0.0');
    });
-
-    it('fails when build number is invalid', async () => {
-      const exp = initBareWorkflowProject({
-        appVersion: '$(CURRENT_PROJECT_VERSION)',
-      });
-
-      await expect(
-        readShortVersionAsync('/app', exp, {
-          CURRENT_PROJECT_VERSION: '0.0.7.1.028',
-        })
-      ).rejects.toThrowError(
-        'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
-      );
-    });
  });

  describe('managed project', () => {
    it('reads the version from app config', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {});
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
  });
@@ -323,75 +309,66 @@ describe(getInfoPlistPath, () => {
      {
        './ios/testapp/Info.plist': '',
      },
-      '/app'
+      '/repo'
    );
-    const plistPath = getInfoPlistPath('/app', {});
-    expect(plistPath).toBe('/app/ios/testapp/Info.plist');
+    const plistPath = getInfoPlistPath('/repo', {});
+    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
  });
  it('returns INFOPLIST_FILE if specified', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/app'
+      '/repo'
    );
-    const plistPath = getInfoPlistPath('/app', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
+    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
  });
  it('evaluates SRCROOT in Info.plist', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/app'
+      '/repo'
    );
-    const plistPath = getInfoPlistPath('/app', {
+    const plistPath = getInfoPlistPath('/repo', {
      INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
    });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
  });
  it('evaluates BuildSettings in Info.plist', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/app'
+      '/repo'
    );
-    const plistPath = getInfoPlistPath('/app', {
+    const plistPath = getInfoPlistPath('/repo', {
      INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
      TARGET_NAME: 'NotInfo',
    });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
  });
 });

 function initBareWorkflowProject({
  appVersion = '1.0.0',
  buildNumber = '1',
-  expoConfig = {},
  infoPlistName = 'Info.plist',
-}: {
-  appVersion?: string;
-  buildNumber?: string;
-  infoPlistName?: string;
-  expoConfig?: { version?: string; ios?: object };
-} = {}): ExpoConfig {
+}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
  const fakeExp: ExpoConfig = {
    name: 'myproject',
    slug: 'myproject',
    version: '1.0.0',
    ios: {
      buildNumber: '1',
-      ...expoConfig.ios,
    },
-    ...expoConfig,
  };
  vol.fromJSON(
    {
      './app.json': JSON.stringify({
        expo: fakeExp,
      }),
-      './ios/myproject.xcodeproj/project.pbxproj': '',
      [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -403,7 +380,7 @@ function initBareWorkflowProject({
 </dict>
 </plist>`,
    },
-    '/app'
+    '/repo'
  );

  return fakeExp;
@@ -425,7 +402,7 @@ function initManagedProject(): ExpoConfig {
        expo: fakeExp,
      }),
    },
-    '/app'
+    '/repo'
  );

  return fakeExp;
@@ -27,7 +27,7 @@ interface JobData {

 const cacheDefaults = {
  disabled: false,
-  paths: [],
+  customPaths: [],
 };

 export async function prepareJobAsync(
@@ -22,8 +22,6 @@ import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

-const SHORT_VERSION_REGEX = /^\d+.\d+.\d+$/;
-
 export enum BumpStrategy {
  APP_VERSION,
  BUILD_NUMBER,
@@ -99,14 +97,6 @@ export async function bumpVersionInAppJsonAsync({
  }
 }

-function validateShortVersion(shortVersion: string | undefined): void {
-  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
-    throw new Error(
-      `CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: ${shortVersion}`
-    );
-  }
-}
-
 export async function readShortVersionAsync(
  projectDir: string,
  exp: ExpoConfig,
@@ -115,15 +105,11 @@ export async function readShortVersionAsync(
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
-
-    const shortVersion =
+    return (
      infoPlist.CFBundleShortVersionString &&
-      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings);
-
-    validateShortVersion(shortVersion);
-    return shortVersion;
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
+    );
  } else {
-    validateShortVersion(exp.version);
    return exp.version;
  }
 }
@@ -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.18';
+const PLUGIN_PACKAGE_VERSION = '0.0.128';

 export enum LocalBuildMode {
  /**
@@ -19,7 +19,6 @@ import { getVcsClient } from '../vcs';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
@@ -48,10 +47,7 @@ export async function collectMetadataAsync<T extends Platform>(
    gitCommitMessage: truncateGitCommitMessage(
      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
    ),
-    isGitWorkingTreeDirty:
-      ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
-        ? false
-        : await vcsClient.hasUncommittedChangesAsync(),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, ctx.user),
    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
@@ -62,7 +58,6 @@ export async function collectMetadataAsync<T extends Platform>(
    runWithNoWaitFlag: ctx.noWait,
    runFromCI: ctx.runFromCI,
    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
-    customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
  };
  return sanitizeMetadata(metadata);
 }
@@ -31,10 +31,7 @@ import {
  appPlatformEmojis,
  toPlatforms,
 } from '../platform';
-import {
-  CustomBuildConfigMetadata,
-  validateCustomBuildConfigAsync,
-} from '../project/customBuildConfig';
+import { validateCustomBuildConfigAsync } from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
 import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
@@ -93,7 +90,7 @@ export async function runBuildAndSubmitAsync(
  projectDir: string,
  flags: BuildFlags,
  actor: Actor,
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
+  getDynamicProjectConfigAsync: DynamicConfigContextFn
 ): Promise<void> {
  await getVcsClient().ensureRepoExistsAsync();
  await ensureRepoIsCleanAsync(flags.nonInteractive);
@@ -120,14 +117,9 @@ export async function runBuildAndSubmitAsync(
    buildProfiles,
  });

-  const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
-    {};
  for (const buildProfile of buildProfiles) {
    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-    const maybeMetadata = await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
-    if (maybeMetadata) {
-      customBuildConfigMetadataByPlatform[toAppPlatform(buildProfile.platform)] = maybeMetadata;
-    }
+    await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
  }

  const startedBuilds: {
@@ -137,7 +129,6 @@ export async function runBuildAndSubmitAsync(
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};

  for (const buildProfile of buildProfiles) {
-    const platform = toAppPlatform(buildProfile.platform);
    const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
      projectDir,
      flags,
@@ -147,13 +138,12 @@ export async function runBuildAndSubmitAsync(
      actor,
      graphqlClient,
      analytics,
-      getDynamicPrivateProjectConfigAsync,
-      customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
+      getDynamicProjectConfigAsync,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
    }
-    buildCtxByPlatform[platform] = buildCtx;
+    buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
  }

  if (flags.localBuildOptions.localBuildMode) {
@@ -218,9 +208,7 @@ export async function runBuildAndSubmitAsync(
  }

  const haveAllBuildsFailedOrCanceled = builds.every(
-    build =>
-      build?.status &&
-      [BuildStatus.Errored, BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build?.status)
+    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
  );

  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
@@ -257,8 +245,7 @@ async function prepareAndStartBuildAsync({
  actor,
  graphqlClient,
  analytics,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
+  getDynamicProjectConfigAsync,
 }: {
  projectDir: string;
  flags: BuildFlags;
@@ -268,8 +255,7 @@ async function prepareAndStartBuildAsync({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -286,8 +272,7 @@ async function prepareAndStartBuildAsync({
    actor,
    graphqlClient,
    analytics,
-    getDynamicPrivateProjectConfigAsync,
-    customBuildConfigMetadata,
+    getDynamicProjectConfigAsync,
  });

  if (moreBuilds) {
@@ -2,7 +2,6 @@ export enum BuildStatus {
  NEW = 'new',
  IN_QUEUE = 'in-queue',
  IN_PROGRESS = 'in-progress',
-  PENDING_CANCEL = 'pending-cancel',
  ERRORED = 'errored',
  FINISHED = 'finished',
  CANCELED = 'canceled',
@@ -27,7 +27,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
            return chalk.blue('in queue');
          case GraphQLBuildStatus.InProgress:
            return chalk.blue('in progress');
-          case GraphQLBuildStatus.PendingCancel:
          case GraphQLBuildStatus.Canceled:
            return chalk.gray('canceled');
          case GraphQLBuildStatus.Finished:
@@ -91,7 +90,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
          case GraphQLBuildStatus.InQueue:
          case GraphQLBuildStatus.InProgress:
            return '<in progress>';
-          case GraphQLBuildStatus.PendingCancel:
          case GraphQLBuildStatus.Canceled:
          case GraphQLBuildStatus.Errored:
            return null;
@@ -80,7 +80,7 @@ function printBuildResult(build: BuildFragment): void {
    }
    return;
  }
-  if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build.status)) {
+  if (build.status === BuildStatus.Canceled) {
    Log.addNewLineIfNone();
    Log.error(
      `${appPlatformEmojis[build.platform]} ${
@@ -1,9 +1,12 @@
+import { ExpoConfig } from '@expo/config-types';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, ResourceClass } from '@expo/eas-json';
 import chalk from 'chalk';
+import semver from 'semver';

 import { BuildResourceClass } from '../../graphql/generated';
-import Log, { link } from '../../log';
+import Log from '../../log';
+import { getReactNativeVersionAsync } from '../metadata';

 type AndroidResourceClass = Exclude<
  ResourceClass,
@@ -39,20 +42,22 @@ const androidResourceClassToBuildResourceClassMapping: Record<
 export async function resolveBuildResourceClassAsync<T extends Platform>(
  profile: BuildProfile<T>,
  platform: Platform,
+  projectDir: string,
+  exp: ExpoConfig,
  resourceClassFlag?: ResourceClass
 ): Promise<BuildResourceClass> {
  const profileResourceClass = profile.resourceClass;

  if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
    Log.warn(
-      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing "${resourceClassFlag}" as the override.`
+      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing the  "${resourceClassFlag}" as the override.`
    );
  }

  const selectedResourceClass = resourceClassFlag ?? profileResourceClass;

  return platform === Platform.IOS
-    ? resolveIosResourceClass(resourceClassFlag, profileResourceClass)
+    ? await resolveIosResourceClassAsync(exp, projectDir, resourceClassFlag ?? profileResourceClass)
    : resolveAndroidResourceClass(selectedResourceClass);
 }

@@ -74,19 +79,13 @@ function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): Bui
  return androidResourceClassToBuildResourceClassMapping[resourceClass as AndroidResourceClass];
 }

-function resolveIosResourceClass(
-  resourceClassFlag?: ResourceClass,
-  profileResourceClass?: ResourceClass
-): BuildResourceClass {
-  const resourceClass = resourceClassFlag ?? profileResourceClass ?? ResourceClass.DEFAULT;
-
-  if (resourceClassFlag === ResourceClass.LARGE) {
-    throw new Error(
-      `Experimental "large" resource class for Intel iOS workers is no longer available. Remove the specified resource class to use the default, or learn more about all available resource classes: ${link(
-        'https://docs.expo.dev/build-reference/eas-json/'
-      )}`
-    );
-  }
+async function resolveIosResourceClassAsync(
+  exp: ExpoConfig,
+  projectDir: string,
+  selectedResourceClass?: ResourceClass
+): Promise<BuildResourceClass> {
+  const resourceClass =
+    selectedResourceClass ?? (await resolveIosDefaultRequestedResourceClassAsync(exp, projectDir));

  if ([ResourceClass.M1_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
    Log.warn(
@@ -96,13 +95,29 @@ function resolveIosResourceClass(
    );
  }

-  if ([ResourceClass.M_LARGE, ResourceClass.M1_LARGE].includes(resourceClass)) {
+  if (resourceClass === ResourceClass.M1_LARGE) {
    Log.warn(
-      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
-        'large'
+      `Resource class ${chalk.bold('m1-large')} is deprecated. Use ${chalk.bold(
+        'm-large'
      )} instead.`
    );
  }

  return iosResourceClassToBuildResourceClassMapping[resourceClass];
 }
+
+async function resolveIosDefaultRequestedResourceClassAsync(
+  exp: ExpoConfig,
+  projectDir: string
+): Promise<ResourceClass> {
+  const { sdkVersion } = exp;
+  const reactNativeVersion = await getReactNativeVersionAsync(projectDir);
+  if (
+    (sdkVersion && semver.satisfies(sdkVersion, '>=48')) ||
+    (reactNativeVersion && semver.satisfies(reactNativeVersion, '>=0.71.0'))
+  ) {
+    return ResourceClass.M_MEDIUM;
+  } else {
+    return ResourceClass.DEFAULT;
+  }
+}
@@ -11,19 +11,16 @@ import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from './context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
 import LoggedInContextField from './context/LoggedInContextField';
 import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
-import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
-import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
+import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
+import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import { EasCommandError } from './errors';

-export type ContextInput<
+type ContextInput<
  T extends {
    [name: string]: any;
  } = object
@@ -31,7 +28,7 @@ export type ContextInput<
  [P in keyof T]: ContextField<T[P]>;
 };

-export type ContextOutput<
+type ContextOutput<
  T extends {
    [name: string]: any;
  } = object
@@ -68,7 +65,7 @@ export default abstract class EasCommand extends Command {
     * run within a project directory, null otherwise.
     */
    OptionalProjectConfig: {
-      privateProjectConfig: new OptionalPrivateProjectConfigContextField(),
+      projectConfig: new OptionalProjectConfigContextField(),
    },
    /**
     * Require this command to be run in a project directory. Return the project directory in the context.
@@ -81,9 +78,7 @@ export default abstract class EasCommand extends Command {
     */
    DynamicProjectConfig: {
      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicPublicProjectConfigAsync: new DynamicPublicProjectConfigContextField(),
-      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicPrivateProjectConfigAsync: new DynamicPrivateProjectConfigContextField(),
+      getDynamicProjectConfigAsync: new DynamicProjectConfigContextField(),
    },
    /**
     * Require the project to be identified and registered on server. Returns the project config in the context.
@@ -92,7 +87,7 @@ export default abstract class EasCommand extends Command {
     */
    ProjectConfig: {
      loggedIn: new LoggedInContextField(),
-      privateProjectConfig: new PrivateProjectConfigContextField(),
+      projectConfig: new ProjectConfigContextField(),
    },
    /**
     * Analytics manager. Returns the analytics manager in the context for use by the command.
@@ -193,10 +188,7 @@ export default abstract class EasCommand extends Command {
    if (err instanceof EasCommandError) {
      Log.error(err.message);
    } else if (err instanceof CombinedError && err?.graphQLErrors) {
-      let cleanMessage = err.message.replace('[GraphQL] ', '');
-      cleanMessage += err?.graphQLErrors?.[0]?.extensions?.requestId
-        ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
-        : '';
+      const cleanMessage = err.message.replace('[GraphQL] ', '');
      Log.error(cleanMessage);
      baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
    } else {
@@ -1,6 +1,4 @@
 import { CombinedError } from '@urql/core';
-import { GraphQLError } from 'graphql/error';
-import { v4 as uuidv4 } from 'uuid';

 import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
 import Log from '../../log';
@@ -19,7 +17,6 @@ jest.mock('../../analytics/AnalyticsManager', () => {
 jest.mock('../../log');

 let originalProcessArgv: string[];
-const mockRequestId = uuidv4();

 beforeAll(() => {
  originalProcessArgv = process.argv;
@@ -140,38 +137,6 @@ describe(EasCommand.name, () => {
        expect(logDebugSpy).toBeCalledWith(error);
      });

-      it('logs the cleaned message with request ID if present', async () => {
-        const TestEasCommand = createTestEasCommand();
-        const logErrorSpy = jest.spyOn(Log, 'error');
-        const logDebugSpy = jest.spyOn(Log, 'debug');
-        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
-        const graphQLError = new GraphQLError(
-          'Unexpected GraphQL error message',
-          null,
-          null,
-          null,
-          null,
-          null,
-          {
-            errorCode: 'UNKNOWN_GRAPHQL_ERROR',
-            requestId: mockRequestId,
-          }
-        );
-        const graphQLErrors = [graphQLError];
-        const error = new CombinedError({ graphQLErrors });
-        runAsyncMock.mockImplementation(() => {
-          throw error;
-        });
-        try {
-          await TestEasCommand.run();
-        } catch {}
-
-        expect(logErrorSpy).toBeCalledWith(
-          `Unexpected GraphQL error message\nRequest ID: ${mockRequestId}`
-        );
-        expect(logDebugSpy).toBeCalledWith(error);
-      });
-
      it('re-throws the error with default base message', async () => {
        const TestEasCommand = createTestEasCommand();
        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
@@ -1,55 +1,29 @@
 import { ExpoConfig } from '@expo/config-types';

-import {
-  ExpoConfigOptions,
-  getPrivateExpoConfig,
-  getPublicExpoConfig,
-} from '../../project/expoConfig';
+import { ExpoConfigOptions, getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';

-export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
+export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
  projectId: string;
  exp: ExpoConfig;
  projectDir: string;
 }>;

-export class DynamicPublicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
  async getValueAsync({
    nonInteractive,
    sessionManager,
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPublicExpoConfig(projectDir, options);
+      const expBefore = getExpoConfig(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
      });
-      const exp = getPublicExpoConfig(projectDir, options);
-      return {
-        exp,
-        projectDir,
-        projectId,
-      };
-    };
-  }
-}
-
-export class DynamicPrivateProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-  }: ContextOptions): Promise<DynamicConfigContextFn> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPrivateExpoConfig(projectDir, options);
-      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-        nonInteractive,
-        env: options?.env,
-      });
-      const exp = getPrivateExpoConfig(projectDir, options);
+      const exp = getExpoConfig(projectDir, options);
      return {
        exp,
        projectDir,
@@ -1,12 +1,12 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';

-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';

-export class OptionalPrivateProjectConfigContextField extends ContextField<
+export class OptionalProjectConfigContextField extends ContextField<
  | {
      projectId: string;
      exp: ExpoConfig;
@@ -35,11 +35,11 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
      return undefined;
    }

-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
    return {
      exp,
      projectDir,
@@ -1,11 +1,11 @@
 import { ExpoConfig } from '@expo/config-types';

-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';

-export class PrivateProjectConfigContextField extends ContextField<{
+export default class ProjectConfigContextField extends ContextField<{
  projectId: string;
  exp: ExpoConfig;
  projectDir: string;
@@ -16,11 +16,11 @@ export class PrivateProjectConfigContextField extends ContextField<{
    projectDir: string;
  }> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);

    return {
      projectId,
@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import { getPrivateExpoConfig } from '../../../project/expoConfig';
+import { getExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
@@ -24,7 +24,7 @@ export async function saveProjectIdToAppConfigAsync(
  projectId: string,
  options: { env?: Env } = {}
 ): Promise<void> {
-  const exp = getPrivateExpoConfig(projectDir, options);
+  const exp = getExpoConfig(projectDir, options);
  const result = await modifyConfigAsync(
    projectDir,
    {
@@ -1,10 +1,8 @@
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';

 import EasCommand from '../../commandUtils/EasCommand';
-import { Role } from '../../graphql/generated';
 import Log from '../../log';
-import { Actor, getActorDisplayName } from '../../user/User';
+import { getActorDisplayName } from '../../user/User';

 export default class AccountView extends EasCommand {
  static override description = 'show the username you are logged in as';
@@ -20,48 +18,9 @@ export default class AccountView extends EasCommand {
    } = await this.getContextAsync(AccountView, { nonInteractive: true });
    if (actor) {
      Log.log(chalk.green(getActorDisplayName(actor)));
-
-      // personal account is included, only show if more accounts that personal account
-      // but do show personal account in list if there are more
-      const accountExcludingPersonalAccount = actor.accounts.filter(
-        account => !('username' in actor) || account.name !== actor.username
-      );
-      if (accountExcludingPersonalAccount.length > 0) {
-        Log.newLine();
-        Log.log('Accounts:');
-        actor.accounts.forEach(account => {
-          const roleOnAccount = AccountView.getRoleOnAccount(actor, account);
-          Log.log(`• ${account.name} (Role: ${AccountView.getLabelForRole(roleOnAccount)})`);
-        });
-      }
    } else {
      Log.warn('Not logged in');
      process.exit(1);
    }
  }
-
-  private static getRoleOnAccount(actor: Actor, account: Actor['accounts'][0]): Role {
-    if ('username' in actor && account.name === actor.username) {
-      return Role.Owner;
-    }
-
-    return nullthrows(account.users.find(user => user.actor.id === actor.id)?.role);
-  }
-
-  private static getLabelForRole(role: Role): string {
-    switch (role) {
-      case Role.Owner:
-        return 'Owner';
-      case Role.Admin:
-        return 'Admin';
-      case Role.Developer:
-        return 'Developer';
-      case Role.ViewOnly:
-        return 'Viewer';
-      case Role.Custom:
-      case Role.HasAdmin:
-      case Role.NotAdmin:
-        return 'Custom';
-    }
-  }
 }
@@ -35,7 +35,7 @@ export default class BranchCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(BranchCreate);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchCreate, {
      nonInteractive,
@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
    }

    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchDelete, { nonInteractive });
    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
@@ -20,7 +20,7 @@ export default class BranchList extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchList, {
      nonInteractive: flags['non-interactive'],
@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
      flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
    } = await this.parse(BranchRename);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchRename, {
      nonInteractive,
@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
    } = await this.parse(BranchView);
    const { 'non-interactive': nonInteractive } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchView, {
      nonInteractive,
@@ -147,7 +147,7 @@ export default class BuildCancel extends EasCommand {
      flags: { 'non-interactive': nonInteractive },
    } = await this.parse(BuildCancel);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildCancel, {
      nonInteractive,
@@ -174,7 +174,7 @@ export default class BuildCancel extends EasCommand {
    const spinner = ora().start('Canceling the build…');
    try {
      const { status } = await cancelBuildAsync(graphqlClient, buildId);
-      if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(status)) {
+      if (status === BuildStatus.Canceled) {
        spinner.succeed('Build canceled');
      } else {
        spinner.text = 'Build is already completed';
@@ -33,7 +33,7 @@ export default class BuildConfigure extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
    const {
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildConfigure, {
      nonInteractive: false,
@@ -118,7 +118,7 @@ export default class Build extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(Build, {
@@ -144,7 +144,7 @@ export default class Build extends EasCommand {
      projectDir,
      flagsWithPlatform,
      actor,
-      getDynamicPrivateProjectConfigAsync
+      getDynamicProjectConfigAsync
    );
  }

@@ -73,7 +73,7 @@ export default class BuildInspect extends EasCommand {
    const { flags } = await this.parse(BuildInspect);
    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildInspect, {
@@ -120,7 +120,7 @@ export default class BuildInspect extends EasCommand {
            },
          },
          actor,
-          getDynamicPrivateProjectConfigAsync
+          getDynamicProjectConfigAsync
        );
        if (!flags.verbose) {
          Log.log(chalk.green('Build successful'));
@@ -46,7 +46,7 @@ export default class BuildInternal extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildInternal, {
@@ -74,7 +74,7 @@ export default class BuildInternal extends EasCommand {
        },
      },
      actor,
-      getDynamicPrivateProjectConfigAsync
+      getDynamicProjectConfigAsync
    );
  }
 }
@@ -27,7 +27,6 @@ export default class BuildList extends EasCommand {
        BuildStatus.NEW,
        BuildStatus.IN_QUEUE,
        BuildStatus.IN_PROGRESS,
-        BuildStatus.PENDING_CANCEL,
        BuildStatus.ERRORED,
        BuildStatus.FINISHED,
        BuildStatus.CANCELED,
@@ -69,7 +68,7 @@ export default class BuildList extends EasCommand {
      'non-interactive': nonInteractive,
    } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive,
@@ -124,8 +123,6 @@ const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | u
    return GraphQLBuildStatus.InQueue;
  } else if (buildStatus === BuildStatus.IN_PROGRESS) {
    return GraphQLBuildStatus.InProgress;
-  } else if (buildStatus === BuildStatus.PENDING_CANCEL) {
-    return GraphQLBuildStatus.PendingCancel;
  } else if (buildStatus === BuildStatus.ERRORED) {
    return GraphQLBuildStatus.Errored;
  } else if (buildStatus === BuildStatus.FINISHED) {
@@ -101,7 +101,7 @@ export default class BuildResign extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildResign, {
@@ -130,7 +130,7 @@ export default class BuildResign extends EasCommand {
      platform,
      flags.profile ?? 'production'
    );
-    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
+    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
    const build = await this.ensureBuildSelectedAsync(
      { graphqlClient, projectId, platform, nonInteractive, limit, offset },
@@ -81,7 +81,7 @@ export default class Run extends EasCommand {
    const queryOptions = getPaginatedQueryOptions(flags);
    const {
      loggedIn: { graphqlClient },
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
    } = await this.getContextAsync(Run, {
      nonInteractive: false,
    });
@@ -1,120 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
-import { toAppPlatform } from '../../../graphql/types/AppPlatform';
-import Log from '../../../log';
-import { selectRequestedPlatformAsync, toPlatforms } from '../../../platform';
-import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
-import {
-  ensureVersionSourceIsRemoteAsync,
-  validateAppConfigForRemoteVersionSource,
-} from '../../../project/remoteVersionSource';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
-import { getProfilesAsync } from '../../../utils/profiles';
-
-export default class BuildVersionGetView extends EasCommand {
-  public static override description = 'get the latest version from EAS servers';
-
-  public static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios', 'all'],
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-  };
-
-  public async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildVersionGetView);
-    if (flags.json) {
-      enableJsonOutput();
-    }
-    const {
-      loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
-      projectDir,
-    } = await this.getContextAsync(BuildVersionGetView, {
-      nonInteractive: true,
-    });
-
-    if (!flags.platform && flags['non-interactive']) {
-      throw new Error('"--platform" flag is required in non-interactive mode.');
-    }
-    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, {
-      nonInteractive: flags['non-interactive'],
-    });
-
-    const platforms = toPlatforms(requestedPlatform);
-    const buildProfiles = await getProfilesAsync({
-      type: 'build',
-      easJsonAccessor,
-      platforms,
-      profileName: flags.profile ?? undefined,
-    });
-    const results: { [key in Platform]?: string } = {};
-    for (const { profile, platform } of buildProfiles) {
-      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
-        env: profile.env,
-      });
-
-      validateAppConfigForRemoteVersionSource(exp, platform);
-
-      const applicationIdentifier = await getApplicationIdentifierAsync({
-        graphqlClient,
-        projectDir,
-        projectId,
-        exp,
-        buildProfile: profile,
-        platform,
-      });
-      const remoteVersions = await AppVersionQuery.latestVersionAsync(
-        graphqlClient,
-        projectId,
-        toAppPlatform(platform),
-        applicationIdentifier
-      );
-      if (remoteVersions?.buildVersion) {
-        results[platform] = remoteVersions?.buildVersion;
-      }
-    }
-    if (flags.json) {
-      const jsonResults: { versionCode?: string; buildNumber?: string } = {};
-      if (results.android) {
-        jsonResults.versionCode = results.android;
-      }
-      if (results.ios) {
-        jsonResults.buildNumber = results.ios;
-      }
-      printJsonOnlyOutput(jsonResults);
-    } else {
-      if (Object.keys(results).length === 0) {
-        Log.log('No remote versions are configured for this project.');
-        return;
-      }
-      if (results.android) {
-        Log.log(`Android versionCode - ${chalk.bold(results.android)}`);
-      }
-      if (results.ios) {
-        Log.log(`iOS buildNumber - ${chalk.bold(results.ios)}`);
-      }
-    }
-  }
-}
@@ -22,7 +22,7 @@ import {
 import { promptAsync } from '../../../prompts';

 export default class BuildVersionSetView extends EasCommand {
-  static override description = 'update version of an app';
+  static override description = 'Update version of an app.';

  static override flags = {
    platform: Flags.enum({
@@ -47,7 +47,7 @@ export default class BuildVersionSetView extends EasCommand {
    const { flags } = await this.parse(BuildVersionSetView);
    const {
      loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
    } = await this.getContextAsync(BuildVersionSetView, {
      nonInteractive: false,
@@ -55,14 +55,14 @@ export default class BuildVersionSetView extends EasCommand {

    const platform = await selectPlatformAsync(flags.platform);
    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
    const profile = await EasJsonUtils.getBuildProfileAsync(
      easJsonAccessor,
      platform,
      flags.profile ?? undefined
    );

-    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: profile.env });
+    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: profile.env });
    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    validateAppConfigForRemoteVersionSource(exp, platform);
@@ -39,7 +39,7 @@ interface SyncContext<T extends Platform> {

 export default class BuildVersionSyncView extends EasCommand {
  public static override description =
-    'update a version in native code with a value stored on EAS servers';
+    'Update a version in native code with a value stored on EAS servers';

  public static override flags = {
    platform: Flags.enum({
@@ -64,7 +64,7 @@ export default class BuildVersionSyncView extends EasCommand {
    const { flags } = await this.parse(BuildVersionSyncView);
    const {
      loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      projectDir,
    } = await this.getContextAsync(BuildVersionSyncView, {
      nonInteractive: true,
@@ -72,7 +72,7 @@ export default class BuildVersionSyncView extends EasCommand {

    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);

    const platforms = toPlatforms(requestedPlatform);
    const buildProfiles = await getProfilesAsync({
@@ -82,7 +82,7 @@ export default class BuildVersionSyncView extends EasCommand {
      profileName: flags.profile ?? undefined,
    });
    for (const profileInfo of buildProfiles) {
-      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+      const { exp, projectId } = await getDynamicProjectConfigAsync({
        env: profileInfo.profile.env,
      });

@@ -28,7 +28,7 @@ export default class BuildView extends EasCommand {
      flags,
    } = await this.parse(BuildView);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildView, {
      nonInteractive: true,
@@ -38,7 +38,7 @@ export default class ChannelCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelCreate);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelCreate, {
      nonInteractive,
@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelDelete);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelDelete, {
      nonInteractive,
@@ -75,7 +75,7 @@ export default class ChannelEdit extends EasCommand {
      flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelEdit);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelEdit, {
      nonInteractive,
@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelList, {
      nonInteractive,
@@ -336,7 +336,7 @@ export default class ChannelRollout extends EasCommand {
      },
    } = await this.parse(ChannelRollout);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive,
@@ -38,7 +38,7 @@ export default class ChannelView extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelView, {
      nonInteractive,
@@ -41,7 +41,7 @@ export default class Config extends EasCommand {
      enableJsonOutput();
    }
    const { platform: maybePlatform, profile: maybeProfile } = flags;
-    const { getDynamicPublicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
+    const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
      nonInteractive: false,
    });

@@ -82,8 +82,9 @@ export default class Config extends EasCommand {
        Log.log(JSON.stringify(profile, null, 2));
      }
    } else {
-      const { exp: appConfig } = await getDynamicPublicProjectConfigAsync({
+      const { exp: appConfig } = await getDynamicProjectConfigAsync({
        env: profile.env,
+        isPublicConfig: true,
      });

      if (flags.json) {
@@ -21,8 +21,8 @@ export default class Credentials extends EasCommand {
    const { flags } = await this.parse(Credentials);
    const {
      loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
-      getDynamicPrivateProjectConfigAsync,
+      projectConfig,
+      getDynamicProjectConfigAsync,
      analytics,
    } = await this.getContextAsync(Credentials, {
      nonInteractive: false,
@@ -32,8 +32,8 @@ export default class Credentials extends EasCommand {
      actor,
      graphqlClient,
      analytics,
-      privateProjectConfig ?? null,
-      getDynamicPrivateProjectConfigAsync,
+      projectConfig ?? null,
+      getDynamicProjectConfigAsync,
      flags.platform
    ).runAsync();
  }
@@ -15,7 +15,7 @@ export default class DeviceCreate extends EasCommand {
    // this command is interactive by design
    const {
      loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
+      projectConfig,
    } = await this.getContextAsync(DeviceCreate, {
      nonInteractive: false,
    });
@@ -24,7 +24,7 @@ export default class DeviceCreate extends EasCommand {
      appStore: new AppStoreApi(),
      user: actor,
      graphqlClient,
-      projectId: privateProjectConfig?.projectId,
+      projectId: projectConfig?.projectId,
    });
    const manager = new DeviceManager(ctx);
    await manager.createAsync();
@@ -43,7 +43,7 @@ export default class DeviceDelete extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceDelete, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -112,17 +112,11 @@ export default class DeviceDelete extends EasCommand {
    const removeAppleSpinner = ora('Disabling device on Apple').start();
    try {
      const appleValidatedDevices = await Device.getAsync(context);
-      const appleValidatedDevice = appleValidatedDevices.find(
-        d => d.attributes.udid === device.identifier
-      );
+      const appleValidatedDevice = appleValidatedDevices.find(d => d.id === device.id);
      if (appleValidatedDevice) {
        await appleValidatedDevice.updateAsync({ status: DeviceStatus.DISABLED });
-        removeAppleSpinner.succeed('Disabled device on Apple');
-      } else {
-        removeAppleSpinner.warn(
-          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
-        );
      }
+      removeAppleSpinner.succeed('Disabled device on Apple');
    } catch (err) {
      removeAppleSpinner.fail();
      throw err;
@@ -29,7 +29,7 @@ export default class BuildList extends EasCommand {
    const { flags } = await this.parse(BuildList);
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -1,168 +0,0 @@
-import { Device } from '@expo/apple-utils';
-import { Flags } from '@oclif/core';
-import assert from 'assert';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { PaginatedQueryOptions, getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
-import {
-  AppleDeviceQuery,
-  AppleDeviceQueryResult,
-} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
-import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
-import {
-  selectAppleDeviceOnAppleTeamAsync,
-  selectAppleTeamOnAccountAsync,
-} from '../../devices/queries';
-import formatDevice from '../../devices/utils/formatDevice';
-import { AppleDevice, AppleTeamFragment, Maybe } from '../../graphql/generated';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export default class DeviceRename extends EasCommand {
-  static override description = 'rename a registered device';
-
-  static override flags = {
-    'apple-team-id': Flags.string({ description: 'The Apple team ID on which to find the device' }),
-    udid: Flags.string({ description: 'The Apple device ID to rename' }),
-    name: Flags.string({ description: 'The new name for the device' }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(DeviceRename);
-    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
-    let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
-    const {
-      privateProjectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(DeviceRename, {
-      nonInteractive: paginatedQueryOptions.nonInteractive,
-    });
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    let appleTeamName;
-
-    if (paginatedQueryOptions.json) {
-      enableJsonOutput();
-    }
-
-    let appleTeam: AppleTeamFragment;
-
-    if (!appleTeamIdentifier) {
-      appleTeam = await selectAppleTeamOnAccountAsync(graphqlClient, {
-        accountName: account.name,
-        selectionPromptTitle: `What Apple team would you like to list devices for?`,
-        paginatedQueryOptions,
-      });
-      appleTeamIdentifier = appleTeam.appleTeamIdentifier;
-      appleTeamName = appleTeam.appleTeamName;
-    }
-
-    assert(appleTeamIdentifier, 'No team identifier is specified');
-
-    const chosenDevice = udid
-      ? await AppleDeviceQuery.getByDeviceIdentifierAsync(graphqlClient, account.name, udid)
-      : await selectAppleDeviceOnAppleTeamAsync(graphqlClient, {
-          accountName: account.name,
-          appleTeamIdentifier,
-          selectionPromptTitle: `Which device would you like to rename?`,
-          paginatedQueryOptions,
-        });
-
-    const newDeviceName = name ? name : await this.promptForNewDeviceNameAsync(chosenDevice.name);
-
-    this.logChosenDevice(chosenDevice, appleTeamName, appleTeamIdentifier, paginatedQueryOptions);
-
-    await this.renameDeviceOnExpoAsync(graphqlClient, chosenDevice, newDeviceName!);
-
-    await this.renameDeviceOnAppleAsync(chosenDevice, appleTeamIdentifier, newDeviceName!);
-  }
-
-  async promptForNewDeviceNameAsync(
-    initial: Maybe<string> | undefined
-  ): Promise<string | undefined> {
-    const { name } = await promptAsync({
-      type: 'text',
-      name: 'name',
-      message: 'New device name:',
-      initial: initial ?? undefined,
-    });
-    return name;
-  }
-
-  async renameDeviceOnExpoAsync(
-    graphqlClient: ExpoGraphqlClient,
-    chosenDevice: AppleDevice | AppleDeviceQueryResult,
-    newDeviceName: string
-  ): Promise<void> {
-    const removalSpinner = ora(`Renaming Apple device on Expo`).start();
-    try {
-      await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
-        name: newDeviceName,
-      });
-      removalSpinner.succeed('Renamed Apple device on Expo');
-    } catch (err) {
-      removalSpinner.fail();
-      throw err;
-    }
-  }
-
-  async renameDeviceOnAppleAsync(
-    device: AppleDevice | AppleDeviceQueryResult,
-    appleTeamIdentifier: string,
-    newDeviceName: string
-  ): Promise<void> {
-    const ctx = await authenticateAsync({ teamId: appleTeamIdentifier });
-    const context = getRequestContext(ctx);
-
-    Log.addNewLineIfNone();
-    const removeAppleSpinner = ora('Renaming device on Apple').start();
-    try {
-      const appleValidatedDevices = await Device.getAsync(context);
-      const appleValidatedDevice = appleValidatedDevices.find(
-        d => d.attributes.udid === device.identifier
-      );
-      if (appleValidatedDevice) {
-        await appleValidatedDevice.updateAsync({ name: newDeviceName });
-        removeAppleSpinner.succeed('Renamed device on Apple');
-      } else {
-        removeAppleSpinner.warn(
-          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
-        );
-      }
-    } catch (err) {
-      removeAppleSpinner.fail();
-      throw err;
-    }
-  }
-
-  logChosenDevice(
-    device: AppleDevice | AppleDeviceQueryResult,
-    appleTeamName: Maybe<string> | undefined,
-    appleTeamIdentifier: string,
-    { json }: PaginatedQueryOptions
-  ): void {
-    if (json) {
-      printJsonOnlyOutput(device);
-    } else {
-      Log.addNewLineIfNone();
-      Log.log(
-        formatDevice(device, {
-          appleTeamName,
-          appleTeamIdentifier: appleTeamIdentifier!,
-        })
-      );
-      Log.newLine();
-    }
-  }
-}
@@ -32,7 +32,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
      throw new Error('Device UDID is missing');
    }
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceView, {
      nonInteractive: true,
@@ -35,7 +35,7 @@ export default class MetadataPull extends EasCommand {
    const { flags } = await this.parse(MetadataPull);
    const {
      loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(MetadataPull, {
      nonInteractive: false,
@@ -33,7 +33,7 @@ export default class MetadataPush extends EasCommand {
    const { flags } = await this.parse(MetadataPush);
    const {
      loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(MetadataPush, {
      nonInteractive: false,
@@ -16,7 +16,7 @@ export default class Open extends EasCommand {
  async runAsync(): Promise<void> {
    // this command is interactive by nature (only really run by humans in a terminal)
    const {
-      privateProjectConfig: { projectId, exp },
+      projectConfig: { projectId, exp },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(Open, {
      nonInteractive: false,
@@ -43,7 +43,7 @@ export default class ProjectInfo extends EasCommand {

  async runAsync(): Promise<void> {
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ProjectInfo, {
      nonInteractive: true,
@@ -13,7 +13,7 @@ import { AppMutation } from '../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../prompts';
@@ -98,7 +98,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, projectId);
    const correctOwner = appForProjectId.ownerAccount.name;
    const correctSlug = appForProjectId.slug;
@@ -153,7 +153,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (projectId === existingProjectId) {
@@ -209,7 +209,7 @@ export default class ProjectInit extends EasCommand {
    actor: Actor,
    projectDir: string
  ): Promise<string> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (existingProjectId) {
@@ -66,7 +66,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      },
    } = await this.parse(EnvironmentSecretCreate);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretCreate, {
      nonInteractive,
@@ -31,7 +31,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
      flags: { id, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretDelete);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretDelete, {
      nonInteractive,
@@ -19,7 +19,7 @@ export default class EnvironmentSecretList extends EasCommand {

  async runAsync(): Promise<void> {
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretList, {
      nonInteractive: true,
@@ -51,7 +51,7 @@ export default class EnvironmentSecretPush extends EasCommand {
      flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretPush);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretPush, {
      nonInteractive,
@@ -100,7 +100,7 @@ export default class Submit extends EasCommand {
    const { flags: rawFlags } = await this.parse(Submit);
    const {
      loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(Submit, {
      nonInteractive: false,
@@ -1,4 +1,11 @@
-import { AppJSONConfig, ExpoConfig, PackageJSONConfig, Platform, getConfig } from '@expo/config';
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  Platform,
+  getConfig,
+} from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -7,10 +14,7 @@ import { instance, mock } from 'ts-mockito';

 import UpdatePublish from '..';
 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -233,26 +237,22 @@ function mockTestProject({

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
  jest
-    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = { ...mockManifest.exp };
-      return {
-        exp,
-        projectDir: projectRoot,
-        projectId: configuredProjectId,
-      };
-    });
-  jest
-    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = {
-        name: mockManifest.exp.name,
-        version: mockManifest.exp.version,
-        slug: mockManifest.exp.slug,
-        sdkVersion: mockManifest.exp.sdkVersion,
-        owner: mockManifest.exp.owner,
-        extra: mockManifest.exp.extra,
-      };
+    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
      return {
        exp,
        projectDir: projectRoot,
@@ -3,7 +3,7 @@ import { vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';

 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import { PrivateProjectConfigContextField } from '../../../commandUtils/context/PrivateProjectConfigContextField';
+import ProjectConfigContextField from '../../../commandUtils/context/ProjectConfigContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -324,7 +324,7 @@ function mockTestProject({
  const graphqlClient = instance(mock<ExpoGraphqlClient>({}));

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
-  jest.spyOn(PrivateProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
+  jest.spyOn(ProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
    exp: mockManifest.exp,
    projectDir: projectRoot,
    projectId: configuredProjectId,
@@ -1,4 +1,10 @@
-import { AppJSONConfig, ExpoConfig, PackageJSONConfig, getConfig } from '@expo/config';
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  getConfig,
+} from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -6,10 +12,7 @@ import path from 'path';
 import { instance, mock } from 'ts-mockito';

 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -214,26 +217,22 @@ function mockTestProject({

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
  jest
-    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = { ...mockManifest.exp };
-      return {
-        exp,
-        projectDir: projectRoot,
-        projectId: configuredProjectId,
-      };
-    });
-  jest
-    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = {
-        name: mockManifest.exp.name,
-        version: mockManifest.exp.version,
-        slug: mockManifest.exp.slug,
-        sdkVersion: mockManifest.exp.sdkVersion,
-        owner: mockManifest.exp.owner,
-        extra: mockManifest.exp.extra,
-      };
+    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
      return {
        exp,
        projectDir: projectRoot,
@@ -32,7 +32,7 @@ export default class UpdateConfigure extends EasCommand {
    const { flags } = await this.parse(UpdateConfigure);
    const platform = flags.platform as RequestedPlatform;
    const {
-      privateProjectConfig: { projectId, exp, projectDir },
+      projectConfig: { projectId, exp, projectDir },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateConfigure, {
      nonInteractive: flags['non-interactive'],
@@ -23,7 +23,6 @@ import { RequestedPlatform } from '../../platform';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
  ExpoCLIExportPlatformFlag,
-  RawAsset,
  buildBundlesAsync,
  buildUnsortedUpdateInfoGroupAsync,
  collectAssetsAsync,
@@ -40,13 +39,13 @@ import {
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
 import { getUpdateGroupJsonInfo } from '../../update/utils';
+import { maybeWarnAboutEasPlanOverageAsync } from '../../utils/billing';
 import {
  checkManifestBodyAgainstUpdateInfoGroup,
  getCodeSigningInfoAsync,
  getManifestBodyAsync,
  signBody,
 } from '../../utils/code-signing';
-import areSetsEqual from '../../utils/expodash/areSetsEqual';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -61,7 +60,6 @@ type RawUpdateFlags = {
  platform: string;
  'input-dir': string;
  'skip-bundler': boolean;
-  'clear-cache': boolean;
  'private-key-path'?: string;
  'non-interactive': boolean;
  json: boolean;
@@ -79,7 +77,6 @@ type UpdateFlags = {
  updateMessage?: string;
  inputDir: string;
  skipBundler: boolean;
-  clearCache: boolean;
  privateKeyPath?: string;
  json: boolean;
  nonInteractive: boolean;
@@ -118,10 +115,6 @@ export default class UpdatePublish extends EasCommand {
      description: `Skip running Expo CLI to bundle the app before publishing`,
      default: false,
    }),
-    'clear-cache': Flags.boolean({
-      description: `Clear the bundler cache before publishing`,
-      default: false,
-    }),
    platform: Flags.enum({
      char: 'p',
      options: [
@@ -159,7 +152,6 @@ export default class UpdatePublish extends EasCommand {
      updateMessage: updateMessageArg,
      inputDir,
      skipBundler,
-      clearCache,
      privateKeyPath,
      json: jsonFlag,
      nonInteractive,
@@ -167,8 +159,7 @@ export default class UpdatePublish extends EasCommand {
    } = this.sanitizeFlags(rawFlags);

    const {
-      getDynamicPublicProjectConfigAsync,
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdatePublish, {
      nonInteractive,
@@ -182,8 +173,11 @@ export default class UpdatePublish extends EasCommand {
      exp: expPossiblyWithoutEasUpdateConfigured,
      projectId,
      projectDir,
-    } = await getDynamicPublicProjectConfigAsync();
+    } = await getDynamicProjectConfigAsync({
+      isPublicConfig: true,
+    });

+    await maybeWarnAboutEasPlanOverageAsync(graphqlClient, projectId);
    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);

    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
@@ -193,8 +187,10 @@ export default class UpdatePublish extends EasCommand {
      projectId,
    });

-    const { exp } = await getDynamicPublicProjectConfigAsync();
-    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const branchName = await getBranchNameForCommandAsync({
@@ -218,7 +214,7 @@ export default class UpdatePublish extends EasCommand {
    if (!skipBundler) {
      const bundleSpinner = ora().start('Exporting...');
      try {
-        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache });
+        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag });
        bundleSpinner.succeed('Exported bundle(s)');
      } catch (e) {
        bundleSpinner.fail('Export failed');
@@ -240,58 +236,14 @@ export default class UpdatePublish extends EasCommand {
      const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
      realizedPlatforms = Object.keys(assets) as PublishPlatform[];

-      // Timeout mechanism:
-      // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
-      //   uploaded assets has a timeout of 60 seconds.
-      // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
-      // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
-      //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
-      // - At the same time as upload is started, start timeout checker which checks every 1 second to see
-      //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
-      //   upload function call to instruct it to stop uploading or checking for successful processing.
-      let lastUploadedStorageKeys = new Set<string>();
-      let lastAssetUploadResults: {
-        asset: RawAsset & { storageKey: string };
-        finished: boolean;
-      }[] = [];
-      let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
-      const cancelationToken = { isCanceledOrFinished: false };
-
-      const uploadResults = await Promise.race([
-        uploadAssetsAsync(
-          graphqlClient,
-          assets,
-          projectId,
-          cancelationToken,
-          assetUploadResults => {
-            const currentUploadedStorageKeys = new Set(
-              assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey)
-            );
-            if (!areSetsEqual(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
-              timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
-              lastUploadedStorageKeys = currentUploadedStorageKeys;
-              lastAssetUploadResults = assetUploadResults;
-            }
-
-            const totalAssets = assetUploadResults.length;
-            const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
-            assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
-          }
-        ),
-        (async () => {
-          while (Date.now() < timeAtWhichToTimeout) {
-            if (cancelationToken.isCanceledOrFinished) {
-              break;
-            }
-            await new Promise(res => setTimeout(res, 1000)); // wait 1 second
-          }
-          cancelationToken.isCanceledOrFinished = true;
-          const timedOutAssets = lastAssetUploadResults
-            .filter(r => !r.finished)
-            .map(r => `\n- ${r.asset.originalPath ?? r.asset.path}`);
-          throw new Error(`Asset processing timed out for assets: ${timedOutAssets}`);
-        })(),
-      ]);
+      const uploadResults = await uploadAssetsAsync(
+        graphqlClient,
+        assets,
+        projectId,
+        (totalAssets, missingAssets) => {
+          assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
+        }
+      );

      uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
      assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
@@ -538,7 +490,6 @@ export default class UpdatePublish extends EasCommand {
      updateMessage,
      inputDir: flags['input-dir'],
      skipBundler: flags['skip-bundler'],
-      clearCache: flags['clear-cache'],
      platform: flags.platform as RequestedPlatform,
      privateKeyPath: flags['private-key-path'],
      nonInteractive,
@@ -41,7 +41,7 @@ export default class UpdateList extends EasCommand {
    const { flags } = await this.parse(UpdateList);
    const { branch: branchFlag, all, json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateList, {
      nonInteractive,
@@ -94,7 +94,7 @@ export default class UpdateRepublish extends EasCommand {
    const flags = this.sanitizeFlags(rawFlags);

    const {
-      privateProjectConfig: { exp, projectId },
+      projectConfig: { exp, projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateRepublish, {
      nonInteractive: flags.nonInteractive,
@@ -122,8 +122,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    } = this.sanitizeFlags(rawFlags);

    const {
-      getDynamicPublicProjectConfigAsync,
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateRollBackToEmbedded, {
      nonInteractive,
@@ -137,7 +136,9 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      exp: expPossiblyWithoutEasUpdateConfigured,
      projectId,
      projectDir,
-    } = await getDynamicPublicProjectConfigAsync();
+    } = await getDynamicProjectConfigAsync({
+      isPublicConfig: true,
+    });

    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);

@@ -148,8 +149,10 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      projectId,
    });

-    const { exp } = await getDynamicPublicProjectConfigAsync();
-    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const branchName = await getBranchNameForCommandAsync({
@@ -33,7 +33,7 @@ export default class WebhookCreate extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(WebhookCreate);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookCreate, {
      nonInteractive: flags['non-interactive'],
@@ -39,7 +39,7 @@ export default class WebhookDelete extends EasCommand {
      flags: { 'non-interactive': nonInteractive },
    } = await this.parse(WebhookDelete);
    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookDelete, {
      nonInteractive,
@@ -36,7 +36,7 @@ export default class WebhookList extends EasCommand {
    }

    const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookList, {
      nonInteractive: true,
@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import Log from '../log';
-import { getPrivateExpoConfig } from '../project/expoConfig';
+import { getExpoConfig } from '../project/expoConfig';
 import { confirmAsync } from '../prompts';
 import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
@@ -56,6 +56,18 @@ export class CredentialsContext {
    this.projectInfo = options.projectInfo;
  }

+  static getExpoConfigInProject(
+    projectDir: string,
+    { env }: { env?: Env } = {}
+  ): ExpoConfig | null {
+    try {
+      return getExpoConfig(projectDir, { env });
+    } catch {
+      // ignore error, context might be created outside of expo project
+      return null;
+    }
+  }
+
  get hasProjectContext(): boolean {
    return !!this.projectInfo;
  }
@@ -75,7 +87,7 @@ export class CredentialsContext {
      return;
    }
    // trigger getConfig error
-    getPrivateExpoConfig(this.options.projectDir);
+    getExpoConfig(this.options.projectDir);
  }

  async bestEffortAppStoreAuthenticateAsync(): Promise<void> {
@@ -14,7 +14,6 @@ import {
 } from '../../__tests__/fixtures-ios';
 import IosCredentialsProvider from '../IosCredentialsProvider';
 import { getAppLookupParamsFromContextAsync } from '../actions/BuildCredentialsUtils';
-import { MissingCredentialsNonInteractiveError } from '../../errors';

 jest.mock('fs');
 jest.mock('../validators/validateProvisioningProfile', () => ({
@@ -77,7 +76,7 @@ describe(IosCredentialsProvider, () => {
          distribution: 'store',
        });
        await expect(provider.getCredentialsAsync(CredentialsSource.REMOTE)).rejects.toThrowError(
-          MissingCredentialsNonInteractiveError
+          /Credentials are not set up/
        );
      });

@@ -23,7 +23,6 @@ export class CreateProvisioningProfile {
  ) {}

  async runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult> {
-    // TODO: Remove this
    if (ctx.nonInteractive) {
      throw new MissingCredentialsNonInteractiveError(
        'Creating Provisioning Profiles is only supported in interactive mode.'
@@ -13,7 +13,6 @@ export async function chooseDevicesAsync(
  const { devices } = await promptAsync({
    type: 'multiselect',
    name: 'devices',
-    selectionFormat: '<num> devices selected',
    message: 'Select devices for the ad hoc build:',
    hint: '- Space to select. Return to submit',
    choices: allDevices.map(device => ({
@@ -2,13 +2,11 @@ import assert from 'assert';
 import chalk from 'chalk';
 import dateformat from 'dateformat';

-import { formatAppleTeam } from './AppleTeamFormatting';
 import { AccountFragment, AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import Log, { learnMore } from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { fromNow } from '../../../utils/date';
 import { CredentialsContext } from '../../context';
-import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import {
@@ -19,6 +17,7 @@ import { filterRevokedDistributionCertsFromEasServers } from '../appstore/Creden
 import { AppleTooManyCertsError } from '../appstore/distributionCertificate';
 import { distributionCertificateSchema } from '../credentials';
 import { validateDistributionCertificateAsync } from '../validators/validateDistributionCertificate';
+import { formatAppleTeam } from './AppleTeamFormatting';

 export function formatDistributionCertificate(
  distributionCertificate: AppleDistributionCertificateFragment,
@@ -213,7 +212,7 @@ async function generateDistributionCertificateAsync(
      Log.warn(APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR);

      if (ctx.nonInteractive) {
-        throw new MissingCredentialsNonInteractiveError(
+        throw new Error(
          "Start the CLI without the '--non-interactive' flag to revoke existing certificates."
        );
      }
@@ -31,10 +31,10 @@ export enum SetupAscApiKeyChoice {
 export class SetUpAscApiKey {
  public choices: { title: string; value: string }[] = [
    {
-      title: '[Choose an existing key]',
+      title: '[Choose an existing ASC API Key]',
      value: SetupAscApiKeyChoice.USE_EXISTING,
    },
-    { title: '[Add a new key]', value: SetupAscApiKeyChoice.GENERATE },
+    { title: '[Add a new ASC API Key]', value: SetupAscApiKeyChoice.GENERATE },
  ];

  constructor(private app: AppLookupParams, private purpose: AppStoreApiKeyPurpose) {}
@@ -126,7 +126,7 @@ export class SetUpAscApiKey {
      const result = await promptAsync({
        type: 'select',
        name: 'choice',
-        message: 'Select the App Store Connect Api Key to use for your project:',
+        message: 'Select what to use for your project:',
        choices,
      });
      choice = result.choice;
@@ -48,14 +48,14 @@ export class SetUpDistributionCertificate {
  }

  private async runNonInteractiveAsync(
-    ctx: CredentialsContext,
+    _ctx: CredentialsContext,
    currentCertificate: AppleDistributionCertificateFragment | null
  ): Promise<AppleDistributionCertificateFragment> {
    // TODO: implement validation
    Log.addNewLineIfNone();
    Log.warn('Distribution Certificate is not validated for non-interactive builds.');
    if (!currentCertificate) {
-      return await this.createNewDistCertAsync(ctx);
+      throw new MissingCredentialsNonInteractiveError();
    }
    return currentCertificate;
  }
@@ -1,5 +1,19 @@
 import nullthrows from 'nullthrows';

+import {
+  AppleDistributionCertificateFragment,
+  AppleProvisioningProfileFragment,
+  IosAppBuildCredentialsFragment,
+  IosDistributionType,
+} from '../../../graphql/generated';
+import { getApplePlatformFromTarget } from '../../../project/ios/target';
+import { confirmAsync } from '../../../prompts';
+import { CredentialsContext } from '../../context';
+import { MissingCredentialsNonInteractiveError } from '../../errors';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
+import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
+import { Target } from '../types';
+import { validateProvisioningProfileAsync } from '../validators/validateProvisioningProfile';
 import {
  assignBuildCredentialsAsync,
  getBuildCredentialsAsync,
@@ -9,20 +23,6 @@ import { ConfigureProvisioningProfile } from './ConfigureProvisioningProfile';
 import { CreateProvisioningProfile } from './CreateProvisioningProfile';
 import { formatProvisioningProfileFromApple } from './ProvisioningProfileUtils';
 import { SetUpDistributionCertificate } from './SetUpDistributionCertificate';
-import {
-  AppleDistributionCertificateFragment,
-  AppleProvisioningProfileFragment,
-  AppleTeamFragment,
-  IosAppBuildCredentialsFragment,
-  IosDistributionType,
-} from '../../../graphql/generated';
-import { getApplePlatformFromTarget } from '../../../project/ios/target';
-import { confirmAsync } from '../../../prompts';
-import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
-import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
-import { Target } from '../types';
-import { validateProvisioningProfileAsync } from '../validators/validateProvisioningProfile';

 /**
 * Sets up either APP_STORE or ENTERPRISE provisioning profiles
@@ -47,7 +47,6 @@ export class SetUpProvisioningProfile {
    const buildCredentials = await this.createAndAssignProfileAsync(ctx, distCert);
    // delete 'currentProfile' since its no longer valid
    await ctx.ios.deleteProvisioningProfilesAsync(ctx.graphqlClient, [currentProfile.id]);
-    await ctx.appStore.revokeProvisioningProfileAsync(this.app.bundleIdentifier, currentProfile.id);
    return buildCredentials;
  }

@@ -60,17 +59,12 @@ export class SetUpProvisioningProfile {
      this.target,
      distCert
    ).runAsync(ctx);
-    const appleTeam: AppleTeamFragment = nullthrows(
-      distCert.appleTeam ?? provisioningProfile.appleTeam ?? null
-    );
-
    return await assignBuildCredentialsAsync(
      ctx,
      this.app,
      this.distributionType,
      distCert,
-      provisioningProfile,
-      appleTeam ?? undefined
+      provisioningProfile
    );
  }

@@ -108,6 +102,11 @@ export class SetUpProvisioningProfile {
    if (areBuildCredentialsSetup) {
      return nullthrows(await getBuildCredentialsAsync(ctx, this.app, this.distributionType));
    }
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Provisioning profile is not configured correctly. Run this command again in interactive mode.'
+      );
+    }

    const currentProfile = await getProvisioningProfileAsync(ctx, this.app, this.distributionType);
    if (!currentProfile) {
@@ -115,8 +114,7 @@ export class SetUpProvisioningProfile {
    }

    // See if the profile we have exists on the Apple Servers
-    const applePlatform = getApplePlatformFromTarget(this.target);
-    // TODO: Could it ask for login in non-interactive mode?
+    const applePlatform = await getApplePlatformFromTarget(this.target);
    const existingProfiles = await ctx.appStore.listProvisioningProfilesAsync(
      this.app.bundleIdentifier,
      applePlatform
@@ -129,11 +127,6 @@ export class SetUpProvisioningProfile {
      return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
    }

-    // TODO: Should we instead reuse original profile?
-    if (ctx.nonInteractive) {
-      return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
-    }
-
    const confirm = await confirmAsync({
      message: `${formatProvisioningProfileFromApple(
        currentProfileFromServer
@@ -0,0 +1,70 @@
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+import wrapAnsi from 'wrap-ansi';
+
+import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
+import Log, { learnMore } from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { CredentialsContext } from '../../context';
+import { UnsupportedCredentialsChoiceError } from '../../errors';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
+import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
+import { SetUpAscApiKey } from './SetUpAscApiKey';
+
+export const PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
+
+export class SetUpSubmissionCredentials {
+  private setupAscApiKeyAction;
+
+  constructor(app: AppLookupParams) {
+    this.setupAscApiKeyAction = new SetUpAscApiKey(app, AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+    // Add this unrelated choice to ASC API Key setup for legacy purposes -- we will deprecate it soon
+    this.setupAscApiKeyAction.choices = this.setupAscApiKeyAction.choices.concat({
+      title: '[Enter an App Specific Password]',
+      value: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
+    });
+  }
+
+  public async runAsync(
+    ctx: CredentialsContext
+  ): Promise<CommonIosAppCredentialsFragment | string> {
+    try {
+      const iosAppCredentials = await this.setupAscApiKeyAction.runAsync(ctx);
+      const { keyIdentifier, name } = nullthrows(
+        iosAppCredentials.appStoreConnectApiKeyForSubmissions,
+        'ASC API Key must be defined for EAS Submit'
+      );
+      Log.log(`Using API Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+      return iosAppCredentials;
+    } catch (e) {
+      if (e instanceof UnsupportedCredentialsChoiceError) {
+        if (e.choice === PROMPT_FOR_APP_SPECIFIC_PASSWORD) {
+          return await this.promptForAppSpecificPasswordAsync();
+        }
+      }
+      throw e;
+    }
+  }
+
+  async promptForAppSpecificPasswordAsync(): Promise<string> {
+    Log.addNewLineIfNone();
+    Log.log(`Enter your Apple app-specific password.`);
+    Log.log(learnMore('https://expo.fyi/apple-app-specific-password'));
+    Log.warn(
+      wrapAnsi(
+        `This option will be deprecated soon. You will still be able to provide your password with the ${chalk.bold(
+          'EXPO_APPLE_APP_SPECIFIC_PASSWORD'
+        )} environment variable.`,
+        process.stdout.columns || 80
+      )
+    );
+
+    const { appSpecificPassword } = await promptAsync({
+      name: 'appSpecificPassword',
+      message: 'Your Apple app-specific password:',
+      type: 'password',
+      validate: (val: string) => val !== '' || 'Apple app-specific password cannot be empty!',
+    });
+    return appSpecificPassword;
+  }
+}