[eas-cli] Add pagination to supported GQL queries

2026-11-13 20:28:08 -10:00 · 2022-07-05 18:39:13 -07:00
278 changed files with 6606 additions and 15624 deletions
@@ -1,2 +1 @@
-* text eol=lf
 **/yarn.lock linguist-generated
@@ -0,0 +1,20 @@
+name: Installer tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  test:
+    name: Run the installer
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v2
+      - run: bash bin/install.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: eas --version
@@ -1,146 +0,0 @@
-name: Issue Triage
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  needs-repro:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing or invalid repro') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hi there! It looks like your issue requires a minimal reproducible example, but it is invalid or absent. Please prepare such an example and share it in a new issue.
-
-              **The best way to get attention to your issue is to provide a clean and easy way for a developer to reproduce the issue on their own machine.** Please do not provide your entire project, or a project with more code than is necessary to reproduce the issue.
-
-              A side benefit of going through the process of narrowing down the minimal amount of code needed to reproduce the issue is that you may get lucky and discover that the bug is due to a mistake in your application code that you can quickly fix on your own.
-
-              ### Resources
-
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-
-              ### Common concerns
-
-              #### "I've only been able to reproduce it in private, proprietary code"
-
-              You may not have spent enough time narrowing down the root cause of the issue. Try out the techniques discussed in this [manual debugging guide](https://expo.fyi/manual-debugging) to learn how to isolate the problem from the rest of your codebase.
-
-              #### "I didn't have time to create one"
-
-              That's understandable, it can take some time to prepare. We ask that you hold off on filing an issue until you are able to fully complete the required fields in the issue template.
-
-              #### "You can reproduce it by yourself by creating a project and following these steps"
-
-              This is useful knowledge, but it's still valuable to have the resulting project that is produced from running the steps, where you have verified you can reproduce the issue.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  needs-info:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing info') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! There isn't enough information provided in your issue description for us to be able to help you. The best way to get help is to provide information to enable other developers to understand the issue and reproduce it on their own machines.
-
-              Please create a new issue and fill out the entire issue template to the best of your ability. Refer to the following resources for more information on how to create a good issue report.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  issue-accepted:
-    runs-on: ubuntu-20.04
-    if: github.event.label.name == 'issue accepted'
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Thank you for filing this issue!
-              This comment acknowledges we believe this may be a bug and there’s enough information to investigate it.
-              However, we can’t promise any sort of timeline for resolution. We prioritize issues based on severity, breadth of impact, and alignment with our roadmap. If you’d like to help move it more quickly, you can continue to investigate it more deeply and/or you can open a pull request that fixes the cause.
-            `})
-
-  question:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: question') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you have a question about Expo or related tools, please post on our forums at https://forums.expo.dev/ or join our Discord at https://chat.expo.dev/.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["Join the community"](https://docs.expo.dev/next-steps/community/)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  feature-request:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: feature request') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you would like to request a feature, please post to https://expo.canny.io/feature-requests.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
@@ -1,26 +0,0 @@
-name: Test scripts
-
-defaults:
-  run:
-    working-directory: scripts
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'scripts/**'
-  pull_request:
-    paths:
-      - 'scripts/**'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18
-      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn typecheck
@@ -27,11 +27,8 @@ jobs:
        if: ${{ !matrix.coverage }}
      - 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=4096
      - run: yarn lint --max-warnings=0
+      - run: shellcheck bin/*.sh
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
@@ -2,7 +2,6 @@
 packages/*/build
 packages/eas-cli/dist
 packages/eas-cli/tmp
-scripts/build

 # Code editors
 .idea
@@ -4,6 +4,5 @@
  "singleQuote": true,
  "bracketSameLine": true,
  "trailingComma": "es5",
-  "arrowParens": "avoid",
-  "endOfLine": "auto"
+  "arrowParens": "avoid"
 }
@@ -8,188 +8,11 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Add `-e` as a shortcut for `--profile` flag. ([#1342](https://github.com/expo/eas-cli/pull/1342) by [@szdziedzic](https://github.com/szdziedzic))
- Support JSON5 in **eas.json**. ([#1350](https://github.com/expo/eas-cli/pull/1350) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-### 🧹 Chores
-
-## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05
-
-### 🎉 New features
-
- Add tvOS credentials compatibility for Adhoc and App store builds. ([#1325](https://github.com/expo/eas-cli/pull/1325) by [@quinlanj](https://github.com/quinlanj))
- Add `eas open` command for opening project page in web browser. ([#1337](https://github.com/expo/eas-cli/pull/1337) by [@dsokal](https://github.com/dsokal))
- Add support for buildArtifactPaths. Rename artifactPath to applicationArchivePath. ([#1321](https://github.com/expo/eas-cli/pull/1321) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix viewing branch list when a branch has no associated platforms. ([#1326](https://github.com/expo/eas-cli/pull/1326) by [@hbiede](https://github.com/hbiede))
- Fix description of `help` command in help prompt. ([#1341](https://github.com/expo/eas-cli/pull/1341) by [@Simek](https://github.com/Simek))
- Resolve paths from the root when checking for gitignored values. ([#1336](https://github.com/expo/eas-cli/pull/1336) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add noImplicitOverride to tsconfigs. ([#1327](https://github.com/expo/eas-cli/pull/1327) by [@wschurman](https://github.com/wschurman))
- Fix typos. ([#1340](https://github.com/expo/eas-cli/pull/1340) by [@hbiede](https://github.com/hbiede))
-
-## [2.0.0](https://github.com/expo/eas-cli/releases/tag/v2.0.0) - 2022-09-01
-
-### 🛠 Breaking changes
-
- Fix typo in `cli.promptToConfigurePushNotifications` field in **eas.json**. EAS CLI will throw an error if the old field name is in **eas.json**. ([#1332](https://github.com/expo/eas-cli/pull/1332) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix dynamic config update warning. ([#1322](https://github.com/expo/eas-cli/pull/1322) by [@wschurman](https://github.com/wschurman))
-
-## [1.2.0](https://github.com/expo/eas-cli/releases/tag/v1.2.0) - 2022-08-29
-
-### 🎉 New features
-
- Add 2022 Apple capabilities. ([#1307](https://github.com/expo/eas-cli/pull/1307) by [@EvanBacon](https://github.com/EvanBacon))
- Print warning when eas-cli is installed as project dependency. ([#1310](https://github.com/expo/eas-cli/pull/1310) by [@dsokal](https://github.com/dsokal))
- Add eas.json to skip push notifications credentials setup. ([#1315](https://github.com/expo/eas-cli/pull/1315) by [@dsokal](https://github.com/dsokal))
- Warn about EAS outages when running `build`, `submit`, and `update` commands. ([#1312](https://github.com/expo/eas-cli/pull/1312) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
- Replace promptToCreateProjectIfNotExistsAsync with getProjectIdAsync. ([#1303](https://github.com/expo/eas-cli/pull/1303) by [@wschurman](https://github.com/wschurman))
- Use AppQuery instead of ProjectQuery. ([#1304](https://github.com/expo/eas-cli/pull/1304) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Improve instructions on setting `extra.eas.projectId` in app configuration. ([#1316](https://github.com/expo/eas-cli/pull/1316) by [@dsokal](https://github.com/dsokal))
- Improve copy in EAS Submit - "e-mail" -> email, and make the link to app on App Store go directly to the TestFlight tab. ([#1318](https://github.com/expo/eas-cli/pull/1318) by [@brentvatne](https://github.com/brentvatne))
-
-## [1.1.1](https://github.com/expo/eas-cli/releases/tag/v1.1.1) - 2022-08-23
-
-### 🎉 New features
-
- Add support for `autoIncrement` option at the root of the build profile. ([#1298](https://github.com/expo/eas-cli/pull/1298) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
- Handle trailing backslash in `.gitignore`. ([#1306](https://github.com/expo/eas-cli/pull/1306) by [@wkozyra95](https://github.com/wkozyra95))
- Retry ASC Api Key downloads if it has not fully propagated on Apple's infrastructure. ([#1302](https://github.com/expo/eas-cli/pull/1302) by [@quinlanj](https://github.com/quinlanj))
-
-## [1.1.0](https://github.com/expo/eas-cli/releases/tag/v1.1.0) - 2022-08-23
-
-### 🎉 New features
-
- Add support for passing platform flag to `credentials` command. ([#1277](https://github.com/expo/eas-cli/pull/1277) by [@Simek](https://github.com/Simek))
-
-### 🐛 Bug fixes
-
- Prevent throwing dynamic app config write error when configuring project ID. ([#1301](https://github.com/expo/eas-cli/pull/1301) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Remove unused dependency and devDependency from the CLI. ([#1297](https://github.com/expo/eas-cli/pull/1297) by [@Simek](https://github.com/Simek))
-
-## [1.0.0](https://github.com/expo/eas-cli/releases/tag/v1.0.0) - 2022-08-22
-
-### 🛠 Breaking changes
-
- Remove timeout when waiting for build / submission. ([#1289](https://github.com/expo/eas-cli/pull/1289) by [@dsokal](https://github.com/dsokal))
-
-### 🎉 New features
-
- Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
- Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))
- Fix initializing git repository in monorepo. ([#1279](https://github.com/expo/eas-cli/pull/1279) by [@dsokal](https://github.com/dsokal))
- Limit the number of SignedAssetUploadSpecifications fetched at a time. ([#1287](https://github.com/expo/eas-cli/pull/1287) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Remove unused install script. ([#1280](https://github.com/expo/eas-cli/pull/1280), [#1281](https://github.com/expo/eas-cli/pull/1281) by [@wkozyra95](https://github.com/wkozyra95))
- Remove "please" from output ([#1250](https://github.com/expo/eas-cli/pull/1250) by [@jonsamp](https://github.com/jonsamp))
-
-## [0.60.0](https://github.com/expo/eas-cli/releases/tag/v0.60.0) - 2022-08-12
-
-### 🎉 New features
-
- Add `appVersion` runtime policy. ([#1267](https://github.com/expo/eas-cli/pull/1267) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add JSON Schema `metadataPath` to iOS submission profile. ([#1269](https://github.com/expo/eas-cli/pull/1269) by [@byCedric](https://github.com/byCedric))
- Add warning when `appVersion` runtime policy is not supported. ([#1271](https://github.com/expo/eas-cli/pull/1271) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.59.0](https://github.com/expo/eas-cli/releases/tag/v0.59.0) - 2022-08-10
-
-### 🐛 Bug fixes
-
- Fix building Android projects locally that don't have execute permissions set for `gradlew`. ([82231](https://github.com/expo/eas-cli/commit/822313e90e94bd6ddd3872061a0c25a8aa4db7cd) by [@dsokal](https://github.com/dsokal))
- Disable `nativeVersion` policy only for remote version source. ([#1261](https://github.com/expo/eas-cli/pull/1261) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Improve wording on version auto-increment. ([#1260](https://github.com/expo/eas-cli/pull/1260) by [@wkozyra95](https://github.com/wkozyra95))
- Upgrade dependencies. ([#1262](https://github.com/expo/eas-cli/pull/1262) by [@dsokal](https://github.com/dsokal))
-
-## [0.58.0](https://github.com/expo/eas-cli/releases/tag/v0.58.0) - 2022-08-09
-
-### 🎉 New features
-
- Managed app versions support. ([#1209](https://github.com/expo/eas-cli/pull/1209), [#1219](https://github.com/expo/eas-cli/pull/1219), [#1232](https://github.com/expo/eas-cli/pull/1232) by [@wkozyra95](https://github.com/wkozyra95))
- Add a warning when publishing an update with too many assets. ([#1243](https://github.com/expo/eas-cli/pull/1243) by [@kgc00](https://github.com/kgc00))
- Add submission info when building with `--json` option. ([#1246](https://github.com/expo/eas-cli/pull/1246) by [@wkozyra95](https://github.com/wkozyra95))
- Set all environment variables (documented in https://docs.expo.dev/build-reference/variables/) when running local build. ([#1256](https://github.com/expo/eas-cli/pull/1256) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
- Do not include sources in `eas-json` npm package. ([#1248](https://github.com/expo/eas-cli/pull/1248) by [@wkozyra95](https://github.com/wkozyra95))
- Swallow error when unable to track file in no commit workflow. ([#1109](https://github.com/expo/eas-cli/pull/1109) by [@brentvatne](https://github.com/brentvatne))
-
-## [0.57.0](https://github.com/expo/eas-cli/releases/tag/v0.57.0) - 2022-08-03
-
-### 🎉 New features
-
- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
-
-## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
-
-### 🎉 New features
-
- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🐛 Bug fixes
-
- Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
- Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
-
-### 🐛 Bug fixes
-
- Fix asset upload crash. ([#1205](https://github.com/expo/eas-cli/pull/1205) by [@wschurman](https://github.com/wschurman))
-
-## [0.55.0](https://github.com/expo/eas-cli/releases/tag/v0.55.0) - 2022-07-11
-
-### 🎉 New features
-
 - Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
 - Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
 - Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
 - Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
 - Add review details to metadata store configuration. ([#1184](https://github.com/expo/eas-cli/pull/1184) by [@byCedric](https://github.com/byCedric))
- Override applicationId via env. ([#1203](https://github.com/expo/eas-cli/pull/1203) by [@wkozyra95](https://github.com/wkozyra95))

 ### 🐛 Bug fixes

@@ -199,8 +22,6 @@ This is the log of notable changes to EAS CLI and related packages.

 - Update validation rules for metadata info locales. ([#1174](https://github.com/expo/eas-cli/pull/1174) by [@byCedric](https://github.com/byCedric))
 - Improve store configuration defaults and schema documentation. ([#1183](https://github.com/expo/eas-cli/pull/1183) by [@byCedric](https://github.com/byCedric))
- Improve store config categories configuration. ([#1187](https://github.com/expo/eas-cli/pull/1187) by [@byCedric](https://github.com/byCedric))
- Remove deprecated idfa and price tier from store config. ([#1193](https://github.com/expo/eas-cli/pull/1193) by [@byCedric](https://github.com/byCedric))

 ## [0.54.1](https://github.com/expo/eas-cli/releases/tag/v0.54.1) - 2022-06-15

@@ -3,11 +3,8 @@
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95

-packages/eas-cli/src/submit @dsokal
-packages/eas-cli/src/commands/submit.ts @dsokal
-
-packages/eas-cli/src/update @kgc00 @wschurman
-packages/eas-cli/src/commands/update @kgc00 @wschurman
+packages/eas-cli/src/submit @barthap @dsokal
+packages/eas-cli/src/commands/submit.ts @barthap @dsokal

 packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# This script downloads the latest release version of EAS CLI from GitHub and
+# installs it in /usr/local/bin
+
+{
+  # All code is inside a block to ensure the script executes only when
+  # downloaded completely.
+
+  set -euo pipefail
+
+  prefix="${EAS_PREFIX:-/usr/local}"
+  temp_dir="$(mktemp -d)"
+
+  if  [ -t 1 ] && [ -z "${NO_COLOR:-}" ]
+  then
+    # Use colors when stdout is a terminal and NO_COLOR isn't set.
+    text_bold=$'\033[1m'
+    text_normal=$'\033[22m'
+    text_red=$'\033[31m'
+    text_default_color=$'\033[39m'
+  else
+    # Disable colors
+    text_bold=""
+    text_normal=""
+    text_red=""
+    text_default_color=""
+  fi
+
+  abort() {
+    echo -e "$text_bold$text_red$1$text_normal$text_default_color"
+    exit 1
+  }
+
+  install() {
+    needs_sudo=""
+    # Make sure path exists and can be written to by the current user.
+    if ! mkdir -p "$prefix/lib" || [[ ! -w "$prefix/lib" ]]
+    then
+      needs_sudo=true
+    fi
+    if ! mkdir -p "$prefix/bin" || [[ ! -w "$prefix/bin" ]]
+    then
+      needs_sudo=true
+    fi
+    if ! rm -rf "$prefix/lib/eas"
+    then
+      needs_sudo=true
+    fi
+    # Run commands with sudo if necessary.
+    if [ -n "$needs_sudo" ]
+    then
+      if [ "$EUID" -ne 0 ]
+      then
+        echo "Installing requires superuser access."
+        echo "The sudo command will prompt for your password."
+      fi
+      sudo rm -rf "$prefix/lib/eas"
+      sudo mv "$temp_dir/eas" "$prefix/lib/eas"
+      sudo ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
+    else
+      mv "$temp_dir/eas" "$prefix/lib/eas"
+      ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
+    fi
+  }
+
+  if [[ ! ":$PATH:" == *":$prefix/bin:"* ]]; then
+    abort "Your path is missing $prefix/bin, you need to add this to \$PATH use this installer."
+  fi
+
+  hardware="$(uname -m)"
+  case "$hardware" in
+    x86_64)
+      arch="x64"
+      ;;
+    arm*)
+      arch="arm"
+      ;;
+    *)
+      abort "Unsupported CPU architecture $hardware."
+      ;;
+  esac
+
+  case "$(uname -s)" in
+    Darwin*)
+      platform="darwin"
+      if [[ "$arch" != "x64" ]]; then
+        abort "Unsupported CPU architecture $hardware on macOS."
+      fi
+      ;;
+    Linux*)
+      platform="linux"
+      ;;
+    *)
+      abort "This installer is supported only on macOS, Linux, and Windows Subsystem for Linux."
+      ;;
+  esac
+  url=$(hub release -L 1 | xargs hub release show --show-downloads | grep "${platform}-${arch}.tar.gz")
+  echo "Installing EAS CLI from $url"
+
+  mkdir -p "$temp_dir"
+  cd "$temp_dir"
+
+  echo
+  echo "Downloading..."
+  if [ "$(command -v curl)" ]
+  then
+    curl --location --progress-bar "$url" | tar xz
+  else
+    wget -O- "$url" | tar xz
+  fi
+
+  # Move the installation over and link the executable (may require sudo)
+  install
+
+  # Test the bundled node binary and if it doesn't work remove it (fall back to
+  # node installed in path).
+  "$prefix/lib/eas/bin/node" -v > /dev/null || {
+    rm "$prefix/lib/eas/bin/node"
+  }
+
+  # Test the CLI
+  executable=$(command -v eas) || abort "Could not run eas after installation."
+  echo
+  echo -e "EAS CLI is installed to ${executable}"
+  eas --version
+
+  echo
+  echo -e "Type ${text_bold}eas --help${text_normal} to get started."
+}
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "2.1.0"
+  "version": "0.54.1"
 }
@@ -17,22 +17,22 @@
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@types/jest": "28.1.6",
-    "@types/node": "18.6.5",
-    "eslint": "8.21.0",
-    "eslint-config-universe": "11.1.0",
-    "eslint-plugin-async-protect": "2.1.0",
+    "@types/jest": "27.5.0",
+    "@types/node": "17.0.32",
+    "eslint": "8.15.0",
+    "eslint-config-universe": "11.0.0",
+    "eslint-plugin-async-protect": "1.1.0",
    "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.3",
-    "jest-watch-typeahead": "2.0.0",
+    "jest": "28.1.0",
+    "jest-watch-typeahead": "1.1.0",
    "lerna": "4.0.0",
-    "oclif": "3.1.2",
-    "prettier": "2.7.1",
-    "ts-jest": "28.0.7",
-    "typescript": "4.7.4"
+    "oclif": "3.0.1",
+    "prettier": "2.6.2",
+    "ts-jest": "28.0.2",
+    "typescript": "4.6.4"
  },
  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "node": "18.2.0",
+    "yarn": "1.22.18"
  }
 }
@@ -2,24 +2,6 @@ const rootEslintrc = require('../../.eslintrc.js');

 module.exports = {
  rules: {
-    'no-restricted-properties': [
-      'warn',
-      {
-        object: 'it',
-        property: 'only',
-        message: 'it.only should not be committed to main.',
-      },
-      {
-        object: 'test',
-        property: 'only',
-        message: 'test.only should not be committed to main.',
-      },
-      {
-        object: 'describe',
-        property: 'only',
-        message: 'describe.only should not be committed to main.',
-      },
-    ],
    'no-restricted-imports': [
      'error',
      {
@@ -19,28 +19,6 @@ npm install -g eas-cli
 yarn global add eas-cli
 ```

-## Enforcing eas-cli version for your project
-
-If you want to enforce the `eas-cli` version for your project, use the `"cli.version"` field in **eas.json**. Installing `eas-cli` to your project dependencies is strongly discouraged because it may cause dependency conflicts that are difficult to debug.
-
-An example of **eas.json** that enforces `eas-cli` in version `1.0.0` or newer:
-
-```json
-{
-  "cli": {
-    "version": ">=1.0.0"
-  },
-  "build": {
-    // build profiles
-  },
-  "submit": {
-    // submit profiles
-  }
-}
-```
-
-Learn more: https://docs.expo.dev/build-reference/eas-json/
-
 # Usage

 ```sh
@@ -71,8 +49,6 @@ eas --help COMMAND
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:submit`](#eas-buildsubmit)
-* [`eas build:version:set`](#eas-buildversionset)
-* [`eas build:version:sync`](#eas-buildversionsync)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
 * [`eas channel:create [NAME]`](#eas-channelcreate-name)
 * [`eas channel:edit [NAME]`](#eas-channeledit-name)
@@ -91,7 +67,6 @@ eas --help COMMAND
 * [`eas logout`](#eas-logout)
 * [`eas metadata:pull`](#eas-metadatapull)
 * [`eas metadata:push`](#eas-metadatapush)
-* [`eas open`](#eas-open)
 * [`eas project:info`](#eas-projectinfo)
 * [`eas project:init`](#eas-projectinit)
 * [`eas secret:create`](#eas-secretcreate)
@@ -125,7 +100,7 @@ ALIASES
  $ eas login
 ```

-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -142,7 +117,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -159,7 +134,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -173,7 +148,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -222,7 +197,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -242,7 +217,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -250,20 +225,16 @@ list all branches

 ```
 USAGE
-  $ eas branch:list [--offset <value>] [--limit <value>] [--json] [--non-interactive]
+  $ eas branch:list [--json]

 FLAGS
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
-                     lower value may help increase command speed.
-  --non-interactive  Run the command in non-interactive mode.
-  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
+  --json  return output as JSON

 DESCRIPTION
  list all branches
 ```

-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -282,7 +253,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -290,23 +261,19 @@ view a branch

 ```
 USAGE
-  $ eas branch:view [NAME] [--offset <value>] [--limit <value>] [--json] [--non-interactive]
+  $ eas branch:view [NAME] [--json]

 ARGUMENTS
  NAME  Name of the branch to view

 FLAGS
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
-                     lower value may help increase command speed.
-  --non-interactive  Run the command in non-interactive mode.
-  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
+  --json  return a json with the branch's ID name and recent update groups.

 DESCRIPTION
  view a branch
 ```

-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

@@ -315,10 +282,9 @@ start a build
 ```
 USAGE
  $ eas build [-p android|ios|all] [--json] [--profile <value>] [--non-interactive] [--local] [--output
-    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>] [-m <value>]
+    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>]

 FLAGS
-  -m, --message=<value>                    A short message describing the build
  -p, --platform=(android|ios|all)
  --auto-submit                            Submit on build complete using the submit profile with the same name as the
                                           build profile
@@ -336,7 +302,7 @@ DESCRIPTION
  start a build
 ```

-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -350,7 +316,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -367,7 +333,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:inspect`

@@ -402,7 +368,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/v2.1.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -435,7 +401,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:submit`

@@ -465,44 +431,6 @@ ALIASES
  $ eas build:submit
 ```

-## `eas build:version:set`
-
-Update version of an app.
-
-```
-USAGE
-  $ eas build:version:set [-p android|ios] [--profile <value>]
-
-FLAGS
-  -p, --platform=(android|ios)
-  --profile=PROFILE_NAME        Name of the build profile from eas.json. Defaults to "production" if defined in
-                                eas.json.
-
-DESCRIPTION
-  Update version of an app.
-```
-
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v2.1.0/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
-
-```
-USAGE
-  $ eas build:version:sync [-p android|ios|all] [--profile <value>]
-
-FLAGS
-  -p, --platform=(android|ios|all)
-  --profile=PROFILE_NAME            Name of the build profile from eas.json. Defaults to "production" if defined in
-                                    eas.json.
-
-DESCRIPTION
-  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/v2.1.0/packages/eas-cli/src/commands/build/version/sync.ts)_
-
 ## `eas build:view [BUILD_ID]`

 view a build for your project
@@ -518,7 +446,7 @@ DESCRIPTION
  view a build for your project
 ```

-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -538,7 +466,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -559,7 +487,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -576,7 +504,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:view [NAME]`

@@ -596,7 +524,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

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

-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/config.ts)_

 ## `eas credentials`

@@ -622,16 +550,13 @@ manage credentials

 ```
 USAGE
-  $ eas credentials [-p android|ios]
-
-FLAGS
-  -p, --platform=(android|ios)
+  $ eas credentials

 DESCRIPTION
  manage credentials
 ```

-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -645,7 +570,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/v2.1.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -663,7 +588,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -680,7 +605,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:view [UDID]`

@@ -694,7 +619,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -708,11 +633,11 @@ DESCRIPTION
  display environment info
 ```

-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

-display help for eas-cli
+Display help for eas.

 ```
 USAGE
@@ -725,10 +650,10 @@ FLAGS
  -n, --nested-commands  Include all nested commands in the output.

 DESCRIPTION
-  display help for eas-cli
+  Display help for eas.
 ```

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

 ## `eas init`

@@ -790,7 +715,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/v2.1.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -807,21 +732,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/v2.1.0/packages/eas-cli/src/commands/metadata/push.ts)_
-
-## `eas open`
-
-open the project page in a web browser
-
-```
-USAGE
-  $ eas open
-
-DESCRIPTION
-  open the project page in a web browser
-```
-
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/push.ts)_

 ## `eas project:info`

@@ -835,7 +746,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -852,7 +763,7 @@ ALIASES
  $ eas init
 ```

-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -872,7 +783,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/v2.1.0/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -889,7 +800,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -903,7 +814,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas submit`

@@ -933,7 +844,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/submit.ts)_

 ## `eas update`

@@ -963,7 +874,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -980,7 +891,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1000,7 +911,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1019,7 +930,7 @@ DESCRIPTION
  view the recent updates for a branch
 ```

-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:view GROUPID`

@@ -1039,7 +950,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1059,7 +970,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1076,7 +987,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1093,7 +1004,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1114,7 +1025,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1131,7 +1042,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v2.1.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -1,15 +1,13 @@
-const fs = require('fs/promises');
+#!/usr/bin/env sh

-const path = './src/graphql/generated.ts';
+OUTFILE="src/graphql/generated.ts"

-(async () => {
-  const generatedCode = await fs.readFile(path, 'utf8');
-  const comment = `/**
+content="/**
 * This file was generated using GraphQL Codegen
 * Command: yarn generate-graphql-code
 * Run this during development for automatic type generation when editing GraphQL documents
 * For more info and docs, visit https://graphql-code-generator.com/
- */\n\n`;
+ */
+"

-  await fs.writeFile(path, comment + generatedCode);
-})();
+printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
@@ -14,7 +14,7 @@ generates:
      dedupeOperationSuffix: true
    hooks:
      afterOneFileWrite:
-        - 'node ./scripts/annotate-graphql-codegen.js'
+        - ./annotate-graphql-codegen.sh
  ./graphql.schema.json:
    plugins:
      - 'introspection'
@@ -1,40 +1,38 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "2.1.0",
+  "version": "0.54.1",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.34",
+    "@expo/apple-utils": "0.0.0-alpha.33",
    "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "7.0.1",
-    "@expo/config-plugins": "5.0.1",
-    "@expo/config-types": "46.0.2",
-    "@expo/eas-build-job": "0.2.90",
-    "@expo/eas-json": "2.1.0",
+    "@expo/config": "6.0.23",
+    "@expo/config-plugins": "4.1.4",
+    "@expo/config-types": "45.0.0",
+    "@expo/eas-build-job": "0.2.77",
+    "@expo/eas-json": "0.54.0",
    "@expo/json-file": "8.2.36",
    "@expo/multipart-body-parser": "1.1.0",
-    "@expo/package-manager": "0.0.56",
    "@expo/pkcs12": "0.0.8",
    "@expo/plist": "0.0.18",
    "@expo/plugin-autocomplete": "1.4.0",
-    "@expo/plugin-help": "5.3.0",
+    "@expo/plugin-help": "5.2.0",
    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "5.0.3",
+    "@expo/prebuild-config": "3.1.6",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
+    "@expo/spawn-async": "1.6.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.13.10",
-    "@urql/core": "2.6.1",
+    "@oclif/core": "1.9.0",
+    "@urql/core": "2.4.4",
    "@urql/exchange-retry": "0.3.3",
    "ajv": "^6.12.6",
-    "better-opn": "3.0.2",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
+    "cli-progress": "3.11.0",
    "cli-table3": "0.6.2",
    "dateformat": "4.6.3",
    "env-paths": "2.2.0",
@@ -56,7 +54,7 @@
    "keychain": "1.3.0",
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
-    "minimatch": "5.1.0",
+    "minimatch": "5.0.1",
    "nanoid": "3.3.4",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
@@ -64,12 +62,12 @@
    "ora": "5.1.0",
    "pkg-dir": "4.2.0",
    "promise-limit": "2.7.0",
-    "promise-retry": "2.0.1",
    "prompts": "2.4.2",
    "qrcode-terminal": "0.12.0",
    "resolve-from": "5.0.0",
    "semver": "7.3.7",
    "slash": "3.0.0",
+    "strip-ansi": "6.0.0",
    "tar": "6.1.11",
    "terminal-link": "2.1.1",
    "tslib": "2.4.0",
@@ -79,35 +77,33 @@
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@graphql-codegen/cli": "2.11.5",
-    "@graphql-codegen/introspection": "2.2.1",
-    "@graphql-codegen/typescript": "2.7.3",
-    "@graphql-codegen/typescript-operations": "2.5.3",
-    "@types/cli-progress": "3.11.0",
+    "@graphql-codegen/cli": "2.6.2",
+    "@graphql-codegen/introspection": "2.1.1",
+    "@graphql-codegen/typescript": "2.4.11",
+    "@graphql-codegen/typescript-operations": "2.4.0",
+    "@types/cli-progress": "3.9.2",
    "@types/dateformat": "3.0.1",
    "@types/envinfo": "7.8.1",
    "@types/fs-extra": "9.0.13",
    "@types/getenv": "^1.0.0",
    "@types/mime": "2.0.3",
-    "@types/node-fetch": "2.6.2",
-    "@types/node-forge": "1.0.4",
-    "@types/promise-retry": "1.1.3",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node-forge": "1.0.2",
    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.10",
-    "@types/tar": "6.1.2",
+    "@types/semver": "7.3.9",
+    "@types/tar": "6.1.1",
    "@types/tough-cookie": "4.0.2",
    "@types/uuid": "8.3.4",
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.27.2",
    "eslint-plugin-graphql": "4.0.0",
-    "memfs": "3.4.7",
+    "form-data": "4.0.0",
+    "memfs": "3.4.3",
    "mockdate": "3.0.5",
-    "nock": "13.2.9",
-    "rimraf": "3.0.2",
-    "ts-deepmerge": "2.0.5",
-    "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "nock": "13.2.4",
+    "tempy": "0.7.0",
+    "ts-deepmerge": "2.0.1",
+    "typescript": "4.6.4"
  },
  "engines": {
    "node": ">=14.0.0"
@@ -170,11 +166,11 @@
    },
    "warn-if-update-available": {
      "timeoutInDays": 0.5,
-      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
    },
    "update": {
      "node": {
-        "version": "18.6.0"
+        "version": "12.13.0"
      },
      "s3": {
        "templates": {
@@ -194,8 +190,8 @@
  },
  "repository": "expo/eas-cli",
  "scripts": {
-    "postpack": "rimraf oclif.manifest.json",
-    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
+    "postpack": "rm -f oclif.manifest.json",
+    "prepack": "./scripts/prepack.sh",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
    "watch": "yarn build --watch --preserveWatchOutput",
@@ -203,10 +199,6 @@
    "test": "jest",
    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rimraf dist build tmp node_modules yarn-error.log"
-  },
-  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "clean": "rm -rf dist build tmp node_modules yarn-error.log"
  }
 }
@@ -3,6 +3,21 @@
  "type": "object",
  "definitions": {
    "apple": {
+      "AppleLocalizedPreviewFolder": {
+        "anyOf": [
+          {
+            "description": "Path to folder containing preview files",
+            "type": "string"
+          },
+          {
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
      "AppleKidsAge": {
        "enum": [
          "FIVE_AND_UNDER",
@@ -18,152 +33,96 @@
        ]
      },
      "AppleCategory": {
-        "type": "array",
-        "description": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array.",
-        "markdownDescription": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array. E.g.\n\n- `[\"SPORTS\"]`\n- `[\"SPORTS\", \"LIFESTYLE\"]`\n- `[[\"GAMES\", \"GAMES_CARD\"], \"ENTERTAINMENT\"]`\n- `[\"GAMES\", \"WEATHER\"]`",
-        "minItems": 1,
-        "maxItems": 2,
-        "uniqueItems": true,
+        "enum": [
+          "FOOD_AND_DRINK",
+          "BUSINESS",
+          "EDUCATION",
+          "SOCIAL_NETWORKING",
+          "BOOKS",
+          "SPORTS",
+          "FINANCE",
+          "REFERENCE",
+          "GRAPHICS_AND_DESIGN",
+          "DEVELOPER_TOOLS",
+          "HEALTH_AND_FITNESS",
+          "MUSIC",
+          "WEATHER",
+          "TRAVEL",
+          "ENTERTAINMENT",
+          "STICKERS",
+          "GAMES",
+          "LIFESTYLE",
+          "MEDICAL",
+          "MAGAZINES_AND_NEWSPAPERS",
+          "UTILITIES",
+          "SHOPPING",
+          "PRODUCTIVITY",
+          "NEWS",
+          "PHOTO_AND_VIDEO",
+          "NAVIGATION"
+        ]
+      },
+      "AppleSubcategory": {
+        "enum": [
+          "STICKERS_PLACES_AND_OBJECTS",
+          "STICKERS_EMOJI_AND_EXPRESSIONS",
+          "STICKERS_CELEBRATIONS",
+          "STICKERS_CELEBRITIES",
+          "STICKERS_MOVIES_AND_TV",
+          "STICKERS_SPORTS_AND_ACTIVITIES",
+          "STICKERS_EATING_AND_DRINKING",
+          "STICKERS_CHARACTERS",
+          "STICKERS_ANIMALS",
+          "STICKERS_FASHION",
+          "STICKERS_ART",
+          "STICKERS_GAMING",
+          "STICKERS_KIDS_AND_FAMILY",
+          "STICKERS_PEOPLE",
+          "STICKERS_MUSIC",
+          "GAMES_SPORTS",
+          "GAMES_WORD",
+          "GAMES_MUSIC",
+          "GAMES_ADVENTURE",
+          "GAMES_ACTION",
+          "GAMES_ROLE_PLAYING",
+          "GAMES_CASUAL",
+          "GAMES_BOARD",
+          "GAMES_TRIVIA",
+          "GAMES_CARD",
+          "GAMES_PUZZLE",
+          "GAMES_CASINO",
+          "GAMES_STRATEGY",
+          "GAMES_SIMULATION",
+          "GAMES_RACING",
+          "GAMES_FAMILY"
+        ]
+      },
+      "AppleIdfa": {
+        "description": "Identifier for Advertisers",
+        "type": "object",
+        "additionalProperties": false,
        "defaultSnippets": [
          {
-            "label": "Basic categories",
-            "description": "Add two simple categories",
-            "body": [
-              "$1",
-              "$2"
-            ]
-          },
-          {
-            "label": "Category with subcategories",
-            "description": "Add a category containing subcategories",
-            "body": [
-              [
-                "${1|GAMES,STICKERS|}",
-                "$3",
-                "$4"
-              ]
-            ]
+            "body": {
+              "servesAds": false,
+              "attributesAppInstallationToPreviousAd": false,
+              "attributesActionWithPreviousAd": false,
+              "honorsLimitedAdTracking": false
+            }
          }
        ],
-        "items": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/root"
-            },
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/parent"
-            },
-            {
-              "type": "array",
-              "description": "The GAMES category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "GAMES"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                }
-              ]
-            },
-            {
-              "type": "array",
-              "description": "The STICKERS category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "STICKERS"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                }
-              ]
-            }
-          ]
-        },
-        "categories": {
-          "root": {
-            "enum": [
-              "BUSINESS",
-              "SOCIAL_NETWORKING",
-              "MEDICAL",
-              "FOOD_AND_DRINK",
-              "EDUCATION",
-              "BOOKS",
-              "SPORTS",
-              "FINANCE",
-              "REFERENCE",
-              "GRAPHICS_AND_DESIGN",
-              "DEVELOPER_TOOLS",
-              "HEALTH_AND_FITNESS",
-              "MUSIC",
-              "WEATHER",
-              "TRAVEL",
-              "ENTERTAINMENT",
-              "LIFESTYLE",
-              "MAGAZINES_AND_NEWSPAPERS",
-              "UTILITIES",
-              "SHOPPING",
-              "PRODUCTIVITY",
-              "NEWS",
-              "PHOTO_AND_VIDEO",
-              "NAVIGATION"
-            ]
+        "properties": {
+          "servesAds": {
+            "type": "boolean"
          },
-          "parent": {
-            "enum": [
-              "GAMES",
-              "STICKERS"
-            ]
+          "attributesAppInstallationToPreviousAd": {
+            "type": "boolean"
          },
-          "games": {
-            "enum": [
-              "GAMES_SPORTS",
-              "GAMES_WORD",
-              "GAMES_MUSIC",
-              "GAMES_ADVENTURE",
-              "GAMES_ACTION",
-              "GAMES_ROLE_PLAYING",
-              "GAMES_CASUAL",
-              "GAMES_BOARD",
-              "GAMES_TRIVIA",
-              "GAMES_CARD",
-              "GAMES_PUZZLE",
-              "GAMES_CASINO",
-              "GAMES_STRATEGY",
-              "GAMES_SIMULATION",
-              "GAMES_RACING",
-              "GAMES_FAMILY"
-            ]
+          "attributesActionWithPreviousAd": {
+            "type": "boolean"
          },
-          "stickers": {
-            "enum": [
-              "STICKERS_PLACES_AND_OBJECTS",
-              "STICKERS_EMOJI_AND_EXPRESSIONS",
-              "STICKERS_CELEBRATIONS",
-              "STICKERS_CELEBRITIES",
-              "STICKERS_MOVIES_AND_TV",
-              "STICKERS_SPORTS_AND_ACTIVITIES",
-              "STICKERS_EATING_AND_DRINKING",
-              "STICKERS_CHARACTERS",
-              "STICKERS_ANIMALS",
-              "STICKERS_FASHION",
-              "STICKERS_ART",
-              "STICKERS_GAMING",
-              "STICKERS_KIDS_AND_FAMILY",
-              "STICKERS_PEOPLE",
-              "STICKERS_MUSIC"
-            ]
+          "honorsLimitedAdTracking": {
+            "type": "boolean"
          }
        }
      },
@@ -449,43 +408,62 @@
      },
      "AppleRelease": {
        "type": "object",
-        "description": "Configure how the app is released in the app store.",
        "additionalProperties": false,
+        "defaultSnippets": [
+          {
+            "body": {
+              "automaticRelease": true,
+              "usesThirdPartyContent": false,
+              "usesNonExemptEncryption": false
+            }
+          }
+        ],
        "properties": {
-          "automaticRelease": {
-            "description": "If and how the app should automatically be released when approved by App Store review.",
-            "markdownDescription": "If and how the app should automatically be released when approved by App Store review.\n- `false` - Manually release the app after store approval. (default behavior)\n- `true` - Automatically release after store approval.\n- `Date` - Automatically schedule release on this date, after store approval.\n\nApple does not guarantee that your app is available at the chosen scheduled release date.",
-            "oneOf": [
+          "autoReleaseDate": {
+            "description": "ISO Date to release the app automatically. Leave undefined to manually release the app to the public.",
+            "defaultSnippets": [
+              {
+                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}"
+              }
+            ],
+            "anyOf": [
              {
                "type": "string",
                "format": "date-time"
              },
              {
-                "type": "boolean"
-              }
-            ],
-            "defaultSnippets": [
-              {
-                "label": "Manual release",
-                "description": "Manually release the app after store approval",
-                "body": false
+                "type": "string",
+                "format": "date"
              },
              {
-                "label": "Automatic release",
-                "description": "Automatically release the app after store approval",
-                "body": true
-              },
-              {
-                "label": "Scheduled release",
-                "description": "Automatically release the app on this date, and store approval",
-                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}T${3:$CURRENT_HOUR}:00:00+00:00"
+                "type": "number"
              }
            ]
          },
-          "phasedRelease": {
+          "isPhasedReleaseEnabled": {
            "type": "boolean",
-            "description": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time.\n@see https://help.apple.com/app-store-connect/#/dev3d65fcee1",
-            "markdownDescription": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates.\n\nKeep in mind that this version will still be available to all users as a manual update from the App Store.\n\nYou can pause the phased release for up to 30 days or release this update to all users at any time.\n\n[Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)"
+            "description": "Release update over 7-day period instead of instantly.",
+            "meta": {
+              "storeInfo": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time. [Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)."
+            }
+          },
+          "shouldResetRatings": {
+            "type": "boolean",
+            "description": "Should App Store ratings be reset for this version of the app.",
+            "meta": {
+              "storeInfo": "You can reset your app’s summary rating for all countries or regions when you release this version. Keep in mind that once this version is released, you won’t be able to restore the rating. Your app’s existing customer reviews will still appear on the App Store."
+            }
+          },
+          "usesThirdPartyContent": {
+            "type": "boolean"
+          },
+          "automaticRelease": {
+            "type": "boolean",
+            "description": "Should the app automatically be released when approved by App Store review."
+          },
+          "usesNonExemptEncryption": {
+            "type": "boolean",
+            "description": "Alternative to setting `ITSAppUsesNonExemptEncryption` in the binary's `Info.plist`."
          }
        }
      },
@@ -572,15 +550,83 @@
      "description": "Configuration that is specific to the Apple App Store.",
      "additionalProperties": false,
      "properties": {
-        "version": {
-          "type": "string",
-          "description": "The version string to edit, or create, if it doesn't exist. All the metadata will be stored on this app version.",
-          "minLength": 1,
-          "defaultSnippets": [
-            {
-              "body": "${1:1}.${2:0}"
-            }
-          ]
+        "advisory": {
+          "$ref": "#/definitions/apple/AppleAdvisory"
+        },
+        "categories": {
+          "type": "array",
+          "maxItems": 2,
+          "description": "App Store categories for the app. Can add up to two categories. STICKERS and GAMES categories can add an additional subcategory.",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/apple/AppleCategory"
+              },
+              {
+                "type": "array",
+                "maxItems": 2,
+                "items": [
+                  {
+                    "enum": [
+                      "GAMES"
+                    ]
+                  },
+                  {
+                    "enum": [
+                      "GAMES_SPORTS",
+                      "GAMES_WORD",
+                      "GAMES_MUSIC",
+                      "GAMES_ADVENTURE",
+                      "GAMES_ACTION",
+                      "GAMES_ROLE_PLAYING",
+                      "GAMES_CASUAL",
+                      "GAMES_BOARD",
+                      "GAMES_TRIVIA",
+                      "GAMES_CARD",
+                      "GAMES_PUZZLE",
+                      "GAMES_CASINO",
+                      "GAMES_STRATEGY",
+                      "GAMES_SIMULATION",
+                      "GAMES_RACING",
+                      "GAMES_FAMILY"
+                    ]
+                  }
+                ],
+                "additionalItems": false
+              },
+              {
+                "type": "array",
+                "maxItems": 2,
+                "items": [
+                  {
+                    "enum": [
+                      "STICKERS"
+                    ]
+                  },
+                  {
+                    "enum": [
+                      "STICKERS_PLACES_AND_OBJECTS",
+                      "STICKERS_EMOJI_AND_EXPRESSIONS",
+                      "STICKERS_CELEBRATIONS",
+                      "STICKERS_CELEBRITIES",
+                      "STICKERS_MOVIES_AND_TV",
+                      "STICKERS_SPORTS_AND_ACTIVITIES",
+                      "STICKERS_EATING_AND_DRINKING",
+                      "STICKERS_CHARACTERS",
+                      "STICKERS_ANIMALS",
+                      "STICKERS_FASHION",
+                      "STICKERS_ART",
+                      "STICKERS_GAMING",
+                      "STICKERS_KIDS_AND_FAMILY",
+                      "STICKERS_PEOPLE",
+                      "STICKERS_MUSIC"
+                    ]
+                  }
+                ],
+                "additionalItems": false
+              }
+            ]
+          }
        },
        "copyright": {
          "type": "string",
@@ -596,11 +642,8 @@
            "storeInfo": "The name of the person or entity that owns the exclusive rights to your app, preceded by the year the rights were obtained (for example, \"2008 Acme Inc.\"). Do not provide a URL."
          }
        },
-        "advisory": {
-          "$ref": "#/definitions/apple/AppleAdvisory"
-        },
-        "categories": {
-          "$ref": "#/definitions/apple/AppleCategory"
+        "idfa": {
+          "$ref": "#/definitions/apple/AppleIdfa"
        },
        "info": {
          "description": "Localized core app info",
@@ -765,6 +808,177 @@
            }
          }
        },
+        "preview": {
+          "anyOf": [
+            {
+              "description": "Path to localized folders containing preview files",
+              "type": "string"
+            },
+            {
+              "description": "Localized previews object. Ex: `\"en-US\": [\"image.png\"]`",
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "ar-SA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Arabic"
+                },
+                "ca": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Catalan"
+                },
+                "zh-Hans": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Chinese (Simplified)"
+                },
+                "zh-Hant": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Chinese (Traditional)"
+                },
+                "hr": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Croatian"
+                },
+                "cs": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Czech"
+                },
+                "da": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Danish"
+                },
+                "nl-NL": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Dutch"
+                },
+                "en-AU": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (Australia)"
+                },
+                "en-CA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (Canada)"
+                },
+                "en-GB": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (U.K.)"
+                },
+                "en-US": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (U.S.)"
+                },
+                "fi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Finnish"
+                },
+                "fr-FR": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "French"
+                },
+                "fr-CA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "French (Canada)"
+                },
+                "de-DE": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "German"
+                },
+                "el": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Greek"
+                },
+                "he": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hebrew"
+                },
+                "hi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hindi"
+                },
+                "hu": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hungarian"
+                },
+                "id": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Indonesian"
+                },
+                "it": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Italian"
+                },
+                "ja": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Japanese"
+                },
+                "ko": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Korean"
+                },
+                "ms": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Malay"
+                },
+                "no": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Norwegian"
+                },
+                "pl": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Polish"
+                },
+                "pt-BR": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Portuguese (Brazil)"
+                },
+                "pt-PT": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Portuguese (Portugal)"
+                },
+                "ro": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Romanian"
+                },
+                "ru": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Russian"
+                },
+                "sk": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Slovak"
+                },
+                "es-MX": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Spanish (Mexico)"
+                },
+                "es-ES": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Spanish (Spain)"
+                },
+                "sv": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Swedish"
+                },
+                "th": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Thai"
+                },
+                "tr": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Turkish"
+                },
+                "uk": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Ukrainian"
+                },
+                "vi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Vietnamese"
+                }
+              }
+            }
+          ]
+        },
        "release": {
          "$ref": "#/definitions/apple/AppleRelease",
          "description": "Release strategy"
@@ -772,6 +986,10 @@
        "review": {
          "$ref": "#/definitions/apple/AppleReview",
          "description": "Info for the App Store reviewer"
+        },
+        "priceTier": {
+          "type": "number",
+          "description": "App price tier. 0 is Free."
        }
      }
    }
@@ -1,4 +1,4 @@
-const fs = require('fs/promises');
+const { promises: fs } = require('fs');

 (async () => {
  // Patch `oclif readme` path and link generation
@@ -1,7 +0,0 @@
-const spawn = require('@expo/spawn-async');
-
-(async () => {
-  if (!process.env.CLI_SIZE_CHECK) {
-    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
-  }
-})();
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+rm -rf build
+yarn build
+
+if [ -z "$CLI_SIZE_CHECK" ]; then
+  yarn oclif manifest
+fi
@@ -1,17 +1,17 @@
-import { fixS3Url } from '../uploads';
+import { fixArchiveUrl } from '../uploads';

-describe(fixS3Url, () => {
+describe(fixArchiveUrl, () => {
  it('fixes broken links', () => {
    const input =
      'https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c';
    const expectedOutput =
      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
-    expect(fixS3Url(input)).toBe(expectedOutput);
+    expect(fixArchiveUrl(input)).toBe(expectedOutput);
  });

  it('does not change correct urls', () => {
    const correctUrl =
      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
-    expect(fixS3Url(correctUrl)).toBe(correctUrl);
+    expect(fixArchiveUrl(correctUrl)).toBe(correctUrl);
  });
 });
@@ -15,9 +15,6 @@ export enum SubmissionEvent {
  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
-  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
-  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
 }

 export enum BuildEvent {
@@ -4,7 +4,7 @@ import fetch, { RequestError, RequestInit } from './fetch';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';

 export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
+  readonly name = 'ApiV2Error';
  readonly expoApiV2ErrorCode: string;
  readonly expoApiV2ErrorDetails?: JSONValue;
  readonly expoApiV2ErrorServerStack?: string;
@@ -1,114 +0,0 @@
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-
-import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { UpdateBranchFragment } from '../graphql/generated';
-import { BranchQuery } from '../graphql/queries/BranchQuery';
-import Log from '../log';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../update/utils';
-import { printJsonOnlyOutput } from '../utils/json';
-import {
-  paginatedQueryWithConfirmPromptAsync,
-  paginatedQueryWithSelectPromptAsync,
-} from '../utils/queries';
-
-export const BRANCHES_LIMIT = 50;
-
-export async function selectBranchFromPaginatedQueryAsync(
-  projectId: string,
-  promptTitle: string,
-  options: PaginatedQueryOptions
-): Promise<UpdateBranchFragment> {
-  if (options.nonInteractive) {
-    throw new Error('Unable to select a branch in non-interactive mode.');
-  }
-
-  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
-    limit: options.limit ?? BRANCHES_LIMIT,
-    offset: options.offset,
-    queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
-    promptOptions: {
-      title: promptTitle,
-      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      createDisplayTextForSelectionPromptListItem: updateBranchFragment =>
-        updateBranchFragment.name,
-    },
-  });
-  if (!selectedBranch) {
-    throw new Error(`Could not find any branches for project "${projectId}"`);
-  }
-  return selectedBranch;
-}
-
-export async function listAndRenderPaginatedBranchesAsync(
-  projectId: string,
-  options: PaginatedQueryOptions
-): Promise<void> {
-  if (options.nonInteractive) {
-    const branches = await queryBranchesForProjectAsync(
-      options.limit ?? BRANCHES_LIMIT,
-      options.offset,
-      projectId
-    );
-    renderPageOfBranches(branches, options);
-  } else {
-    await paginatedQueryWithConfirmPromptAsync({
-      limit: options.limit ?? BRANCHES_LIMIT,
-      offset: options.offset,
-      queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
-      promptOptions: {
-        title: 'Load more branches?',
-        renderListItems: branches => renderPageOfBranches(branches, options),
-      },
-    });
-  }
-}
-
-async function queryBranchesForProjectAsync(
-  limit: number,
-  offset: number,
-  projectId: string
-): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesAsync({
-    appId: projectId,
-    limit,
-    offset,
-  });
-}
-
-function renderPageOfBranches(
-  currentPage: UpdateBranchFragment[],
-  { json }: PaginatedQueryOptions
-): void {
-  if (json) {
-    printJsonOnlyOutput(currentPage);
-  } else {
-    const table = new CliTable({
-      head: ['Branch', ...UPDATE_COLUMNS],
-      wordWrap: true,
-    });
-
-    table.push(
-      ...currentPage.map(branch => {
-        const update: UpdateBranchFragment['updates'][0] | undefined = branch.updates[0];
-        return [
-          branch.name,
-          formatUpdate(update),
-          update?.runtimeVersion ?? 'N/A',
-          update?.group ?? 'N/A',
-          update?.group
-            ? getPlatformsForGroup({
-                updates: branch.updates,
-                group: update.group,
-              })
-            : 'N/A',
-        ];
-      })
-    );
-
-    Log.addNewLineIfNone();
-    Log.log(chalk.bold('Branches:'));
-    Log.addNewLineIfNone();
-    Log.log(table.toString());
-  }
-}
@@ -1,14 +0,0 @@
-import { truncateGitCommitMessage } from '../metadata';
-
-describe(truncateGitCommitMessage, () => {
-  it('returns undefined if no message was passed', () => {
-    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
-  });
-  it('returns commit message', () => {
-    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
-  });
-
-  it('truncates long commit messages', () => {
-    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
-  });
-});
@@ -73,39 +73,39 @@ describe(bumpVersionAsync, () => {

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.VERSION_CODE,
-      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('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(124);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(124);

-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
  });

-  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.APP_VERSION', async () => {
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
    const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });

    await bumpVersionAsync({
      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('3.0.1');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.1');
    expect(appJSON.expo.android.versionCode).toBe(123);

-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
@@ -116,17 +116,17 @@ describe(bumpVersionAsync, () => {

    await bumpVersionAsync({
      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('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(123);

-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
@@ -140,11 +140,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.VERSION_CODE,
-      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('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(127);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -156,11 +156,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('5.0.1');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.1');
@@ -172,11 +172,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('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -189,7 +189,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from native code', async () => {
      const exp = initBareWorkflowProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -201,7 +201,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from expo config', async () => {
      const exp = initManagedProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -240,7 +240,7 @@ function initBareWorkflowProject({
 }`,
      './android/app/src/main/AndroidManifest.xml': 'fake',
    },
-    '/app'
+    '/repo'
  );

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

  return fakeExp;
@@ -1,5 +1,4 @@
 import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

@@ -29,7 +28,6 @@ import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate'
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';

 export async function createAndroidContextAsync(
  ctx: CommonContext<Platform.ANDROID>
@@ -47,7 +45,7 @@ This means that it will most likely produce an AAB and you will not be able to i
    Log.newLine();
    const confirmed = await toggleConfirmAsync({ message: 'Would you like to proceed?' });
    if (!confirmed) {
-      Log.error('Update eas.json and come back again.');
+      Log.error('Please update eas.json and come back again.');
      process.exit(1);
    }
  }
@@ -62,18 +60,8 @@ This means that it will most likely produce an AAB and you will not be able to i
  }

  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
-  const versionCodeOverride =
-    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteVersionCodeAsync({
-          projectDir: ctx.projectDir,
-          projectId: ctx.projectId,
-          exp: ctx.exp,
-          applicationId,
-          buildProfile,
-        })
-      : undefined;

-  return { applicationId, gradleContext, versionCodeOverride };
+  return { applicationId, gradleContext };
 }

 export async function prepareAndroidBuildAsync(
@@ -88,10 +76,7 @@ export async function prepareAndroidBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
+        buildProfile: ctx.buildProfile,
      });
    },
    prepareJobAsync: async (
@@ -13,10 +13,8 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    secrets: job.secrets,
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
-    version: job.version?.versionCode ? { versionCode: job.version.versionCode } : undefined,
    gradleCommand: job.gradleCommand,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
    username: job.username,
    buildType: job.buildType && transformBuildType(job.buildType),
    developmentClient: job.developmentClient,
@@ -72,15 +72,9 @@ export async function prepareJobAsync(
    updates: { channel: ctx.buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
+    artifactPath: buildProfile.artifactPath,
    buildType,
    username,
-    ...(ctx.android.versionCodeOverride && {
-      version: {
-        versionCode: ctx.android.versionCodeOverride,
-      },
-    }),
    experimental: {
      prebuildCommand: ctx.buildProfile.prebuildCommand,
    },
@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement } from '@expo/eas-json';
+import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -15,14 +15,15 @@ import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './ver
 export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
-  localAutoIncrement,
+  buildProfile,
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
+  buildProfile: BuildProfile<Platform.ANDROID>;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
@@ -1,21 +1,16 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig, Updates } from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

-import { AppPlatform } from '../../graphql/generated';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
-import { ora } from '../../ora';
 import {
  getAppBuildGradleAsync,
  parseGradleCommand,
  resolveConfigValue,
 } from '../../project/android/gradleUtils';
-import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
@@ -51,10 +46,9 @@ export async function bumpVersionAsync({

  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
  Log.log('Updated versions in app.json');
-  await updateNativeVersionsAsync({
+  await writeVersionsToBuildGradleAsync({
    projectDir,
-    version: exp.version,
-    versionCode: exp.android?.versionCode,
+    exp,
  });
  Log.log('Synchronized versions with build gradle');
 }
@@ -80,7 +74,7 @@ export async function bumpVersionInAppJsonAsync({
    await bumpAppVersionAsync({ appVersion, projectDir, exp });
  } else {
    const versionCode = AndroidConfig.Version.getVersionCode(exp);
-    const bumpedVersionCode = getNextVersionCode(versionCode);
+    const bumpedVersionCode = versionCode + 1;
    Log.log(
      `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
        versionCode
@@ -122,33 +116,21 @@ export async function maybeResolveVersionsAsync(
  }
 }

-export async function updateNativeVersionsAsync({
+async function writeVersionsToBuildGradleAsync({
  projectDir,
-  version,
-  versionCode,
+  exp,
 }: {
  projectDir: string;
-  version?: string;
-  versionCode?: number;
-}): Promise<void> {
+  exp: ExpoConfig;
+}): Promise<string> {
  const buildGradle = await readBuildGradleAsync(projectDir);
  if (!buildGradle) {
    throw new Error('This project is missing a build.gradle file.');
  }
-  let updatedBuildGradle = buildGradle;
-  if (version !== undefined) {
-    updatedBuildGradle = updatedBuildGradle.replace(
-      new RegExp(`versionName ".*"`),
-      `versionName "${version}"`
-    );
-  }
-  if (versionCode !== undefined) {
-    updatedBuildGradle = updatedBuildGradle.replace(
-      new RegExp(`versionCode.*`),
-      `versionCode ${versionCode}`
-    );
-  }
+  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
+  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
  await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
+  return updatedBuildGradle;
 }

 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
@@ -169,97 +151,3 @@ async function writeBuildGradleAsync({
  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
  await fs.writeFile(buildGradlePath, buildGradle);
 }
-
-/**
- * Returns buildNumber that will be used for the next build. If current build profile
- * has an 'autoIncrement' option set, it increments the version on server.
- */
-export async function resolveRemoteVersionCodeAsync({
-  projectDir,
-  projectId,
-  exp,
-  applicationId,
-  buildProfile,
-}: {
-  projectDir: string;
-  projectId: string;
-  exp: ExpoConfig;
-  applicationId: string;
-  buildProfile: BuildProfile<Platform.ANDROID>;
-}): Promise<string> {
-  const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    projectId,
-    AppPlatform.Android,
-    applicationId
-  );
-
-  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
-  let currentBuildVersion: string;
-  if (remoteVersions?.buildVersion) {
-    currentBuildVersion = remoteVersions.buildVersion;
-  } else {
-    if (localVersions.appBuildVersion) {
-      Log.warn(
-        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
-      );
-      currentBuildVersion = localVersions.appBuildVersion;
-    } else {
-      Log.error(
-        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
-      );
-      throw new Error('Remote versions are not configured.');
-    }
-  }
-  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
-    return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
-    const spinner = ora(
-      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync({
-        appId: projectId,
-        platform: AppPlatform.Android,
-        applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
-        buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
-      });
-      spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
-    } catch (err) {
-      spinner.fail(`Failed to initialize versionCode with ${chalk.bold(currentBuildVersion)}.`);
-      throw err;
-    }
-    return currentBuildVersion;
-  } else {
-    const nextBuildVersion = getNextVersionCode(currentBuildVersion);
-    const spinner = ora(
-      `Incrementing versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-        nextBuildVersion
-      )}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync({
-        appId: projectId,
-        platform: AppPlatform.Android,
-        applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
-        buildVersion: String(nextBuildVersion),
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
-      });
-      spinner.succeed(
-        `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-    } catch (err) {
-      spinner.fail(
-        `Failed to increment versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-      throw err;
-    }
-    return String(nextBuildVersion);
-  }
-}
@@ -25,7 +25,7 @@ import {
  appPlatformEmojis,
  requestedPlatformDisplayNames,
 } from '../platform';
-import { uploadFileAtPathToS3Async } from '../uploads';
+import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -120,7 +120,7 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
+      await runLocalBuildAsync(job, ctx.localBuildOptions);
      return undefined;
    } else {
      try {
@@ -134,18 +134,18 @@ export async function prepareBuildRequestForPlatformAsync<

 function handleBuildRequestError(error: any, platform: Platform): never {
  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-    Log.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
+    Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
    throw new Error('Build request failed.');
  } else if (
    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
  ) {
    Log.error(
-      'EAS Build is down for maintenance. Try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
    );
    throw new Error('Build request failed.');
  } else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
    Log.error(
-      'EAS Build free tier is temporarily disabled. Try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
    );
    throw new Error('Build request failed.');
  } else if (
@@ -157,7 +157,7 @@ function handleBuildRequestError(error: any, platform: Platform): never {
    throw new Error('Build request failed.');
  } else if (error?.graphQLErrors) {
    Log.error(
-      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
    );
  }
  throw error;
@@ -179,7 +179,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        const projectTarball = await makeProjectTarballAsync();
        projectTarballPath = projectTarball.path;

-        const { bucketKey } = await uploadFileAtPathToS3Async(
+        const { bucketKey } = await uploadAsync(
          UploadSessionType.EasBuildProjectSources,
          projectTarball.path,
          createProgressTracker({
@@ -243,7 +243,11 @@ type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  { intervalSec = 10 } = {}
+  {
+    // 2 hours (max build time limit) + 10 minutes (possible queue time)
+    timeoutSec = 2 * 60 * 60 + 10 * 60,
+    intervalSec = 10,
+  } = {}
 ): Promise<MaybeBuildFragment[]> {
  let spinner;
  let originalSpinnerText;
@@ -255,7 +259,8 @@ export async function waitForBuildEndAsync(
    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
  }
-  while (true) {
+  const endTime = new Date().getTime() + timeoutSec * 1000;
+  while (new Date().getTime() <= endTime) {
    const builds = await getBuildsSafelyAsync(buildIds);
    const { refetch } =
      builds.length === 1
@@ -266,6 +271,10 @@ export async function waitForBuildEndAsync(
    }
    await sleepAsync(intervalSec * 1000);
  }
+  spinner.fail('Timed out');
+  throw new Error(
+    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
+  );
 }

 async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
@@ -343,7 +352,7 @@ async function handleSingleBuildProgressAsync(
          );
        }
        Log.newLine();
-        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
+        Log.log('Waiting in queue');
        queueProgressBar.start(
          build.initialQueuePosition + 1,
          build.initialQueuePosition - build.queuePosition + 1,
@@ -376,12 +385,6 @@ async function handleSingleBuildProgressAsync(
  return { refetch: true };
 }

-const priorityToQueueDisplayName: Record<BuildPriority, string> = {
-  [BuildPriority.Normal]: 'queue',
-  [BuildPriority.NormalPlus]: 'queue',
-  [BuildPriority.High]: 'priority queue',
-};
-
 const statusToDisplayName: Record<BuildStatus, string> = {
  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
  [BuildStatus.InQueue]: 'in queue',
@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

@@ -24,7 +24,7 @@ interface ConfigureParams {
 export async function ensureProjectConfiguredAsync(
  configureParams: ConfigureParams
 ): Promise<boolean> {
-  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(configureParams.projectDir))) {
    return false;
  }

@@ -89,7 +89,7 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
 };

 async function createEasJsonAsync(projectDir: string): Promise<void> {
-  const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
+  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);

  const hasAndroidNativeProject =
    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJson } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
@@ -16,20 +17,18 @@ export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android'
 export interface AndroidBuildContext {
  applicationId: string;
  gradleContext?: GradleBuildContext;
-  versionCodeOverride?: string;
 }

 export interface IosBuildContext {
  bundleIdentifier: string;
+  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
  applicationTarget: Target;
  targets: Target[];
  xcodeBuildContext: XcodeBuildContext;
-  buildNumberOverride?: string;
 }

 export interface BuildContext<T extends Platform> {
  accountName: string;
-  easJsonCliConfig: EasJson['cli'];
  buildProfile: BuildProfile<T>;
  buildProfileName: string;
  resourceClass: BuildResourceClass;
@@ -38,13 +37,10 @@ export interface BuildContext<T extends Platform> {
  exp: ExpoConfig;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
-  noWait: boolean;
-  runFromCI: boolean;
  platform: T;
  projectDir: string;
  projectId: string;
  projectName: string;
-  message?: string;
  trackingCtx: TrackingContext;
  user: Actor;
  workflow: Workflow;
@@ -1,7 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJson } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
-import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';

@@ -22,27 +21,21 @@ import { LocalBuildOptions } from './local';
 export async function createBuildContextAsync<T extends Platform>({
  buildProfileName,
  buildProfile,
-  easJsonCliConfig,
  clearCache = false,
  localBuildOptions,
-  nonInteractive,
-  noWait,
+  nonInteractive = false,
  platform,
  projectDir,
  resourceClass,
-  message,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
-  easJsonCliConfig: EasJson['cli'];
  clearCache: boolean;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
-  noWait: boolean;
  platform: T;
  projectDir: string;
  resourceClass: BuildResourceClass;
-  message?: string;
 }): Promise<BuildContext<T>> {
  const exp = getExpoConfig(projectDir, { env: buildProfile.env });

@@ -52,7 +45,6 @@ export async function createBuildContextAsync<T extends Platform>({
  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
  const workflow = await resolveWorkflowAsync(projectDir, platform);
  const accountId = findAccountByName(user.accounts, accountName)?.id;
-  const runFromCI = getenv.boolish('CI', false);

  const credentialsCtx = new CredentialsContext({
    exp,
@@ -60,7 +52,6 @@ export async function createBuildContextAsync<T extends Platform>({
    projectDir,
    user,
    env: buildProfile.env,
-    easJsonCliConfig,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -75,8 +66,6 @@ export async function createBuildContextAsync<T extends Platform>({
    project_id: projectId,
    project_type: workflow,
    ...devClientProperties,
-    no_wait: noWait,
-    run_from_ci: runFromCI,
  };
  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);

@@ -85,13 +74,11 @@ export async function createBuildContextAsync<T extends Platform>({
    buildProfile,
    buildProfileName,
    resourceClass,
-    easJsonCliConfig,
    clearCache,
    credentialsCtx,
    exp,
    localBuildOptions,
    nonInteractive,
-    noWait,
    platform,
    projectDir,
    projectId,
@@ -99,8 +86,6 @@ export async function createBuildContextAsync<T extends Platform>({
    trackingCtx,
    user,
    workflow,
-    message,
-    runFromCI,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -3,7 +3,6 @@ import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
-import type { XCBuildConfiguration } from 'xcode';

 import { readPlistAsync } from '../../../utils/plist';
 import {
@@ -18,12 +17,6 @@ import {

 jest.mock('fs');

-const getXCBuildConfigurationFromPbxproj = jest.spyOn(
-  IOSConfig.Target,
-  'getXCBuildConfigurationFromPbxproj'
-);
-const getPbxproj = jest.spyOn(IOSConfig.XcodeUtils, 'getPbxproj');
-
 afterAll(async () => {
  // do not remove the following line
  // this fixes a weird error with tempy in @expo/image-utils
@@ -58,34 +51,14 @@ describe(evaluateTemplateString, () => {

 // bare workflow
 describe(bumpVersionAsync, () => {
-  beforeEach(() => {
-    getPbxproj.mockImplementation(() => ({} as any));
-  });
-  afterEach(() => {
-    getXCBuildConfigurationFromPbxproj.mockReset();
-    getPbxproj.mockReset();
-  });
  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
    const fakeExp = initBareWorkflowProject();
-    getXCBuildConfigurationFromPbxproj.mockImplementation(
-      () =>
-        ({
-          buildSettings: {
-            INFOPLIST_FILE: 'myproject/Info.plist',
-          },
-        } as XCBuildConfiguration)
-    );
+
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
      projectDir: '/repo',
      exp: fakeExp,
-      targets: [
-        {
-          targetName: 'example',
-          bundleIdentifier: 'example.com',
-          entitlements: {},
-        },
-      ],
+      buildSettings: {},
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -103,25 +76,13 @@ describe(bumpVersionAsync, () => {
  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });

-    getXCBuildConfigurationFromPbxproj.mockImplementation(
-      () =>
-        ({
-          buildSettings: {
-            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
-          },
-        } as XCBuildConfiguration)
-    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
      projectDir: '/repo',
      exp: fakeExp,
-      targets: [
-        {
-          targetName: 'example',
-          bundleIdentifier: 'example.com',
-          entitlements: {},
-        },
-      ],
+      buildSettings: {
+        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+      },
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -136,27 +97,14 @@ describe(bumpVersionAsync, () => {
    expect(infoPlist['CFBundleVersion']).toBe('2');
  });

-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.APP_VERSION', async () => {
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
    const fakeExp = initBareWorkflowProject();
-    getXCBuildConfigurationFromPbxproj.mockImplementation(
-      () =>
-        ({
-          buildSettings: {
-            INFOPLIST_FILE: 'myproject/Info.plist',
-          },
-        } as XCBuildConfiguration)
-    );
+
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
      projectDir: '/repo',
      exp: fakeExp,
-      targets: [
-        {
-          targetName: 'example',
-          bundleIdentifier: 'example.com',
-          entitlements: {},
-        },
-      ],
+      buildSettings: {},
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -173,25 +121,12 @@ describe(bumpVersionAsync, () => {

  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
    const fakeExp = initBareWorkflowProject();
-    getXCBuildConfigurationFromPbxproj.mockImplementation(
-      () =>
-        ({
-          buildSettings: {
-            INFOPLIST_FILE: 'myproject/Info.plist',
-          },
-        } as XCBuildConfiguration)
-    );
+
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
      projectDir: '/repo',
      exp: fakeExp,
-      targets: [
-        {
-          targetName: 'example',
-          bundleIdentifier: 'example.com',
-          entitlements: {},
-        },
-      ],
+      buildSettings: {},
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -353,9 +288,9 @@ describe(getInfoPlistPath, () => {

 function initBareWorkflowProject({
  appVersion = '1.0.0',
-  buildNumber = '1',
+  version = '1',
  infoPlistName = 'Info.plist',
-}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
  const fakeExp: ExpoConfig = {
    name: 'myproject',
    slug: 'myproject',
@@ -376,7 +311,7 @@ function initBareWorkflowProject({
  <key>CFBundleShortVersionString</key>
  <string>${appVersion}</string>
  <key>CFBundleVersion</key>
-  <string>${buildNumber}</string>
+  <string>${version}</string>
 </dict>
 </plist>`,
    },
@@ -1,7 +1,8 @@
+import { IOSConfig } from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import { AppVersionSource } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

-import { IosCredentials } from '../../credentials/ios/types';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
@@ -15,7 +16,6 @@ import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteBuildNumberAsync } from './version';

 export async function createIosContextAsync(
  ctx: CommonContext<Platform.IOS>
@@ -44,22 +44,14 @@ export async function createIosContextAsync(
    env: buildProfile.env,
  });
  const applicationTarget = findApplicationTarget(targets);
-  const buildNumberOverride =
-    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteBuildNumberAsync({
-          projectDir: ctx.projectDir,
-          projectId: ctx.projectId,
-          exp: ctx.exp,
-          applicationTarget,
-          buildProfile,
-        })
-      : undefined;
+  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
+
  return {
    bundleIdentifier: applicationTarget.bundleIdentifier,
    applicationTarget,
+    applicationTargetBuildSettings,
    targets,
    xcodeBuildContext,
-    buildNumberOverride,
  };
 }

@@ -75,11 +67,8 @@ export async function prepareIosBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        targets: ctx.ios.targets,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
+        buildProfile: ctx.buildProfile,
+        buildSettings: ctx.ios.applicationTargetBuildSettings,
      });
    },
    prepareJobAsync: async (
@@ -108,3 +97,18 @@ export async function prepareIosBuildAsync(
    },
  });
 }
+
+function resolveBuildSettings(
+  ctx: CommonContext<Platform.IOS>,
+  applicationTarget: Target
+): XCBuildConfiguration['buildSettings'] {
+  if (ctx.workflow === Workflow.MANAGED) {
+    return {};
+  }
+  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
+  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  });
+  return xcBuildConfiguration?.buildSettings ?? {};
+}
@@ -1,4 +1,4 @@
-import { Ios } from '@expo/eas-build-job';
+import { Env, Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';

 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
@@ -14,11 +14,9 @@ export function transformJob(job: Ios.Job): IosJobInput {
    secrets: transformIosSecrets(job.secrets),
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
-    version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
    scheme: job.scheme,
    buildConfiguration: job.buildConfiguration,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
    username: job.username,
    developmentClient: job.developmentClient,
    simulator: job.simulator,
@@ -28,6 +26,7 @@ export function transformJob(job: Ios.Job): IosJobInput {

 function transformIosSecrets(secrets: {
  buildCredentials?: Ios.BuildCredentials;
+  env?: Env;
 }): IosJobSecretsInput {
  const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];

@@ -43,5 +42,6 @@ function transformIosSecrets(secrets: {

  return {
    buildCredentials,
+    environmentSecrets: secrets.env,
  };
 }
@@ -64,15 +64,8 @@ export async function prepareJobAsync(
    simulator: ctx.buildProfile.simulator,
    scheme: jobData.buildScheme,
    buildConfiguration: ctx.buildProfile.buildConfiguration,
-    applicationArchivePath:
-      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
-    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
+    artifactPath: ctx.buildProfile.artifactPath,
    username,
-    ...(ctx.ios.buildNumberOverride && {
-      version: {
-        buildNumber: ctx.ios.buildNumberOverride,
-      },
-    }),
    experimental: {
      prebuildCommand: ctx.buildProfile.prebuildCommand,
    },
@@ -1,8 +1,8 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosVersionAutoIncrement } from '@expo/eas-json';
+import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

-import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
@@ -11,22 +11,23 @@ import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './ver
 export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
-  targets,
-  localAutoIncrement,
+  buildProfile,
+  buildSettings,
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  targets: Target[];
-  localAutoIncrement?: IosVersionAutoIncrement;
+  buildProfile: BuildProfile<Platform.IOS>;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
  } else {
    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  }
@@ -1,25 +1,16 @@
-import { ExpoConfig } from '@expo/config';
-import { IOSConfig, Updates } from '@expo/config-plugins';
+import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';

-import { Target } from '../../credentials/ios/types';
-import { AppPlatform } from '../../graphql/generated';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
-import { ora } from '../../ora';
-import { findApplicationTarget } from '../../project/ios/target';
-import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
-import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
+import { bumpAppVersionAsync } from '../utils/version';

 export enum BumpStrategy {
  APP_VERSION,
@@ -31,25 +22,21 @@ export async function bumpVersionAsync({
  bumpStrategy,
  projectDir,
  exp,
-  targets,
+  buildSettings,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  bumpStrategy: BumpStrategy;
-  targets: Target[];
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
  if (bumpStrategy === BumpStrategy.NOOP) {
    return;
  }
  ensureStaticConfigExists(projectDir);
+  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
  Log.log('Updated versions in app.json');
-  await updateNativeVersionsAsync({
-    projectDir,
-    version: exp.version,
-    buildNumber: exp.ios?.buildNumber,
-    targets,
-  });
+  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
  Log.log('Synchronized versions with Info.plist');
 }

@@ -72,8 +59,10 @@ export async function bumpVersionInAppJsonAsync({
    await bumpAppVersionAsync({ appVersion, projectDir, exp });
  } else {
    const buildNumber = IOSConfig.Version.getBuildNumber(exp);
-    if (isValidBuildNumber(buildNumber)) {
-      const bumpedBuildNumber = getNextBuildNumber(buildNumber);
+    if (buildNumber.match(/^\d+(\.\d+)*$/)) {
+      const comps = buildNumber.split('.');
+      comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
+      const bumpedBuildNumber = comps.join('.');
      Log.log(
        `Bumping ${chalk.bold('expo.ios.buildNumber')} from ${chalk.bold(
          buildNumber
@@ -132,21 +121,12 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
  projectDir: string,
  exp: ExpoConfig,
-  targets: Target[]
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const applicationTarget = findApplicationTarget(targets);
  try {
    return {
-      appBuildVersion: await readBuildNumberAsync(
-        projectDir,
-        exp,
-        applicationTarget.buildSettings ?? {}
-      ),
-      appVersion: await readShortVersionAsync(
-        projectDir,
-        exp,
-        applicationTarget.buildSettings ?? {}
-      ),
+      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
+      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
    };
  } catch (err: any) {
    Log.warn('Failed to read app versions.');
@@ -157,6 +137,23 @@ export async function maybeResolveVersionsAsync(
  }
 }

+async function writeVersionsToInfoPlistAsync({
+  projectDir,
+  exp,
+  infoPlist,
+  buildSettings,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}): Promise<IOSConfig.InfoPlist> {
+  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
+  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
+  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
+  return updatedInfoPlist;
+}
+
 export function getInfoPlistPath(
  projectDir: string,
  buildSettings: XCBuildConfiguration['buildSettings']
@@ -184,55 +181,24 @@ async function readInfoPlistAsync(
  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }

-export async function updateNativeVersionsAsync({
+async function writeInfoPlistAsync({
  projectDir,
-  version,
-  buildNumber,
-  targets,
+  infoPlist,
+  buildSettings,
 }: {
  projectDir: string;
-  version?: string;
-  buildNumber?: string;
-  targets: Target[];
+  infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
-  const project = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-  const iosDir = path.join(projectDir, 'ios');
-
-  const infoPlistFiles: string[] = [];
-  for (const target of targets) {
-    const { targetName, buildConfiguration } = target;
-    const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-      targetName,
-      buildConfiguration,
-    });
-    const infoPlist = xcBuildConfiguration?.buildSettings?.INFOPLIST_FILE;
-    if (infoPlist) {
-      const evaluatedInfoPlistPath = trimQuotes(
-        evaluateTemplateString(infoPlist, {
-          SRCROOT: iosDir,
-        })
-      );
-      const absolutePath = path.isAbsolute(evaluatedInfoPlistPath)
-        ? evaluatedInfoPlistPath
-        : path.join(iosDir, evaluatedInfoPlistPath);
-      infoPlistFiles.push(path.normalize(absolutePath));
-    }
-  }
-  const uniqueInfoPlistPaths = uniqBy(infoPlistFiles, i => i);
-  for (const infoPlistPath of uniqueInfoPlistPaths) {
-    const infoPlist = (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
-    if (buildNumber) {
-      infoPlist.CFBundleVersion = buildNumber;
-    }
-    if (version) {
-      infoPlist.CFBundleShortVersionString = version;
-    }
-    await writePlistAsync(infoPlistPath, infoPlist);
-  }
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
+  await writePlistAsync(infoPlistPath, infoPlist);
 }

-function trimQuotes(s: string): string {
-  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
+function ensureStaticConfigExists(projectDir: string): void {
+  const paths = getConfigFilePaths(projectDir);
+  if (!paths.staticConfigPath) {
+    throw new Error('autoIncrement option is not supported when using app.config.js');
+  }
 }

 export function evaluateTemplateString(
@@ -250,106 +216,3 @@ export function evaluateTemplateString(
    }
  });
 }
-
-/**
- * Returns buildNumber that will be used for the next build. If current build profile
- * has an 'autoIncrement' option set, it increments the version on server.
- */
-export async function resolveRemoteBuildNumberAsync({
-  projectDir,
-  projectId,
-  exp,
-  applicationTarget,
-  buildProfile,
-}: {
-  projectDir: string;
-  projectId: string;
-  exp: ExpoConfig;
-  applicationTarget: Target;
-  buildProfile: BuildProfile<Platform.IOS>;
-}): Promise<string> {
-  const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    projectId,
-    AppPlatform.Ios,
-    applicationTarget.bundleIdentifier
-  );
-
-  const localBuildNumber = await readBuildNumberAsync(
-    projectDir,
-    exp,
-    applicationTarget.buildSettings ?? {}
-  );
-  const localShortVersion = await readShortVersionAsync(
-    projectDir,
-    exp,
-    applicationTarget.buildSettings ?? {}
-  );
-  let currentBuildVersion: string;
-  if (remoteVersions?.buildVersion) {
-    currentBuildVersion = remoteVersions.buildVersion;
-  } else {
-    if (localBuildNumber) {
-      Log.warn(
-        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
-      );
-      currentBuildVersion = localBuildNumber;
-    } else {
-      Log.error(
-        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
-      );
-      throw new Error('Remote versions are not configured.');
-    }
-  }
-  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
-    return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
-    const spinner = ora(
-      `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync({
-        appId: projectId,
-        platform: AppPlatform.Ios,
-        applicationIdentifier: applicationTarget.bundleIdentifier,
-        storeVersion: localShortVersion ?? '1.0.0',
-        buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
-      });
-      spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
-    } catch (err) {
-      spinner.fail(`Failed to initialize buildNumber with ${chalk.bold(currentBuildVersion)}.`);
-      throw err;
-    }
-    return currentBuildVersion;
-  } else {
-    const nextBuildVersion = getNextBuildNumber(currentBuildVersion);
-    const spinner = ora(
-      `Incrementing buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-        nextBuildVersion
-      )}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync({
-        appId: projectId,
-        platform: AppPlatform.Ios,
-        applicationIdentifier: applicationTarget.bundleIdentifier,
-        storeVersion: localShortVersion ?? '1.0.0',
-        buildVersion: nextBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
-      });
-      spinner.succeed(
-        `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-    } catch (err) {
-      spinner.fail(
-        `Failed to increment buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-      throw err;
-    }
-    return nextBuildVersion;
-  }
-}
@@ -1,4 +1,4 @@
-import { Job, Metadata } from '@expo/eas-build-job';
+import { Job } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
@@ -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 = '0.0.99';
+const PLUGIN_PACKAGE_VERSION = '0.0.85';

 export interface LocalBuildOptions {
  enable: boolean;
@@ -18,12 +18,8 @@ export interface LocalBuildOptions {
  verbose?: boolean;
 }

-export async function runLocalBuildAsync(
-  job: Job,
-  metadata: Metadata,
-  options: LocalBuildOptions
-): Promise<void> {
-  const { command, args } = await getCommandAndArgsAsync(job, metadata);
+export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void> {
+  const { command, args } = await getCommandAndArgsAsync(job);
  let spinner;
  if (!options.verbose) {
    spinner = ora().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
@@ -57,18 +53,15 @@ export async function runLocalBuildAsync(
  }
 }

-async function getCommandAndArgsAsync(
-  job: Job,
-  metadata: Metadata
-): Promise<{ command: string; args: string[] }> {
-  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
+async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
+  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
    return {
      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobAndMetadataBase64],
+      args: [jobBase64],
    };
  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
    if (await isAtLeastNpm7Async()) {
      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
      // prompting the user to install a package that is used for the first time
@@ -24,13 +24,12 @@ import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios
 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<Metadata> {
-  const vcsClient = getVcsClient();
  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
  const distribution =
    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
      ? 'simulator'
      : ctx.buildProfile.distribution) ?? 'store';
-  const metadata: Metadata = {
+  const metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
@@ -44,20 +43,14 @@ export async function collectMetadataAsync<T extends Platform>(
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcsClient.getCommitHashAsync(),
-    gitCommitMessage: truncateGitCommitMessage(
-      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
-    ),
-    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
+    gitCommitHash: await getVcsClient().getCommitHashAsync(),
+    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
-    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
        ctx as BuildContext<Platform.IOS>
      ),
    }),
-    runWithNoWaitFlag: ctx.noWait,
-    runFromCI: ctx.runFromCI,
  };
  return sanitizeMetadata(metadata);
 }
@@ -67,32 +60,14 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
    const iosContext = ctx as BuildContext<Platform.IOS>;
-    const resolvedVersion = await maybeResolveIosVersionsAsync(
+    return await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext.ios.targets
+      iosContext.ios.applicationTargetBuildSettings
    );
-    if (iosContext.ios.buildNumberOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: iosContext.ios.buildNumberOverride,
-      };
-    }
-    return resolvedVersion;
  } else if (ctx.platform === Platform.ANDROID) {
    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
-    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      androidCtx.buildProfile
-    );
-    if (androidCtx.android.versionCodeOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: androidCtx.android.versionCodeOverride,
-      };
-    }
-    return resolvedVersion;
+    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
  } else {
    throw new Error(`Unsupported platform ${ctx.platform}`);
  }
@@ -174,13 +149,3 @@ function resolveIosEnterpriseProvisioning(
 ): IosEnterpriseProvisioning | undefined {
  return ctx.buildProfile.enterpriseProvisioning;
 }
-
-export function truncateGitCommitMessage(
-  msg: string | undefined,
-  maxLength: number = 4096
-): string | undefined {
-  if (msg === undefined) {
-    return undefined;
-  }
-  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
-}
@@ -1,12 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  AppVersionSource,
-  BuildProfile,
-  EasJson,
-  EasJsonAccessor,
-  EasJsonUtils,
-  SubmitProfile,
-} from '@expo/eas-json';
+import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

@@ -15,10 +8,8 @@ import {
  BuildFragment,
  BuildResourceClass,
  BuildStatus,
-  BuildWithSubmissionsFragment,
  SubmissionFragment,
 } from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -29,14 +20,8 @@ import {
 } from '../platform';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
-import {
-  validateAppConfigForRemoteVersionSource,
-  validateBuildProfileVersionSettings,
-} from '../project/remoteVersionSource';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
-  exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
  submitAsync,
  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../submit/submit';
@@ -70,7 +55,6 @@ export interface BuildFlags {
  submitProfile?: string;
  localBuildOptions: LocalBuildOptions;
  userInputResourceClass?: UserInputResourceClass;
-  message?: string;
 }

 const platformToGraphQLResourceClassMapping: Record<
@@ -95,14 +79,12 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    projectDir,
    nonInteractive: flags.nonInteractive,
  });
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const easJsonCliConfig: EasJson['cli'] =
-    (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
+  const easJsonReader = new EasJsonReader(projectDir);

  const platforms = toPlatforms(flags.requestedPlatform);
  const buildProfiles = await getProfilesAsync({
    type: 'build',
-    easJsonAccessor,
+    easJsonReader,
    platforms,
    profileName: flags.profile ?? undefined,
  });
@@ -113,12 +95,8 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    buildProfiles,
  });

-  for (const buildProfile of buildProfiles) {
-    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-  }
-
  const startedBuilds: {
-    build: BuildWithSubmissionsFragment | BuildFragment;
+    build: BuildFragment;
    buildProfile: ProfileData<'build'>;
  }[] = [];
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
@@ -133,7 +111,6 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
        platformToGraphQLResourceClassMapping[buildProfile.platform][
          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
        ],
-      easJsonCliConfig,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -152,7 +129,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
  const submissions: SubmissionFragment[] = [];
  if (flags.autoSubmit) {
    const submitProfiles = await getProfilesAsync({
-      easJsonAccessor,
+      easJsonReader,
      platforms,
      profileName: flags.submitProfile,
      type: 'submit',
@@ -172,7 +149,6 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
        submitProfile,
        nonInteractive: flags.nonInteractive,
      });
-      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
      submissions.push(submission);
    }

@@ -193,30 +169,16 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    buildIds: startedBuilds.map(({ build }) => build.id),
    accountName,
  });
-  if (!flags.json) {
-    printBuildResults(builds);
-  }
+  printBuildResults(builds, flags.json);

  const haveAllBuildsFailedOrCanceled = builds.every(
    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
  );
  if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
-    if (flags.json) {
-      printJsonOnlyOutput(builds);
-    }
    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
  } else {
-    const completedSubmissions = await waitForSubmissionsToCompleteAsync(submissions);
-    if (flags.json) {
-      printJsonOnlyOutput(
-        await Promise.all(
-          builds
-            .filter((i): i is BuildWithSubmissionsFragment => !!i)
-            .map(build => BuildQuery.withSubmissionsByIdAsync(build.id))
-        )
-      );
-    }
-    exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
+    // the following function also exits with non zero code if any of the submissions failed
+    await waitForSubmissionsToCompleteAsync(submissions);
  }
 }

@@ -226,14 +188,12 @@ async function prepareAndStartBuildAsync({
  moreBuilds,
  buildProfile,
  resourceClass,
-  easJsonCliConfig,
 }: {
  projectDir: string;
  flags: BuildFlags;
  moreBuilds: boolean;
  buildProfile: ProfileData<'build'>;
  resourceClass: BuildResourceClass;
-  easJsonCliConfig: EasJson['cli'];
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -241,12 +201,9 @@ async function prepareAndStartBuildAsync({
    clearCache: flags.clearCache,
    buildProfile: buildProfile.profile,
    nonInteractive: flags.nonInteractive,
-    noWait: !flags.wait,
    platform: buildProfile.platform,
    projectDir,
    localBuildOptions: flags.localBuildOptions,
-    easJsonCliConfig,
-    message: flags.message,
  });

  if (moreBuilds) {
@@ -258,10 +215,7 @@ async function prepareAndStartBuildAsync({
      )}`
    );
  }
-  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
-  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
-    validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
-  }
+
  if (buildCtx.workflow === Workflow.MANAGED) {
    if (!sdkVersionChecked) {
      await checkExpoSdkIsSupportedAsync(buildCtx);
@@ -14,6 +14,7 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

 export function printLogsUrls(builds: BuildFragment[]): void {
@@ -31,14 +32,18 @@ export function printLogsUrls(builds: BuildFragment[]): void {
  }
 }

-export function printBuildResults(builds: (BuildFragment | null)[]): void {
-  Log.newLine();
-  if (builds.length === 1) {
-    const [build] = builds;
-    assert(build, 'Build should be defined');
-    printBuildResult(build);
+export function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void {
+  if (json) {
+    printJsonOnlyOutput(builds);
  } else {
-    (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
+    Log.newLine();
+    if (builds.length === 1) {
+      const [build] = builds;
+      assert(build, 'Build should be defined');
+      printBuildResult(build);
+    } else {
+      (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
+    }
  }
 }

@@ -94,14 +99,14 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
    return;
  }
  if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
-    Log.warn('This command is using API that soon will be deprecated. Upgrade EAS CLI.');
+    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
    Log.warn("Changes won't affect your project config.");
    Log.warn(deprecationInfo.message);
  } else if (deprecationInfo.type === EasBuildDeprecationInfoType.UserFacing) {
    Log.warn('This command is using API that soon will be deprecated.');
    Log.warn(deprecationInfo.message);
  } else {
-    Log.warn('An unexpected warning was encountered. Report it as a bug:');
+    Log.warn('An unexpected warning was encountered. Please report it as a bug:');
    Log.warn(deprecationInfo);
  }
 }
@@ -28,7 +28,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  });

  if (!answer) {
-    throw new Error('Commit all changes. Aborting...');
+    throw new Error('Please commit all changes. Aborting...');
  }
 }

@@ -39,12 +39,12 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
  Log.addNewLineIfNone();
  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
  Log.log(
-    `This operation needs to be run on a clean working tree. ${chalk.bold(
-      'Commit all your changes before proceeding'
+    `This operation needs to be run on a clean working tree, please ${chalk.bold(
+      'commit all your changes before proceeding'
    )}.`
  );
  if (nonInteractive) {
-    throw new Error('Commit all changes. Aborting...');
+    throw new Error('Please commit all changes. Aborting...');
  }
  const answer = await confirmAsync({
    message: `Commit changes to git?`,
@@ -52,7 +52,7 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
  if (answer) {
    await commitPromptAsync({ commitAllFiles: true });
  } else {
-    throw new Error('Commit all changes. Aborting...');
+    throw new Error('Please commit all changes. Aborting...');
  }
 }

@@ -1,11 +1,5 @@
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import * as PackageManagerUtils from '@expo/package-manager';
-import { Command, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-// eslint-disable-next-line no-restricted-imports
-import { Options, Ora } from 'ora';
-import path from 'path';
+import { EasJsonReader } from '@expo/eas-json';
+import { Command } from '@oclif/core';
 import semver from 'semver';

 import {
@@ -14,48 +8,14 @@ import {
  initAsync as initAnalyticsAsync,
  logEvent,
 } from '../analytics/rudderstackClient';
-import Log, { learnMore } from '../log';
-import { interactiveOra, nonInteractiveOra } from '../ora';
 import { findProjectRootAsync } from '../project/projectUtils';
-import { InteractivePrompts, NonInteractivePrompts, Prompts } from '../prompts';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
 import { setVcsClient } from '../vcs';
 import GitClient from '../vcs/clients/git';

-type CommandOptions =
-  | {
-      nonInteractive: true;
-      json: true;
-    }
-  | {
-      nonInteractive: boolean;
-      json: false;
-    };
-
-export type CommandContext = Readonly<
-  CommandOptions & {
-    logger: Log;
-    prompts: Prompts;
-    ora: (options?: Options | string) => Ora;
-  }
->;
-
 export default abstract class EasCommand extends Command {
-  static override globalFlags = {
-    json: Flags.boolean({
-      description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
-      dependsOn: ['non-interactive'],
-    }),
-    'non-interactive': Flags.boolean({
-      description: 'Run the command in non-interactive mode.',
-    }),
-  };
-
-  // disable built in oclif json stuff
-  enableJsonFlag = false;
-
  /**
   * When user data is unavailable locally, determines if the command will
   * force the user to log in
@@ -63,35 +23,18 @@ export default abstract class EasCommand extends Command {
  protected requiresAuthentication = true;
  protected mustBeRunInsideProject = true;

-  protected abstract runAsync({
-    nonInteractive,
-    json,
-    logger,
-    prompts: {
-      promptAsync,
-      confirmAsync,
-      selectAsync,
-      toggleConfirmAsync,
-      pressAnyKeyToContinueAsync,
-    },
-    ora,
-  }: CommandContext): Promise<{ jsonOutput: object }>;
+  protected abstract runAsync(): Promise<any>;

  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
-    const { flags } = await this.parse();
-    const json = flags.json ?? false;
-    const nonInteractive = (flags as any)['non-interactive'] ?? false;
-
    await initAnalyticsAsync();
-
    if (this.mustBeRunInsideProject) {
-      const projectDir = await findProjectRootAsync();
-      await this.applyCliConfigAsync(projectDir);
-      await this.ensureEasCliIsNotInDependenciesAsync(projectDir);
+      await this.applyCliConfigAsync();
    }

    if (this.requiresAuthentication) {
+      const { flags } = await this.parse();
+      const nonInteractive = (flags as any)['non-interactive'] ?? false;
      await ensureLoggedInAsync({ nonInteractive });
    } else {
      await getUserAsync();
@@ -101,29 +44,19 @@ export default abstract class EasCommand extends Command {
      // commands/submit === submit, commands/build/list === build:list
      action: `eas ${this.id}`,
    });
-
-    const jsonOutput = await this.runAsync({
-      nonInteractive,
-      json: json ?? false,
-      logger: new Log(json),
-      prompts: nonInteractive ? new InteractivePrompts() : new NonInteractivePrompts(),
-      ora: nonInteractive ? nonInteractiveOra : interactiveOra,
-    });
-
-    if (json) {
-      this.printJsonOnlyOutput(jsonOutput);
-    }
+    return this.runAsync();
  }

  // eslint-disable-next-line async-protect/async-suffix
-  override async finally(err: Error): Promise<any> {
+  async finally(err: Error): Promise<any> {
    await flushAnalyticsAsync();
    return super.finally(err);
  }

-  private async applyCliConfigAsync(projectDir: string): Promise<void> {
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
+  private async applyCliConfigAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const easJsonReader = new EasJsonReader(projectDir);
+    const config = await easJsonReader.getCliConfigAsync();
    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
      throw new Error(
        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
@@ -133,72 +66,4 @@ export default abstract class EasCommand extends Command {
      setVcsClient(new GitClient());
    }
  }
-
-  private async ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
-    let printCliVersionWarning = false;
-
-    const consoleWarn = (msg?: string): void => {
-      if (msg) {
-        // eslint-disable-next-line no-console
-        console.warn(chalk.yellow(msg));
-      } else {
-        // eslint-disable-next-line no-console
-        console.warn();
-      }
-    };
-
-    if (await this.isEasCliInDependenciesAsync(projectDir)) {
-      printCliVersionWarning = true;
-      consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
-    }
-
-    const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
-    if (maybeRepoRoot !== projectDir && (await this.isEasCliInDependenciesAsync(maybeRepoRoot))) {
-      printCliVersionWarning = true;
-      consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
-    }
-
-    if (printCliVersionWarning) {
-      consoleWarn(
-        `It's recommended to use the ${chalk.bold(
-          '"cli.version"'
-        )} field in eas.json to enforce the ${chalk.bold('eas-cli')} version for your project.`
-      );
-      consoleWarn(
-        learnMore('https://github.com/expo/eas-cli#enforcing-eas-cli-version-for-your-project')
-      );
-      consoleWarn();
-    }
-  }
-
-  private async isEasCliInDependenciesAsync(dir: string): Promise<boolean> {
-    const packageJsonPath = path.join(dir, 'package.json');
-    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
-    return (
-      packageJson?.dependencies?.['eas-cli'] !== undefined ||
-      packageJson?.devDependencies?.['eas-cli'] !== undefined
-    );
-  }
-
-  private printJsonOnlyOutput(value: object): void {
-    try {
-      new Log(false).log(JSON.stringify(this.sanitizeValue(value), null, 2));
-    } catch {}
-  }
-
-  private sanitizeValue(value: any): unknown {
-    if (Array.isArray(value)) {
-      return value.map(val => this.sanitizeValue(val));
-    } else if (value && typeof value === 'object') {
-      const result: Record<string, any> = {};
-      Object.keys(value).forEach(key => {
-        if (key !== '__typename' && value[key] !== null) {
-          result[key] = this.sanitizeValue(value[key]);
-        }
-      });
-      return result;
-    } else {
-      return value;
-    }
-  }
 }
@@ -43,7 +43,7 @@ beforeEach(() => {

 const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
  class TestEasCommand extends EasCommand {
-    override requiresAuthentication = authValue;
+    requiresAuthentication = authValue;

    async runAsync(): Promise<void> {}
  }
@@ -1,55 +0,0 @@
-import { Flags } from '@oclif/core';
-
-export const getPaginatedQueryOptions = (flags: {
-  json: boolean;
-  'non-interactive': boolean;
-  offset: number | undefined;
-  limit: number | undefined;
-}): PaginatedQueryOptions => {
-  return {
-    json: flags.json,
-    offset: flags.offset ?? 0,
-    nonInteractive: flags['non-interactive'],
-    ...('limit' in flags && { limit: flags.limit }),
-  };
-};
-
-const parseFlagInputStringAsInteger = (
-  input: string,
-  flagName: string,
-  lowerLimit: number,
-  upperLimit: number
-): number => {
-  const inputAsNumber = Number(input);
-  if (isNaN(inputAsNumber)) {
-    throw new Error(`Unable to parse ${input} as a number`);
-  }
-  if (inputAsNumber < lowerLimit || inputAsNumber > upperLimit) {
-    throw new Error(`--${flagName} must be between ${lowerLimit} and ${upperLimit}`);
-  }
-  return inputAsNumber;
-};
-
-export const EasPaginatedQueryFlags = {
-  offset: Flags.integer({
-    description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
-    // eslint-disable-next-line async-protect/async-suffix
-    parse: async input =>
-      parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
-  }),
-  limit: Flags.integer({
-    description:
-      'The number of query items to list at once. The default value is 50 (the maximum is 100). Using a lower value may help increase command speed.',
-    // eslint-disable-next-line async-protect/async-suffix
-    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, 100),
-  }),
-};
-
-// options required to control a paginated query
-// from user input
-export type PaginatedQueryOptions = {
-  nonInteractive: boolean;
-  json: boolean;
-  limit?: number;
-  offset: number;
-};
@@ -3,11 +3,11 @@ import Log from '../../log';
 import { showLoginPromptAsync } from '../../user/actions';

 export default class AccountLogin extends EasCommand {
-  static override description = 'log in with your Expo account';
-  static override aliases = ['login'];
+  static description = 'log in with your Expo account';
+  static aliases = ['login'];

-  protected override mustBeRunInsideProject = false;
-  protected override requiresAuthentication = false;
+  protected mustBeRunInsideProject = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    await showLoginPromptAsync();
@@ -3,11 +3,11 @@ import Log from '../../log';
 import { logoutAsync } from '../../user/User';

 export default class AccountLogout extends EasCommand {
-  static override description = 'log out';
-  static override aliases = ['logout'];
+  static description = 'log out';
+  static aliases = ['logout'];

-  protected override mustBeRunInsideProject = false;
-  protected override requiresAuthentication = false;
+  protected mustBeRunInsideProject = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    await logoutAsync();
@@ -5,11 +5,11 @@ import Log from '../../log';
 import { getActorDisplayName, getUserAsync } from '../../user/User';

 export default class AccountView extends EasCommand {
-  static override description = 'show the username you are logged in as';
-  static override aliases = ['whoami'];
+  static description = 'show the username you are logged in as';
+  static aliases = ['whoami'];

-  protected override mustBeRunInsideProject = false;
-  protected override requiresAuthentication = false;
+  protected mustBeRunInsideProject = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    const user = await getUserAsync();
@@ -3,11 +3,11 @@ import Log from '../log';
 import UserSettings from '../user/UserSettings';

 export default class AnalyticsView extends EasCommand {
-  static override description = 'display or change analytics settings';
+  static description = 'display or change analytics settings';

-  static override args = [{ name: 'STATUS', options: ['on', 'off'] }];
+  static args = [{ name: 'STATUS', options: ['on', 'off'] }];

-  protected override requiresAuthentication = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
@@ -52,9 +52,9 @@ export async function createUpdateBranchOnAppAsync({
 }

 export default class BranchCreate extends EasCommand {
-  static override description = 'create a branch';
+  static description = 'create a branch';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -62,7 +62,7 @@ export default class BranchCreate extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: 'return a json with the new branch ID and name.',
      default: false,
@@ -91,7 +91,7 @@ export default class BranchCreate extends EasCommand {
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a branch name:',
+        message: 'Please name the branch:',
        initial:
          (await getVcsClient().getBranchNameAsync()) ||
          `branch-${Math.random().toString(36).substr(2, 4)}`,
@@ -1,7 +1,8 @@
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

-import EasCommand, { CommandContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateBranchMutation,
@@ -10,12 +11,15 @@ import {
  GetBranchInfoQuery,
  GetBranchInfoQueryVariables,
 } from '../../graphql/generated';
+import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function getBranchInfoAsync({
  appId,
@@ -73,24 +77,30 @@ async function deleteBranchOnAppAsync({
 }

 export default class BranchDelete extends EasCommand {
-  static override description = 'delete a branch';
+  static description = 'delete a branch';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
      description: 'Name of the branch to delete',
    },
  ];
+  static flags = {
+    json: Flags.boolean({
+      description: `return JSON with the edited branch's ID and name.`,
+      default: false,
+    }),
+  };

-  protected async runAsync({
-    nonInteractive,
-    logger,
-    prompts: { promptAsync, toggleConfirmAsync },
-  }: CommandContext): Promise<{ jsonOutput: object }> {
+  async runAsync(): Promise<void> {
    let {
      args: { name },
+      flags: { json: jsonFlag },
    } = await this.parse(BranchDelete);
+    if (jsonFlag) {
+      enableJsonOutput();
+    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
@@ -99,13 +109,13 @@ export default class BranchDelete extends EasCommand {

    if (!name) {
      const validationMessage = 'branch name may not be empty.';
-      if (nonInteractive) {
+      if (jsonFlag) {
        throw new Error(validationMessage);
      }
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide the name of the branch to delete:',
+        message: 'Please enter the name of the branch to delete:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -116,16 +126,16 @@ export default class BranchDelete extends EasCommand {
      throw new Error(`Could not find branch ${name} on ${fullName}`);
    }

-    if (!nonInteractive) {
-      logger.addNewLineIfNone();
-      logger.warn(
-        `You are about to permanently delete branch: "${name}" and all of the updates published on it.` +
+    if (!jsonFlag) {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `You are about to permamently delete branch: "${name}" and all of the updates published on it.` +
          `\nThis action is irreversible.`
      );
-      logger.newLine();
+      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
      if (!confirmed) {
-        logger.error(`Cancelled deletion of branch: "${name}".`);
+        Log.error(`Cancelled deletion of branch: "${name}".`);
        process.exit(1);
      }
    }
@@ -134,10 +144,12 @@ export default class BranchDelete extends EasCommand {
      branchId,
    });

-    logger.withTick(
-      `Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
-    );
-
-    return { jsonOutput: deletionResult };
+    if (jsonFlag) {
+      printJsonOnlyOutput(deletionResult);
+    } else {
+      Log.withTick(
+        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+      );
+    }
  }
 }
@@ -1,28 +1,136 @@
-import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+import { print } from 'graphql';
+import gql from 'graphql-tag';
+
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+} from '../../graphql/generated';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
+import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { enableJsonOutput } from '../../utils/json';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';
+
+export const BRANCHES_LIMIT = 50;
+
+export async function listBranchesAsync({
+  appId,
+  limit = BRANCHES_LIMIT,
+  offset = 0,
+}: BranchesByAppQueryVariables): Promise<UpdateBranchFragment[]> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
+        gql`
+          query BranchesByAppQuery($appId: String!, $limit: Int!, $offset: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateBranches(offset: $offset, limit: $limit) {
+                  id
+                  ...UpdateBranchFragment
+                }
+              }
+            }
+          }
+          ${print(UpdateBranchFragmentNode)}
+        `,
+        {
+          appId,
+          limit,
+          offset,
+        },
+        { additionalTypenames: ['UpdateBranch'] }
+      )
+      .toPromise()
+  );
+
+  return data?.app?.byId.updateBranches ?? [];
+}

 export default class BranchList extends EasCommand {
-  static override description = 'list all branches';
+  static description = 'list all branches';

-  static override flags = {
-    ...EasPaginatedQueryFlags,
+  static flags = {
+    json: Flags.boolean({
+      description: 'return output as JSON',
+      default: false,
+    }),
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
-    const options = getPaginatedQueryOptions(flags);
-
-    if (options.json) {
+    if (flags.json) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);
-    await listAndRenderPaginatedBranchesAsync(projectId, options);
+    await queryForPaginatedBranchesAsync(projectId, flags);
  }
 }
+
+async function queryForPaginatedBranchesAsync(
+  projectId: string,
+  flags: { json: boolean } & { json: boolean | undefined }
+): Promise<void> {
+  const queryAdditionalBranchesAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<UpdateBranchFragment>> => {
+    const branches = await listBranchesAsync({ appId: projectId, limit: pageSize, offset });
+    return {
+      queryResponse: branches,
+      queryResponseRawLength: branches.length,
+    };
+  };
+
+  const renderPageOfBranches = (currentPage: UpdateBranchFragment[]): void => {
+    if (flags.json) {
+      printJsonOnlyOutput(currentPage);
+    } else {
+      const table = new CliTable({
+        head: ['Branch', ...UPDATE_COLUMNS],
+        wordWrap: true,
+      });
+
+      table.push(
+        ...currentPage.map(branch => [
+          branch.name,
+          formatUpdate(branch.updates[0]),
+          branch.updates[0]?.runtimeVersion ?? 'N/A',
+          branch.updates[0]?.group ?? 'N/A',
+          getPlatformsForGroup({
+            updates: branch.updates,
+            group: branch.updates[0]?.group,
+          }),
+        ])
+      );
+
+      Log.addNewLineIfNone();
+      Log.log(chalk.bold('Branches:'));
+      Log.addNewLineIfNone();
+      Log.log(table.toString());
+    }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryAdditionalBranchesAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'Fetch next page of branches?',
+      renderListItems: renderPageOfBranches,
+    },
+  });
+}
@@ -1,8 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';

 export default class BranchPublish extends EasCommand {
-  static override description = 'deprecated, use "eas update"';
-  static override hidden = true;
+  static description = 'deprecated, use "eas update"';
+  static hidden = true;

  async runAsync(): Promise<void> {
    throw new Error(BranchPublish.description);
@@ -52,9 +52,9 @@ async function renameUpdateBranchOnAppAsync({
 }

 export default class BranchRename extends EasCommand {
-  static override description = 'rename a branch';
+  static description = 'rename a branch';

-  static override flags = {
+  static flags = {
    from: Flags.string({
      description: 'current name of the branch.',
      required: false,
@@ -90,7 +90,7 @@ export default class BranchRename extends EasCommand {
      ({ currentName } = await promptAsync({
        type: 'text',
        name: 'currentName',
-        message: "Provide the name of the branch you'd like to rename:",
+        message: 'Please enter the current name of the branch to rename:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -103,7 +103,7 @@ export default class BranchRename extends EasCommand {
      ({ newName } = await promptAsync({
        type: 'text',
        name: 'newName',
-        message: `Rename ${currentName}`,
+        message: `Please rename ${currentName}`,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -1,15 +1,24 @@
-import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+import Table from 'cli-table3';
+
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { ViewBranchUpdatesQuery } from '../../graphql/generated';
+import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
+import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
-import { enableJsonOutput } from '../../utils/json';
+import { promptAsync } from '../../prompts';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import groupBy from '../../utils/expodash/groupBy';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';

 export default class BranchView extends EasCommand {
-  static override description = 'view a branch';
+  static description = 'view a branch';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -17,18 +26,19 @@ export default class BranchView extends EasCommand {
    },
  ];

-  static override flags = {
-    ...EasPaginatedQueryFlags,
+  static flags = {
+    json: Flags.boolean({
+      description: `return a json with the branch's ID name and recent update groups.`,
+      default: false,
+    }),
  };

  async runAsync(): Promise<void> {
    let {
-      args: { name: branchName },
-      flags,
+      args: { name },
+      flags: { json: jsonFlag },
    } = await this.parse(BranchView);
-    const options = getPaginatedQueryOptions(flags);
-
-    if (options.json) {
+    if (jsonFlag) {
      enableJsonOutput();
    }

@@ -36,20 +46,110 @@ export default class BranchView extends EasCommand {
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);

-    // provide help to a user if they ran the command with missing args
-    if (!branchName) {
-      if (options.nonInteractive) {
-        throw new Error('Branch name may not be empty.');
+    if (!name) {
+      const validationMessage = 'Branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
      }
-
-      ({ name: branchName } = await selectBranchFromPaginatedQueryAsync(
-        projectId,
-        'Which branch would you like to view?',
-        // discard limit and offset because this query is not those flag's intended target
-        { json: options.json, nonInteractive: options.nonInteractive, offset: 0 }
-      ));
+      ({ name } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the branch to view:',
+        validate: value => (value ? true : validationMessage),
+      }));
    }

-    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
+    await queryForPaginatedBranchesAsync(projectId, name, { json: jsonFlag });
  }
 }
+
+type BranchUpdateObject = Exclude<
+  ViewBranchUpdatesQuery['app']['byId']['updateBranchByName'],
+  null | undefined
+>['updates'][0];
+
+async function queryForPaginatedBranchesAsync(
+  projectId: string,
+  name: string,
+  flags: { json: boolean } & { json: boolean | undefined }
+): Promise<void> {
+  const queryAdditionalBranchesAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<BranchUpdateObject>> => {
+    const { app } = await UpdateQuery.viewBranchAsync({
+      appId: projectId,
+      name,
+      limit: pageSize,
+      offset,
+    });
+    const UpdateBranch = app?.byId.updateBranchByName;
+    if (!UpdateBranch) {
+      throw new Error(`Could not find branch "${name}"`);
+    }
+
+    const updateGroups = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
+      updateGroup => ({
+        ...updateGroup[0],
+        platform: getPlatformsForGroup({
+          updates: updateGroup,
+          group: updateGroup[0].group,
+        }),
+      })
+    );
+
+    return {
+      queryResponse: updateGroups,
+      queryResponseRawLength: UpdateBranch.updates.length,
+    };
+  };
+
+  const renderPageOfBranches = (currentPage: BranchUpdateObject[]): void => {
+    if (flags.json) {
+      printJsonOnlyOutput(currentPage);
+    } else {
+      if (flags.json) {
+        printJsonOnlyOutput({ currentPage });
+      } else {
+        const groupTable = new Table({
+          head: UPDATE_COLUMNS,
+          wordWrap: true,
+        });
+
+        for (const update of currentPage) {
+          groupTable.push([
+            formatUpdate(update),
+            update.runtimeVersion,
+            update.group,
+            getPlatformsForGroup({
+              updates: currentPage,
+              group: update.group,
+            }),
+          ]);
+        }
+
+        Log.addNewLineIfNone();
+        Log.log(chalk.bold('Branch:'));
+        Log.log(
+          formatFields([
+            { label: 'Name', value: currentPage[0]['branch']['name'] },
+            { label: 'ID', value: currentPage[0]['branch']['id'] },
+          ])
+        );
+        Log.addNewLineIfNone();
+        Log.log(groupTable.toString());
+      }
+    }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryAdditionalBranchesAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'Fetch next page of branches?',
+      renderListItems: renderPageOfBranches,
+    },
+  });
+}
@@ -5,6 +5,7 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
+  BuildFragment,
  BuildStatus,
  CancelBuildMutation,
  CancelBuildMutationVariables,
@@ -19,7 +20,8 @@ import {
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../prompts';
+import { confirmAsync } from '../../prompts';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';

 async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
  const data = await withErrorHandlingAsync(
@@ -59,48 +61,6 @@ function formatUnfinishedBuild(
  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }

-async function selectBuildToCancelAsync(
-  projectId: string,
-  projectFullName: string
-): Promise<string | null> {
-  const spinner = ora().start('Fetching the uncompleted builds…');
-  let builds;
-  try {
-    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.New } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InQueue } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InProgress } }),
-    ]);
-    spinner.stop();
-    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
-  } catch (error) {
-    spinner.fail(
-      `Something went wrong and we couldn't fetch the builds for the project ${projectFullName}.`
-    );
-    throw error;
-  }
-  if (builds.length === 0) {
-    Log.warn(`There aren't any uncompleted builds for the project ${projectFullName}.`);
-    return null;
-  } else if (builds.length === 1) {
-    Log.log('Found one build');
-    Log.log(formatUnfinishedBuild(builds[0]));
-    await confirmAsync({
-      message: 'Do you want to cancel it?',
-    });
-    return builds[0].id;
-  } else {
-    const buildId = await selectAsync<string>(
-      'Which build do you want to cancel?',
-      builds.map(build => ({
-        title: formatUnfinishedBuild(build),
-        value: build.id,
-      }))
-    );
-    return buildId;
-  }
-}
-
 async function ensureBuildExistsAsync(buildId: string): Promise<void> {
  try {
    await BuildQuery.byIdAsync(buildId);
@@ -110,9 +70,9 @@ async function ensureBuildExistsAsync(buildId: string): Promise<void> {
 }

 export default class BuildCancel extends EasCommand {
-  static override description = 'cancel a build';
+  static description = 'cancel a build';

-  static override args = [{ name: 'BUILD_ID' }];
+  static args = [{ name: 'BUILD_ID' }];

  async runAsync(): Promise<void> {
    const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
@@ -126,7 +86,8 @@ export default class BuildCancel extends EasCommand {
      await ensureBuildExistsAsync(buildIdFromArg);
    }

-    const buildId = buildIdFromArg || (await selectBuildToCancelAsync(projectId, projectFullName));
+    const buildId =
+      buildIdFromArg || (await queryForBuildToCancelAsync(projectId, projectFullName));
    if (!buildId) {
      return;
    }
@@ -146,3 +107,69 @@ export default class BuildCancel extends EasCommand {
    }
  }
 }
+
+async function queryForBuildToCancelAsync(
+  projectId: string,
+  projectFullName: string
+): Promise<string | null> {
+  const queryToPerformAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<BuildFragment>> => {
+    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
+      BuildQuery.allForAppAsync(projectId, {
+        limit: pageSize,
+        offset,
+        filter: { status: BuildStatus.New },
+      }),
+      BuildQuery.allForAppAsync(projectId, {
+        limit: pageSize,
+        offset,
+        filter: { status: BuildStatus.InQueue },
+      }),
+      BuildQuery.allForAppAsync(projectId, {
+        limit: pageSize,
+        offset,
+        filter: { status: BuildStatus.InProgress },
+      }),
+    ]);
+
+    // this variable controls whether performPaginatedQueryAsync will query the next page.
+    // force another query if we have hit the query limit for any of these 3 queries.
+    const queryResponseLength =
+      newBuilds.length < pageSize &&
+      inQueueBuilds.length < pageSize &&
+      inProgressBuilds.length < pageSize
+        ? pageSize - 1
+        : pageSize;
+
+    return {
+      queryResponse: [...newBuilds, ...inQueueBuilds, ...inProgressBuilds],
+      queryResponseRawLength: queryResponseLength,
+    };
+  };
+  const getIdentifierForQueryItem = (buildFragment: BuildFragment): string => buildFragment.id;
+  const selectedBuild = (
+    await performPaginatedQueryAsync({
+      pageSize: 50,
+      offset: 0,
+      queryToPerform: queryToPerformAsync,
+      promptOptions: {
+        type: 'select',
+        title: 'Which build would you like to cancel?',
+        getIdentifierForQueryItem,
+        createDisplayTextForSelectionPromptListItem: formatUnfinishedBuild,
+      },
+    })
+  ).pop();
+
+  if (!selectedBuild) {
+    Log.warn(`There aren't any uncompleted builds for the project ${projectFullName}.`);
+    return null;
+  }
+
+  const userConfirmedCancellation = await confirmAsync({
+    message: `Are you sure you want to cancel ${formatUnfinishedBuild(selectedBuild)}?`,
+  });
+  return userConfirmedCancellation ? selectedBuild.id : null;
+}
@@ -16,9 +16,9 @@ import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } fro
 import { getVcsClient } from '../../vcs';

 export default class BuildConfigure extends EasCommand {
-  static override description = 'configure the project to support EAS Build';
+  static description = 'configure the project to support EAS Build';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      description: 'Platform to configure',
      char: 'p',
@@ -1,21 +1,13 @@
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import figures from 'figures';
 import path from 'path';

 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { UserInputResourceClass } from '../../build/types';
 import EasCommand from '../../commandUtils/EasCommand';
-import { StatuspageServiceName } from '../../graphql/generated';
-import Log, { link } from '../../log';
+import Log from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { selectAsync } from '../../prompts';
-import uniq from '../../utils/expodash/uniq';
 import { enableJsonOutput } from '../../utils/json';
-import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';

 interface RawBuildFlags {
  platform?: string;
@@ -31,13 +23,12 @@ interface RawBuildFlags {
  'auto-submit': boolean;
  'auto-submit-with-profile'?: string;
  'resource-class'?: UserInputResourceClass;
-  message?: string;
 }

 export default class Build extends EasCommand {
-  static override description = 'start a build';
+  static description = 'start a build';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: ['android', 'ios', 'all'],
@@ -55,7 +46,6 @@ export default class Build extends EasCommand {
      hidden: true,
    }),
    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',
@@ -96,40 +86,21 @@ export default class Build extends EasCommand {
      hidden: true,
      description: 'The instance type that will be used to run this build [experimental]',
    }),
-    message: Flags.string({
-      char: 'm',
-      description: 'A short message describing the build',
-    }),
  };

  async runAsync(): Promise<void> {
    const { flags: rawFlags } = await this.parse(Build);
-
    if (rawFlags.json) {
      enableJsonOutput();
    }
-    const flags = this.sanitizeFlags(rawFlags);
+    const flags = await this.sanitizeFlagsAsync(rawFlags);

    const projectDir = await findProjectRootAsync();

-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-
-    if (!flags.localBuildOptions.enable) {
-      await maybeWarnAboutEasOutagesAsync(
-        flags.autoSubmit
-          ? [StatuspageServiceName.EasBuild, StatuspageServiceName.EasSubmit]
-          : [StatuspageServiceName.EasBuild]
-      );
-    }
-
-    const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-
-    await runBuildAndSubmitAsync(projectDir, flagsWithPlatform);
+    await runBuildAndSubmitAsync(projectDir, flags);
  }

-  private sanitizeFlags(
-    flags: RawBuildFlags
-  ): Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform } {
+  private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
    const nonInteractive = flags['non-interactive'];
    if (!flags.local && flags.output) {
      Errors.error('--output is allowed only for local builds', { exit: 1 });
@@ -141,11 +112,21 @@ export default class Build extends EasCommand {
      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
    }

-    const requestedPlatform =
-      flags.platform &&
-      Object.values(RequestedPlatform).includes(flags.platform.toLowerCase() as RequestedPlatform)
-        ? (flags.platform.toLowerCase() as RequestedPlatform)
-        : undefined;
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    if (flags.local) {
+      if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
+        // TODO: implement this
+        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
+      }
+
+      if (requestedPlatform === RequestedPlatform.All) {
+        Errors.error('Builds for multiple platforms are not supported with flag --local', {
+          exit: 1,
+        });
+      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
+        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+      }
+    }

    if (flags['skip-credentials-check']) {
      Log.warnDeprecatedFlag(
@@ -162,11 +143,6 @@ export default class Build extends EasCommand {
      Log.newLine();
    }

-    const message = flags['message'];
-    if (message && message.length > 1024) {
-      Errors.error('Message cannot be longer than 1024 characters.', { exit: 1 });
-    }
-
    const profile = flags['profile'];
    return {
      requestedPlatform,
@@ -187,108 +163,6 @@ export default class Build extends EasCommand {
      autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
      submitProfile: flags['auto-submit-with-profile'] ?? profile,
      userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
-      message,
-    };
-  }
-
-  private async ensurePlatformSelectedAsync(
-    flags: Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform }
-  ): Promise<BuildFlags> {
-    const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
-
-    if (flags.localBuildOptions.enable) {
-      if (flags.autoSubmit) {
-        // TODO: implement this
-        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
-      }
-
-      if (requestedPlatform === RequestedPlatform.All) {
-        Errors.error('Builds for multiple platforms are not supported with flag --local', {
-          exit: 1,
-        });
-      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
-        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
-      }
-    }
-
-    return {
-      ...flags,
-      requestedPlatform,
    };
  }
 }
-
-async function handleDeprecatedEasJsonAsync(
-  projectDir: string,
-  nonInteractive: boolean
-): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-  const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
-    [Platform.ANDROID, profileName],
-    [Platform.IOS, profileName],
-  ]);
-
-  const deprecatedProfiles: [Platform, string][] = [];
-
-  for (const [platform, profileName] of platformAndProfileNames) {
-    const buildProfile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      profileName
-    );
-    if (buildProfile.artifactPath) {
-      deprecatedProfiles.push([platform, profileName]);
-    }
-  }
-
-  if (deprecatedProfiles.length === 0) {
-    return;
-  }
-
-  const deprecatedProfileNames = uniq(deprecatedProfiles.map(([, profileName]) => profileName));
-  Log.warn(`Some of your build profiles use deprecated field ${chalk.bold('artifactPath')}:`);
-  for (const profileName of deprecatedProfileNames) {
-    Log.warn(`- ${profileName}`);
-  }
-  Log.newLine();
-
-  if (nonInteractive) {
-    Log.warn(
-      `${figures.warning} Action required: rename ${chalk.bold('artifactPath')} to ${chalk.bold(
-        'applicationArchivePath'
-      )} in all of the build profiles listed above.`
-    );
-    Log.warn(
-      `See ${link('https://docs.expo.dev/build-reference/eas-json/')} for more information.`
-    );
-    Log.warn(
-      `This warning will become an error in a future EAS CLI release. This build will continue to use the ${chalk.bold(
-        'artifactPath'
-      )} setting.`
-    );
-    return;
-  }
-
-  const rename = await selectAsync('Do you want us to handle renaming the field for you?', [
-    { title: 'Yes', value: true },
-    { title: 'No, I will edit eas.json manually (EAS CLI exits)', value: false },
-  ]);
-
-  if (!rename) {
-    Errors.exit(1);
-  }
-
-  await easJsonAccessor.readRawJsonAsync();
-  for (const [platform, profileName] of deprecatedProfiles) {
-    easJsonAccessor.patch(easJsonRawObject => {
-      easJsonRawObject.build[profileName][platform].applicationArchivePath =
-        easJsonRawObject.build[profileName][platform].artifactPath;
-      delete easJsonRawObject.build[profileName][platform].artifactPath;
-      return easJsonRawObject;
-    });
-  }
-  await easJsonAccessor.writeAsync();
-
-  Log.withTick('Updated eas.json');
-}
@@ -25,17 +25,16 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
    post-build - builds the native project and leaves the output directory for inspection`;

 export default class BuildInspect extends EasCommand {
-  static override description =
+  static description =
    'inspect the state of the project at specific build stages, useful for troubleshooting';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: [RequestedPlatform.Android, RequestedPlatform.Ios],
      required: true,
    }),
    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',
@@ -6,12 +6,12 @@ import { formatGraphQLBuild } from '../../build/utils/formatBuild';
 import EasCommand from '../../commandUtils/EasCommand';
 import {
  AppPlatform,
+  BuildFragment,
  DistributionType,
  BuildStatus as GraphQLBuildStatus,
 } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { BuildQuery, BuildsQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
-import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
@@ -20,11 +20,12 @@ import {
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';

 export default class BuildList extends EasCommand {
-  static override description = 'list all builds for your project';
+  static description = 'list all builds for your project';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
    }),
@@ -56,7 +57,6 @@ export default class BuildList extends EasCommand {
    appIdentifier: Flags.string(),
    buildProfile: Flags.string(),
    gitCommitHash: Flags.string(),
-    limit: Flags.integer(),
  };

  async runAsync(): Promise<void> {
@@ -66,7 +66,6 @@ export default class BuildList extends EasCommand {
      platform: requestedPlatform,
      status: buildStatus,
      distribution: buildDistribution,
-      limit = 10,
    } = flags;
    if (json) {
      enableJsonOutput();
@@ -81,51 +80,24 @@ export default class BuildList extends EasCommand {
    const projectId = await getProjectIdAsync(exp);
    const projectName = await getProjectFullNameAsync(exp);

-    const spinner = ora().start('Fetching the build list for the project…');
-
-    try {
-      const builds = await BuildQuery.allForAppAsync(projectId, {
-        limit,
-        filter: {
-          platform,
-          status: graphqlBuildStatus,
-          distribution: graphqlBuildDistribution,
-          channel: flags.channel,
-          appVersion: flags.appVersion,
-          appBuildVersion: flags.appBuildVersion,
-          sdkVersion: flags.sdkVersion,
-          runtimeVersion: flags.runtimeVersion,
-          appIdentifier: flags.appIdentifier,
-          buildProfile: flags.buildProfile,
-          gitCommitHash: flags.gitCommitHash,
-        },
-      });
-
-      if (builds.length) {
-        if (platform || graphqlBuildStatus) {
-          spinner.succeed(
-            `Showing ${builds.length} matching builds for the project ${projectName}`
-          );
-        } else {
-          spinner.succeed(`Showing last ${builds.length} builds for the project ${projectName}`);
-        }
-
-        if (json) {
-          printJsonOnlyOutput(builds);
-        } else {
-          const list = builds
-            .map(build => formatGraphQLBuild(build))
-            .join(`\n\n${chalk.dim('———')}\n\n`);
-
-          Log.log(`\n${list}`);
-        }
-      } else {
-        spinner.fail(`Couldn't find any builds for the project ${projectName}`);
-      }
-    } catch (e) {
-      spinner.fail(`Something went wrong and we couldn't fetch the build list ${projectName}`);
-      throw e;
-    }
+    await queryForPaginatedBuildsAsync(
+      projectId,
+      projectName,
+      {
+        platform,
+        status: graphqlBuildStatus,
+        distribution: graphqlBuildDistribution,
+        channel: flags.channel,
+        appVersion: flags.appVersion,
+        appBuildVersion: flags.appBuildVersion,
+        sdkVersion: flags.sdkVersion,
+        runtimeVersion: flags.runtimeVersion,
+        appIdentifier: flags.appIdentifier,
+        buildProfile: flags.buildProfile,
+        gitCommitHash: flags.gitCommitHash,
+      },
+      flags
+    );
  }
 }

@@ -170,3 +142,57 @@ const toGraphQLBuildDistribution = (
    return undefined;
  }
 };
+
+async function queryForPaginatedBuildsAsync(
+  projectId: string,
+  projectName: string,
+  filter: BuildsQuery['filter'],
+  flags: { json: boolean } & { json: boolean | undefined }
+): Promise<void> {
+  const queryAdditionalBuildsAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<BuildFragment>> => {
+    const builds = await BuildQuery.allForAppAsync(projectId, {
+      limit: pageSize,
+      offset,
+      filter,
+    });
+
+    return {
+      queryResponse: builds,
+      queryResponseRawLength: builds.length,
+    };
+  };
+
+  const renderPageOfBuilds = (currentPage: BuildFragment[]): void => {
+    if (flags.json) {
+      printJsonOnlyOutput(currentPage);
+    } else {
+      if (currentPage.length) {
+        const list = currentPage
+          .map(build => formatGraphQLBuild(build))
+          .join(`\n\n${chalk.dim('———')}\n\n`);
+
+        Log.addNewLineIfNone();
+        Log.withTick(chalk.bold(`Builds for ${projectName}:`));
+        Log.log(`\n${list}`);
+        Log.addNewLineIfNone();
+      } else {
+        Log.withCross(chalk.bold(`Couldn't find any builds for the project ${projectName}`));
+        Log.addNewLineIfNone();
+      }
+    }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryAdditionalBuildsAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'Fetch next page of builds?',
+      renderListItems: renderPageOfBuilds,
+    },
+  });
+}
@@ -1,118 +0,0 @@
-import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
-import { toAppPlatform } from '../../../graphql/types/AppPlatform';
-import Log from '../../../log';
-import { selectPlatformAsync } from '../../../platform';
-import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
-import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
-import { getExpoConfig } from '../../../project/expoConfig';
-import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../../project/projectUtils';
-import {
-  ensureVersionSourceIsRemoteAsync,
-  getBuildVersionName,
-  validateAppConfigForRemoteVersionSource,
-} from '../../../project/remoteVersionSource';
-import { promptAsync } from '../../../prompts';
-
-export default class BuildVersionSetView extends EasCommand {
-  static override description = 'Update version of an app.';
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios'],
-    }),
-    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',
-    }),
-  };
-
-  public async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildVersionSetView);
-
-    const projectDir = await findProjectRootAsync();
-
-    const platform = await selectPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
-    const profile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      flags.profile ?? undefined
-    );
-
-    const exp = getExpoConfig(projectDir, { env: profile.env });
-    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
-    validateAppConfigForRemoteVersionSource(exp, platform);
-
-    const applicationIdentifier = await getApplicationIdentifierAsync(
-      projectDir,
-      exp,
-      profile,
-      platform
-    );
-    const remoteVersions = await AppVersionQuery.latestVersionAsync(
-      projectId,
-      toAppPlatform(platform),
-      applicationIdentifier
-    );
-    const currentStateMessage = remoteVersions?.buildVersion
-      ? `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
-          platform
-        )} "${applicationIdentifier}" is configured with ${getBuildVersionName(platform)} ${
-          remoteVersions.buildVersion
-        }.`
-      : `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
-          platform
-        )} "${applicationIdentifier}" does not have any ${getBuildVersionName(
-          platform
-        )} configured.`;
-
-    const versionPromptMessage = remoteVersions?.buildVersion
-      ? `What version would you like to set?`
-      : `What version would you like to initialize it with?`;
-    Log.log(currentStateMessage);
-
-    const { version } = await promptAsync({
-      type: platform === Platform.ANDROID ? 'number' : 'text',
-      name: 'version',
-      message: versionPromptMessage,
-      validate:
-        platform === Platform.ANDROID
-          ? value => isValidVersionCode(value) || `Invalid value: ${VERSION_CODE_REQUIREMENTS}.`
-          : value => isValidBuildNumber(value) || `Invalid value: ${BUILD_NUMBER_REQUIREMENTS}.`,
-    });
-    await AppVersionMutation.createAppVersionAsync({
-      appId: projectId,
-      platform: toAppPlatform(platform),
-      applicationIdentifier,
-      storeVersion: exp.version ?? '1.0.0',
-      buildVersion: String(version),
-      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
-    });
-  }
-}
-
-function getApplicationIdentifierName(platform: Platform): string {
-  if (platform === Platform.ANDROID) {
-    return 'application ID';
-  } else {
-    return 'bundle identifier';
-  }
-}
@@ -1,185 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonAccessor } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
-import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
-import EasCommand from '../../../commandUtils/EasCommand';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
-import { toAppPlatform } from '../../../graphql/types/AppPlatform';
-import Log from '../../../log';
-import {
-  appPlatformDisplayNames,
-  selectRequestedPlatformAsync,
-  toPlatforms,
-} from '../../../platform';
-import { getAppBuildGradleAsync } from '../../../project/android/gradleUtils';
-import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
-import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
-import { getExpoConfig } from '../../../project/expoConfig';
-import { resolveXcodeBuildContextAsync } from '../../../project/ios/scheme';
-import { resolveTargetsAsync } from '../../../project/ios/target';
-import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
-import { findProjectRootAsync, getProjectIdAsync } from '../../../project/projectUtils';
-import {
-  ensureVersionSourceIsRemoteAsync,
-  getBuildVersionName,
-  validateAppConfigForRemoteVersionSource,
-} from '../../../project/remoteVersionSource';
-import { resolveWorkflowAsync } from '../../../project/workflow';
-import { getProfilesAsync } from '../../../utils/profiles';
-
-interface SyncContext<T extends Platform> {
-  projectDir: string;
-  exp: ExpoConfig;
-  workflow: Workflow;
-  profile: BuildProfile<T>;
-  buildVersion: string;
-}
-
-export default class BuildVersionSyncView extends EasCommand {
-  public static override description =
-    'Update a version in native code with a value stored on 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',
-    }),
-  };
-
-  public async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildVersionSyncView);
-    const projectDir = await findProjectRootAsync();
-
-    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
-
-    const platforms = toPlatforms(requestedPlatform);
-    const buildProfiles = await getProfilesAsync({
-      type: 'build',
-      easJsonAccessor,
-      platforms,
-      profileName: flags.profile ?? undefined,
-    });
-    for (const profileInfo of buildProfiles) {
-      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
-      const projectId = await getProjectIdAsync(exp);
-      validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
-      const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
-
-      const applicationIdentifier = await getApplicationIdentifierAsync(
-        projectDir,
-        exp,
-        profileInfo.profile,
-        profileInfo.platform
-      );
-      const remoteVersions = await AppVersionQuery.latestVersionAsync(
-        projectId,
-        toAppPlatform(profileInfo.platform),
-        applicationIdentifier
-      );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform);
-      if (!remoteVersions?.buildVersion) {
-        Log.warn(
-          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
-        );
-        continue;
-      }
-      if (workflow === Workflow.MANAGED) {
-        Log.warn(
-          `The remote value for the ${platformDisplayName} ${getBuildVersionName(
-            profileInfo.platform
-          )} is ${chalk.bold(
-            remoteVersions?.buildVersion
-          )}, but it was not synced to the local project. This command has no effect on projects using managed workflow.`
-        );
-        continue;
-      }
-      if (profileInfo.platform === Platform.ANDROID) {
-        this.syncAndroidAsync({
-          projectDir,
-          exp,
-          profile: profileInfo.profile as BuildProfile<Platform.ANDROID>,
-          workflow,
-          buildVersion: remoteVersions.buildVersion,
-        });
-      } else {
-        this.syncIosAsync({
-          projectDir,
-          exp,
-          profile: profileInfo.profile as BuildProfile<Platform.IOS>,
-          workflow,
-          buildVersion: remoteVersions.buildVersion,
-        });
-      }
-      Log.withTick(
-        `Successfully updated the ${platformDisplayName} ${getBuildVersionName(
-          profileInfo.platform
-        )} in native code to ${chalk.bold(remoteVersions?.buildVersion)}.`
-      );
-    }
-  }
-
-  private async syncIosAsync({
-    workflow,
-    projectDir,
-    exp,
-    profile,
-    buildVersion,
-  }: SyncContext<Platform.IOS>): Promise<void> {
-    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
-      { exp, projectDir, nonInteractive: false },
-      profile
-    );
-    const targets = await resolveTargetsAsync({
-      projectDir,
-      exp,
-      xcodeBuildContext,
-      env: profile.env,
-    });
-
-    if (!isValidBuildNumber(buildVersion)) {
-      throw new Error(`Invalid buildNumber (${buildVersion}), ${BUILD_NUMBER_REQUIREMENTS}.`);
-    }
-
-    if (workflow === Workflow.GENERIC) {
-      await updateIosNativeVersionsAsync({
-        projectDir,
-        buildNumber: buildVersion,
-        targets,
-      });
-    }
-  }
-
-  private async syncAndroidAsync({
-    projectDir,
-    workflow,
-    buildVersion,
-  }: SyncContext<Platform.ANDROID>): Promise<void> {
-    if (!isValidVersionCode(buildVersion)) {
-      throw new Error(`Invalid versionCode (${buildVersion}), ${VERSION_CODE_REQUIREMENTS}.`);
-    }
-
-    if (workflow === Workflow.GENERIC) {
-      const buildGradle = await getAppBuildGradleAsync(projectDir);
-      const isMultiFlavor =
-        buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
-      if (isMultiFlavor) {
-        throw new Error(
-          "Versions in native code can't be automatically synced in multi-flavor Android projects. If you are using EAS Build with app version source set to remote, the correct values will be injected at the build time."
-        );
-      }
-      await updateAndroidNativeVersionsAsync({ projectDir, versionCode: Number(buildVersion) });
-    }
-  }
-}
@@ -15,11 +15,11 @@ import {
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class BuildView extends EasCommand {
-  static override description = 'view a build for your project';
+  static description = 'view a build for your project';

-  static override args = [{ name: 'BUILD_ID' }];
+  static args = [{ name: 'BUILD_ID' }];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
    }),
@@ -60,9 +60,9 @@ export async function createUpdateChannelOnAppAsync({
 }

 export default class ChannelCreate extends EasCommand {
-  static override description = 'create a channel';
+  static description = 'create a channel';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -70,7 +70,7 @@ export default class ChannelCreate extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description:
        'print output as a JSON object with the new channel ID, name and branch mapping.',
@@ -99,7 +99,7 @@ export default class ChannelCreate extends EasCommand {
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a channel name:',
+        message: 'Please name the channel:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -21,17 +21,17 @@ import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class ChannelDelete extends EasCommand {
-  static override hidden = true;
-  static override description = 'Delete a channel';
+  static hidden = true;
+  static description = 'Delete a channel';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
      description: 'Name of the channel to delete',
    },
  ];
-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: 'print output as a JSON object',
      default: false,
@@ -70,7 +70,7 @@ export default class ChannelDelete extends EasCommand {
        await promptAsync({
          type: 'text',
          name: 'name',
-          message: 'Provide the name of the channel to delete:',
+          message: 'Please enter the name of the channel to delete:',
          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
        })
      ).name;
@@ -85,7 +85,7 @@ export default class ChannelDelete extends EasCommand {
    if (!nonInteractiveFlag) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permanently delete channel: "${name}".\nThis action is irreversible.`
+        `You are about to permamently delete channel: "${name}".\nThis action is irreversible.`
      );
      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
@@ -93,9 +93,9 @@ export async function updateChannelBranchMappingAsync({
 }

 export default class ChannelEdit extends EasCommand {
-  static override description = 'point a channel at a new branch';
+  static description = 'point a channel at a new branch';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -103,7 +103,7 @@ export default class ChannelEdit extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    branch: Flags.string({
      description: 'Name of the branch to point to',
    }),
@@ -127,7 +127,9 @@ export default class ChannelEdit extends EasCommand {

    const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
    if (existingChannel.updateBranches.length > 1) {
-      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
+      throw new Error(
+        'There is a rollout in progress. Please manage it with "channel:rollout" instead.'
+      );
    }

    const branchName = flags.branch ?? (await promptForBranchAsync());
@@ -138,7 +140,7 @@ export default class ChannelEdit extends EasCommand {
    });
    if (!branch) {
      throw new Error(
-        `Could not find a branch named "${branchName}". Check what branches exist on this project with ${chalk.bold(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
          'eas branch:list'
        )}.`
      );
@@ -171,7 +173,7 @@ async function promptForChannelAsync(): Promise<string> {
  const { name } = await promptAsync({
    type: 'text',
    name: 'name',
-    message: 'Provide the name of the channel to edit:',
+    message: 'Please enter the name of the channel to edit:',
    validate: value => (value ? true : 'The channel name may not be empty.'),
  });
  return name;
@@ -1,4 +1,5 @@
 import { Flags } from '@oclif/core';
+import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
@@ -12,31 +13,41 @@ import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';
+import { BRANCHES_LIMIT } from '../branch/list';
 import { logChannelDetails } from './view';

-const CHANNEL_LIMIT = 10_000;
+const CHANNEL_LIMIT = 50;

 async function getAllUpdateChannelForAppAsync({
  appId,
-}: {
-  appId: string;
-}): Promise<GetAllChannelsForAppQuery> {
+  channelLimit = CHANNEL_LIMIT,
+  channelOffset = 0,
+  branchLimit = BRANCHES_LIMIT,
+  branchOffset = 0,
+}: GetAllChannelsForAppQueryVariables): Promise<GetAllChannelsForAppQuery> {
  return await withErrorHandlingAsync(
    graphqlClient
      .query<GetAllChannelsForAppQuery, GetAllChannelsForAppQueryVariables>(
        gql`
-          query GetAllChannelsForApp($appId: String!, $offset: Int!, $limit: Int!) {
+          query GetAllChannelsForApp(
+            $appId: String!
+            $channelOffset: Int!
+            $channelLimit: Int!
+            $branchLimit: Int!
+            $branchOffset: Int!
+          ) {
            app {
              byId(appId: $appId) {
                id
-                updateChannels(offset: $offset, limit: $limit) {
+                updateChannels(offset: $channelOffset, limit: $channelLimit) {
                  id
                  name
                  branchMapping
-                  updateBranches(offset: 0, limit: $limit) {
+                  updateBranches(offset: $branchOffset, limit: $branchLimit) {
                    id
                    name
-                    updates(offset: 0, limit: 10) {
+                    updates(offset: 0, limit: 1) {
                      id
                      group
                      message
@@ -59,7 +70,7 @@ async function getAllUpdateChannelForAppAsync({
            }
          }
        `,
-        { appId, offset: 0, limit: CHANNEL_LIMIT },
+        { appId, channelOffset, channelLimit, branchLimit, branchOffset },
        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
      )
      .toPromise()
@@ -67,9 +78,9 @@ async function getAllUpdateChannelForAppAsync({
 }

 export default class ChannelList extends EasCommand {
-  static override description = 'list all channels';
+  static description = 'list all channels';

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
      default: false,
@@ -88,18 +99,77 @@ export default class ChannelList extends EasCommand {
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);

-    const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
-      appId: projectId,
-    });
-    const channels = getAllUpdateChannelForAppResult.app?.byId.updateChannels;
-    if (!channels) {
-      throw new Error(`Could not find channels on project with id ${projectId}`);
-    }
+    await queryForChannelsAsync(projectId, jsonFlag);
+  }
+}

+type UpdateChannelObject = GetAllChannelsForAppQuery['app']['byId']['updateChannels'][0];
+
+async function queryForChannelsAsync(projectId: string, jsonFlag: boolean): Promise<void> {
+  const queryToPerformAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<UpdateChannelObject>> => {
+    let queriedAllBranches = false;
+    let branchOffset = 0;
+    const branchLimit = 10;
+    const paginatedQuery: PaginatedQueryResponse<UpdateChannelObject> = {
+      queryResponse: [],
+      queryResponseRawLength: 0,
+    };
+    const branchesForChannels: Record<string, UpdateChannelObject['updateBranches']> = {};
+
+    // we need to paginate our paginated query. Each channel (N) can have M branches
+    // and we need to fetch all branches to populate our 'branch mapping' portion
+    // of the UI properly.
+    do {
+      const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
+        appId: projectId,
+        channelLimit: pageSize,
+        channelOffset: offset,
+        branchLimit,
+        branchOffset,
+      });
+      const channels = getAllUpdateChannelForAppResult.app?.byId.updateChannels;
+      if (!channels) {
+        throw new Error(`Could not find channels on project with id ${projectId}`);
+      }
+      queriedAllBranches = true;
+      // save each array of branches using a record so we can lookup in O(1) later on
+      channels.forEach(channel => {
+        if (channel.updateBranches.length === branchLimit) {
+          queriedAllBranches = false;
+        }
+
+        branchesForChannels[channel.id] = [
+          ...(branchesForChannels[channel.id] ? branchesForChannels[channel.id] : []),
+          ...channel.updateBranches,
+        ];
+      });
+
+      if (!paginatedQuery.queryResponse.length) {
+        paginatedQuery.queryResponse = channels;
+      } else {
+        paginatedQuery.queryResponse.forEach(channel => {
+          channel.updateBranches = branchesForChannels[channel.id];
+        });
+      }
+
+      paginatedQuery.queryResponseRawLength = channels.length;
+      branchOffset += branchLimit + 1;
+    } while (!queriedAllBranches);
+
+    return paginatedQuery;
+  };
+
+  const renderListItems = (currentPage: UpdateChannelObject[]): void => {
    if (jsonFlag) {
-      printJsonOnlyOutput(channels);
+      printJsonOnlyOutput(currentPage);
    } else {
-      for (const channel of channels) {
+      Log.addNewLineIfNone();
+      Log.log(chalk.bold('Channels:'));
+      Log.addNewLineIfNone();
+      for (const channel of currentPage) {
        Log.addNewLineIfNone();
        Log.log(
          formatFields([
@@ -110,5 +180,16 @@ export default class ChannelList extends EasCommand {
        logChannelDetails(channel);
      }
    }
-  }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 25, // lower, because we need to query all branches per channel O(N*M)
+    offset: 0,
+    queryToPerform: queryToPerformAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'Fetch next page of channels?',
+      renderListItems,
+    },
+  });
 }
@@ -92,7 +92,7 @@ async function startRolloutAsync({
  });
  if (!branch) {
    throw new Error(
-      `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
+      `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
        'eas branch:list'
      )}.`
    );
@@ -238,7 +238,7 @@ async function endRolloutAsync({
    });
    if (!branch) {
      throw new Error(
-        `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
          'eas branch:list'
        )}.`
      );
@@ -304,10 +304,10 @@ async function endRolloutAsync({
 }

 export default class ChannelRollout extends EasCommand {
-  static override hidden = true;
-  static override description = 'Rollout a new branch out to a channel incrementally.';
+  static hidden = true;
+  static description = 'Rollout a new branch out to a channel incrementally.';

-  static override args = [
+  static args = [
    {
      name: 'channel',
      required: true,
@@ -315,7 +315,7 @@ export default class ChannelRollout extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    branch: Flags.string({
      description: 'branch to rollout',
      required: false,
@@ -351,10 +351,12 @@ export default class ChannelRollout extends EasCommand {
    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
      appId: projectId,
      channelName: channelName!,
+      offset: 0,
+      limit: 50,
    });
    if (!channel) {
      throw new Error(
-        `Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk.bold(
+        `Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk.bold(
          'eas channel:list'
        )}.`
      );
@@ -111,7 +111,7 @@ export function logChannelDetails(channel: {
    }

    const { branchId } = branchMapping.data[index];
-    const branch = channel.updateBranches.filter(branch => branch.id === branchId)[0];
+    const branch = channel.updateBranches.find(branch => branch.id === branchId);
    if (!branch) {
      throw new Error('Branch mapping is pointing at a missing branch.');
    }
@@ -138,9 +138,9 @@ export function logChannelDetails(channel: {
 }

 export default class ChannelView extends EasCommand {
-  static override description = 'view a channel';
+  static description = 'view a channel';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -148,7 +148,7 @@ export default class ChannelView extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
      default: false,
@@ -176,7 +176,7 @@ export default class ChannelView extends EasCommand {
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a channel name:',
+        message: 'Please name the channel:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -184,6 +184,8 @@ export default class ChannelView extends EasCommand {
    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
      appId: projectId,
      channelName,
+      offset: 0,
+      limit: 50,
    });
    if (!channel) {
      throw new Error(`Could not find a channel with name: ${channelName}`);
@@ -1,6 +1,6 @@
 import { getProjectConfigDescription } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import { EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

@@ -13,19 +13,14 @@ import { findProjectRootAsync } from '../project/projectUtils';
 import { selectAsync } from '../prompts';

 export default class Config extends EasCommand {
-  static override description = 'display project configuration (app.json + eas.json)';
+  static description = 'display project configuration (app.json + eas.json)';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-    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',
-    }),
+    profile: Flags.string(),
  };

-  protected override requiresAuthentication = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(Config);
@@ -36,13 +31,13 @@ export default class Config extends EasCommand {

    const projectDir = await findProjectRootAsync();

-    const accessor = new EasJsonAccessor(projectDir);
+    const reader = new EasJsonReader(projectDir);
    const profileName =
      maybeProfile ??
      (await selectAsync(
        'Select build profile',
        (
-          await EasJsonUtils.getBuildProfileNamesAsync(accessor)
+          await reader.getBuildProfileNamesAsync()
        ).map(profileName => ({
          title: profileName,
          value: profileName,
@@ -61,7 +56,7 @@ export default class Config extends EasCommand {
        },
      ]));

-    const profile = await EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
+    const profile = await reader.getBuildProfileAsync(platform, profileName);
    const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });

    Log.addNewLineIfNone();
@@ -1,17 +1,10 @@
-import { Flags } from '@oclif/core';
-
 import EasCommand from '../commandUtils/EasCommand';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';

 export default class Credentials extends EasCommand {
-  static override description = 'manage credentials';
-
-  static override flags = {
-    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-  };
+  static description = 'manage credentials';

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(Credentials);
-    await new SelectPlatform(flags.platform).runAsync();
+    await new SelectPlatform().runAsync();
  }
 }
@@ -5,7 +5,7 @@ import DeviceManager from '../../devices/manager';
 import { ensureLoggedInAsync } from '../../user/actions';

 export default class DeviceCreate extends EasCommand {
-  static override description = 'register new Apple Devices to use for internal distribution';
+  static description = 'register new Apple Devices to use for internal distribution';

  async runAsync(): Promise<void> {
    const user = await ensureLoggedInAsync();
@@ -2,7 +2,7 @@ import { Device, DeviceStatus } from '@expo/apple-utils';
 import { Flags } from '@oclif/core';
 import assert from 'assert';

-import EasCommand, { CommandContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { chooseDevicesToDeleteAsync } from '../../credentials/ios/actions/DeviceUtils';
 import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
 import {
@@ -14,18 +14,21 @@ import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleT
 import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
 import formatDevice from '../../devices/utils/formatDevice';
 import { AppleDevice, Maybe } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class DeviceDelete extends EasCommand {
-  static override description = 'remove a registered device from your account';
+  static description = 'remove a registered device from your account';

-  static override flags = {
+  static flags = {
    'apple-team-id': Flags.string(),
    udid: Flags.string({ multiple: true }),
  };

-  protected async runAsync(commandContext: CommandContext): Promise<{ jsonOutput: object }> {
+  async runAsync(): Promise<void> {
    let {
      flags: { 'apple-team-id': appleTeamIdentifier, udid: udids },
    } = await this.parse(DeviceDelete);
@@ -35,61 +38,46 @@ export default class DeviceDelete extends EasCommand {
    const accountName = await getProjectAccountNameAsync(exp);

    if (!appleTeamIdentifier) {
-      if (commandContext.nonInteractive) {
-        throw new Error('Must supply `apple-team-id` in non-interactive mode');
-      }
-      appleTeamIdentifier = await this.askForAppleTeamAsync(commandContext, accountName);
+      appleTeamIdentifier = await this.askForAppleTeamAsync(accountName);
    }

    assert(appleTeamIdentifier, 'No team identifier is specified');

-    const appleDevicesResult = await this.getDevicesForTeamAsync(
-      commandContext,
-      accountName,
-      appleTeamIdentifier
-    );
+    const appleDevicesResult = await this.getDevicesForTeamAsync(accountName, appleTeamIdentifier);

    if (!appleDevicesResult) {
-      return { jsonOutput: [] };
+      return;
    }

    const { appleTeamName, appleDevices } = appleDevicesResult;

-    const chosenDevices = await this.chooseDevicesToDeleteAsync(
-      commandContext,
-      appleDevices,
-      udids
-    );
+    const chosenDevices = await this.chooseDevicesToDeleteAsync(appleDevices, udids);

    if (chosenDevices.length === 0) {
-      commandContext.logger.newLine();
-      commandContext.logger.warn('No devices were chosen to be removed.');
-      return { jsonOutput: [] };
+      Log.newLine();
+      Log.warn('No devices were chosen to be removed.');
+      return;
    }

-    this.logChosenDevices(commandContext, chosenDevices, appleTeamName, appleTeamIdentifier);
+    this.logChosenDevices(chosenDevices, appleTeamName, appleTeamIdentifier);
+
+    const hasRemoved = await this.askAndRemoveFromExpoAsync(chosenDevices);

-    const hasRemoved = await this.askAndRemoveFromExpoAsync(commandContext, chosenDevices);
    if (!hasRemoved) {
-      return { jsonOutput: [] };
+      return;
    }

-    await this.askAndDisableOnAppleAsync(commandContext, chosenDevices, appleTeamIdentifier);
-
-    return { jsonOutput: chosenDevices.map(it => it.id) };
+    await this.askAndDisableOnAppleAsync(chosenDevices, appleTeamIdentifier);
  }

  async askAndDisableOnAppleAsync(
-    { nonInteractive, logger, prompts: { toggleConfirmAsync }, ora }: CommandContext,
    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[],
    appleTeamIdentifier: string
  ): Promise<void> {
-    logger.newLine();
-    const deleteOnApple = nonInteractive
-      ? true
-      : await toggleConfirmAsync({
-          message: 'Do you want to disable these devices on your Apple account as well?',
-        });
+    Log.newLine();
+    const deleteOnApple = await toggleConfirmAsync({
+      message: 'Do you want to disable these devices on your Apple account as well?',
+    });

    if (!deleteOnApple) {
      return;
@@ -98,13 +86,12 @@ export default class DeviceDelete extends EasCommand {
    const ctx = await authenticateAsync({ teamId: appleTeamIdentifier });
    const context = getRequestContext(ctx);

-    logger.addNewLineIfNone();
+    Log.addNewLineIfNone();
    const removeAppleSpinner = ora('Disabling devices on Apple').start();
    try {
-      const chosenDeviceIdentifiers = chosenDevices.map(cd => cd.identifier);
-      const allDevices = await Device.getAsync(context);
-      const realDevices = allDevices.filter(d =>
-        chosenDeviceIdentifiers.includes(d.attributes.udid)
+      let realDevices = await Device.getAllIOSProfileDevicesAsync(context);
+      realDevices = realDevices.filter(d =>
+        chosenDevices.map(cd => cd.identifier).includes(d.attributes.udid)
      );

      for (const device of realDevices) {
@@ -119,21 +106,18 @@ export default class DeviceDelete extends EasCommand {
  }

  async askAndRemoveFromExpoAsync(
-    { nonInteractive, logger, prompts: { toggleConfirmAsync }, ora }: CommandContext,
    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[]
  ): Promise<boolean> {
-    logger.warn(
+    Log.warn(
      `You are about to remove the Apple device${
        chosenDevices.length > 1 ? 's' : ''
      } listed above from your Expo account.`
    );
-    logger.newLine();
+    Log.newLine();

-    const confirmed = nonInteractive
-      ? true
-      : await toggleConfirmAsync({
-          message: 'Are you sure you wish to proceed?',
-        });
+    const confirmed = await toggleConfirmAsync({
+      message: 'Are you sure you wish to proceed?',
+    });

    if (confirmed) {
      const removalSpinner = ora(`Removing Apple devices on Expo`).start();
@@ -152,55 +136,49 @@ export default class DeviceDelete extends EasCommand {
  }

  logChosenDevices(
-    { logger }: CommandContext,
    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[],
    appleTeamName: Maybe<string> | undefined,
    appleTeamIdentifier: string
  ): void {
-    logger.addNewLineIfNone();
+    Log.addNewLineIfNone();
    chosenDevices.forEach(device => {
-      logger.log(
+      Log.log(
        formatDevice(device, {
          appleTeamName,
          appleTeamIdentifier: appleTeamIdentifier!,
        })
      );
-      logger.newLine();
+      Log.newLine();
    });
  }

  async chooseDevicesToDeleteAsync(
-    { nonInteractive, logger }: CommandContext,
    appleDevices: AppleDeviceQueryResult[],
    udids: string[]
  ): Promise<(AppleDevice | AppleDeviceQueryResult)[]> {
    let chosenDevices: (AppleDeviceQueryResult | AppleDevice)[] = [];
-    logger.newLine();
+    Log.newLine();
    if (udids) {
      udids.forEach(udid => {
        const foundDevice = appleDevices.find(device => device.identifier === udid);
        if (foundDevice) {
          chosenDevices.push(foundDevice);
        } else {
-          logger.warn(`No device found with UDID ${udid}.`);
+          Log.warn(`No device found with UDID ${udid}.`);
        }
      });
    }

    if (chosenDevices.length === 0) {
-      if (nonInteractive) {
-        throw new Error('Must supply `udid` paramter in non-interactive mode');
-      }
-      logger.addNewLineIfNone();
+      Log.addNewLineIfNone();
      chosenDevices = await chooseDevicesToDeleteAsync(appleDevices);
-      logger.newLine();
+      Log.newLine();
    }

    return chosenDevices;
  }

  async getDevicesForTeamAsync(
-    { ora }: CommandContext,
    accountName: string,
    appleTeamIdentifier: string
  ): Promise<AppleDevicesByTeamIdentifierQueryResult | undefined> {
@@ -230,10 +208,7 @@ export default class DeviceDelete extends EasCommand {
    }
  }

-  async askForAppleTeamAsync(
-    { prompts: { promptAsync }, ora }: CommandContext,
-    accountName: string
-  ): Promise<string | undefined> {
+  async askForAppleTeamAsync(accountName: string): Promise<string | undefined> {
    const teamSpinner = ora().start('Fetching the list of teams for the project…');

    try {
@@ -13,9 +13,9 @@ import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/
 import { promptAsync } from '../../prompts';

 export default class BuildList extends EasCommand {
-  static override description = 'list all registered devices for your account';
+  static description = 'list all registered devices for your account';

-  static override flags = {
+  static flags = {
    'apple-team-id': Flags.string(),
  };

@@ -7,9 +7,9 @@ import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';

 export default class DeviceView extends EasCommand {
-  static override description = 'view a device for your project';
+  static description = 'view a device for your project';

-  static override args = [{ name: 'UDID' }];
+  static args = [{ name: 'UDID' }];

  async runAsync(): Promise<void> {
    const { UDID } = (await this.parse(DeviceView)).args;
@@ -8,9 +8,9 @@ import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';

 export default class Diagnostics extends EasCommand {
-  static override description = 'display environment info';
+  static description = 'display environment info';

-  protected override requiresAuthentication = false;
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    const info = await envinfo.run(
@@ -14,11 +14,10 @@ import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUt
 import { ensureLoggedInAsync } from '../../user/actions';

 export default class MetadataPull extends EasCommand {
-  static override description = 'generate the local store configuration from the app stores';
+  static description = 'generate the local store configuration from the app stores';

-  static override flags = {
+  static flags = {
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
@@ -52,11 +51,11 @@ export default class MetadataPull extends EasCommand {
      const relativePath = path.relative(process.cwd(), filePath);

      Log.addNewLineIfNone();
-      Log.log(`🎉 Your store config is ready.
+      Log.log(`🎉 Your store configuration is ready.

 - Update the ${chalk.bold(relativePath)} file to prepare the app information.
 - Run ${chalk.bold('eas submit')} or manually upload a new app version to the app stores.
- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store config.
+- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store configuration.
 - ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
    } catch (error: any) {
      handleMetadataError(error);
@@ -12,11 +12,10 @@ import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUt
 import { ensureLoggedInAsync } from '../../user/actions';

 export default class MetadataPush extends EasCommand {
-  static override description = 'sync the local store configuration to the app stores';
+  static description = 'sync the local store configuration to the app stores';

-  static override flags = {
+  static flags = {
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
@@ -1,45 +0,0 @@
-import openBrowserAsync from 'better-opn';
-
-import { getProjectDashboardUrl } from '../build/utils/url';
-import EasCommand from '../commandUtils/EasCommand';
-import { ora } from '../ora';
-import { getExpoConfig } from '../project/expoConfig';
-import {
-  fetchProjectIdFromServerAsync,
-  findProjectRootAsync,
-  getProjectAccountName,
-} from '../project/projectUtils';
-import { ensureLoggedInAsync } from '../user/actions';
-
-export default class Open extends EasCommand {
-  static override description = 'open the project page in a web browser';
-
-  async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-
-    // this ensures the project exists
-    await fetchProjectIdFromServerAsync(exp);
-
-    const user = await ensureLoggedInAsync();
-    const accountName = getProjectAccountName(exp, user);
-    const projectName = exp.slug;
-
-    const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
-    const failedMessage = `Unable to open a web browser. Project page is available at: ${projectDashboardUrl}`;
-    const spinner = ora(`Opening ${projectDashboardUrl}`).start();
-    try {
-      const opened = await openBrowserAsync(projectDashboardUrl);
-
-      if (opened) {
-        spinner.succeed(`Opened ${projectDashboardUrl}`);
-      } else {
-        spinner.fail(failedMessage);
-      }
-      return;
-    } catch (error) {
-      spinner.fail(failedMessage);
-      throw error;
-    }
-  }
-}
@@ -32,7 +32,7 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
 }

 export default class ProjectInfo extends EasCommand {
-  static override description = 'information about the current project';
+  static description = 'information about the current project';

  async runAsync(): Promise<void> {
    const projectDir = await findProjectRootAsync();
@@ -3,15 +3,11 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import {
-  fetchProjectIdFromServerAsync,
-  findProjectRootAsync,
-  saveProjectIdToAppConfigAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';

 export default class ProjectInit extends EasCommand {
-  static override description = 'create or link an EAS project';
-  static override aliases = ['init'];
+  static description = 'create or link an EAS project';
+  static aliases = ['init'];

  async runAsync(): Promise<void> {
    const projectDir = await findProjectRootAsync();
@@ -24,9 +20,6 @@ export default class ProjectInit extends EasCommand {
      return;
    }

-    const projectId = await fetchProjectIdFromServerAsync(exp);
-    await saveProjectIdToAppConfigAsync(projectDir, projectId);
-
-    Log.withTick(`Linked app.json to project with ID ${chalk.bold(projectId)}`);
+    await setProjectIdAsync(projectDir);
  }
 }
@@ -20,10 +20,9 @@ import { getActorDisplayName } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';

 export default class EnvironmentSecretCreate extends EasCommand {
-  static override description =
-    'create an environment secret on the current project or owner account';
+  static description = 'create an environment secret on the current project or owner account';

-  static override flags = {
+  static flags = {
    scope: Flags.enum({
      description: 'Scope for the secret',
      options: [EnvironmentSecretScope.ACCOUNT, EnvironmentSecretScope.PROJECT],
@@ -17,9 +17,9 @@ import {
 import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class EnvironmentSecretDelete extends EasCommand {
-  static override description = 'delete an environment secret by ID';
+  static description = 'delete an environment secret by ID';

-  static override flags = {
+  static flags = {
    id: Flags.string({
      description: 'ID of the secret to delete',
    }),
@@ -60,7 +60,7 @@ export default class EnvironmentSecretDelete extends EasCommand {

    Log.addNewLineIfNone();
    Log.warn(
-      `You are about to permanently delete secret${
+      `You are about to permamently delete secret${
        secret?.name ? ` "${secret?.name}"` : ''
      } with id: "${id}".\nThis action is irreversible.`
    );
@@ -13,7 +13,7 @@ import {
 } from '../../project/projectUtils';

 export default class EnvironmentSecretList extends EasCommand {
-  static override description = 'list environment secrets available for your current app';
+  static description = 'list environment secrets available for your current app';

  async runAsync(): Promise<void> {
    const projectDir = await findProjectRootAsync();
@@ -22,7 +22,7 @@ export default class EnvironmentSecretList extends EasCommand {
    const projectAccountName = await getProjectAccountNameAsync(exp);

    if (!projectDir) {
-      throw new Error("Run this command inside your project's directory");
+      throw new Error("Please run this command inside your project's directory");
    }

    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
@@ -1,9 +1,9 @@
-import { EasJsonAccessor } from '@expo/eas-json';
+import { EasJsonReader } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';

 import EasCommand from '../commandUtils/EasCommand';
-import { StatuspageServiceName, SubmissionFragment } from '../graphql/generated';
+import { SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -16,14 +16,9 @@ import {
 import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
-import {
-  exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
-  submitAsync,
-  waitToCompleteAsync,
-} from '../submit/submit';
+import { submitAsync, waitToCompleteAsync } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
 import { getProfilesAsync } from '../utils/profiles';
-import { maybeWarnAboutEasOutagesAsync } from '../utils/statuspageService';

 interface RawCommandFlags {
  platform?: string;
@@ -47,16 +42,15 @@ interface CommandFlags {
 }

 export default class Submit extends EasCommand {
-  static override description = 'submit app binary to App Store and/or Play Store';
-  static override aliases = ['build:submit'];
+  static description = 'submit app binary to App Store and/or Play Store';
+  static aliases = ['build:submit'];

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: ['android', 'ios', 'all'],
    }),
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
@@ -93,23 +87,18 @@ export default class Submit extends EasCommand {

  async runAsync(): Promise<void> {
    const { flags: rawFlags } = await this.parse(Submit);
-
-    const flags = this.sanitizeFlags(rawFlags);
+    const flags = await this.sanitizeFlagsAsync(rawFlags);

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);

-    await maybeWarnAboutEasOutagesAsync([StatuspageServiceName.EasSubmit]);
-
-    const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-
-    const platforms = toPlatforms(flagsWithPlatform.requestedPlatform);
+    const platforms = toPlatforms(flags.requestedPlatform);
    const submissionProfiles = await getProfilesAsync({
      type: 'submit',
-      easJsonAccessor: new EasJsonAccessor(projectDir),
+      easJsonReader: new EasJsonReader(projectDir),
      platforms,
-      profileName: flagsWithPlatform.profile,
+      profileName: flags.profile,
    });

    const submissions: SubmissionFragment[] = [];
@@ -119,8 +108,8 @@ export default class Submit extends EasCommand {
        projectDir,
        projectId,
        profile: submissionProfile.profile,
-        archiveFlags: flagsWithPlatform.archiveFlags,
-        nonInteractive: flagsWithPlatform.nonInteractive,
+        archiveFlags: flags.archiveFlags,
+        nonInteractive: flags.nonInteractive,
      });

      if (submissionProfiles.length > 1) {
@@ -140,17 +129,12 @@ export default class Submit extends EasCommand {
    Log.newLine();
    printSubmissionDetailsUrls(submissions);

-    if (flagsWithPlatform.wait) {
-      const completedSubmissions = await waitToCompleteAsync(submissions, {
-        verbose: flagsWithPlatform.verbose,
-      });
-      exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
+    if (flags.wait) {
+      await waitToCompleteAsync(submissions, { verbose: flags.verbose });
    }
  }

-  private sanitizeFlags(
-    flags: RawCommandFlags
-  ): Omit<CommandFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform } {
+  private async sanitizeFlagsAsync(flags: RawCommandFlags): Promise<CommandFlags> {
    const {
      platform,
      verbose,
@@ -164,11 +148,15 @@ export default class Submit extends EasCommand {
      Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
    }

-    const requestedPlatform =
-      flags.platform &&
-      Object.values(RequestedPlatform).includes(flags.platform.toLowerCase() as RequestedPlatform)
-        ? (flags.platform.toLowerCase() as RequestedPlatform)
-        : undefined;
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    if (requestedPlatform === RequestedPlatform.All) {
+      if (archiveFlags.id || archiveFlags.path || archiveFlags.url) {
+        Errors.error(
+          '--id, --path, and --url params are only supported when performing a single-platform submit',
+          { exit: 1 }
+        );
+      }
+    }

    return {
      archiveFlags,
@@ -179,24 +167,4 @@ export default class Submit extends EasCommand {
      nonInteractive,
    };
  }
-
-  private async ensurePlatformSelectedAsync(
-    flags: Omit<CommandFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform }
-  ): Promise<CommandFlags> {
-    const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
-
-    if (requestedPlatform === RequestedPlatform.All) {
-      if (flags.archiveFlags.id || flags.archiveFlags.path || flags.archiveFlags.url) {
-        Errors.error(
-          '--id, --path, and --url params are only supported when performing a single-platform submit',
-          { exit: 1 }
-        );
-      }
-    }
-
-    return {
-      ...flags,
-      requestedPlatform,
-    };
-  }
 }
@@ -24,9 +24,9 @@ const DEFAULT_MANAGED_RUNTIME_VERSION = { policy: 'sdkVersion' } as const;
 const DEFAULT_BARE_RUNTIME_VERSION = '1.0.0' as const;

 export default class UpdateConfigure extends EasCommand {
-  static override description = 'configure the project to support EAS Update';
+  static description = 'configure the project to support EAS Update';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      description: 'Platform to configure',
      char: 'p',
@@ -117,7 +117,6 @@ async function configureAppJSONForEASUpdateAsync({
    exp.ios?.runtimeVersion ?? exp.runtimeVersion ?? iosDefaultRuntimeVersion;

  let newConfig: Partial<ExpoConfig>;
-  let newConfigOnlyAddedValues: Partial<ExpoConfig>;
  switch (platform) {
    case RequestedPlatform.All: {
      if (isRuntimeEqual(newAndroidRuntimeVersion, newIosRuntimeVersion)) {
@@ -130,26 +129,6 @@ async function configureAppJSONForEASUpdateAsync({
          ios: { ...exp.ios, runtimeVersion: undefined },
          updates,
        };
-        newConfigOnlyAddedValues = {
-          runtimeVersion: newAndroidRuntimeVersion,
-          ...(exp.android && 'runtimeVersion' in exp.android
-            ? {
-                android: {
-                  runtimeVersion: '<remove this key>',
-                },
-              }
-            : {}),
-          ...(exp.ios && 'runtimeVersion' in exp.ios
-            ? {
-                ios: {
-                  runtimeVersion: '<remove this key>',
-                },
-              }
-            : {}),
-          updates: {
-            url: easUpdateURL,
-          },
-        };
      } else {
        newConfig = {
          runtimeVersion: undefined, // top level runtime is redundant if it is specified in both android and ios
@@ -163,22 +142,6 @@ async function configureAppJSONForEASUpdateAsync({
          },
          updates,
        };
-        newConfigOnlyAddedValues = {
-          ...('runtimeVersion' in exp
-            ? {
-                runtimeVersion: '<remove this key>', // top level runtime is redundant if it is specified in both android and ios
-              }
-            : {}),
-          android: {
-            runtimeVersion: newAndroidRuntimeVersion,
-          },
-          ios: {
-            runtimeVersion: newIosRuntimeVersion,
-          },
-          updates: {
-            url: easUpdateURL,
-          },
-        };
      }
      break;
    }
@@ -190,14 +153,6 @@ async function configureAppJSONForEASUpdateAsync({
        },
        updates,
      };
-      newConfigOnlyAddedValues = {
-        android: {
-          runtimeVersion: newAndroidRuntimeVersion,
-        },
-        updates: {
-          url: easUpdateURL,
-        },
-      };
      break;
    }
    case RequestedPlatform.Ios: {
@@ -208,14 +163,6 @@ async function configureAppJSONForEASUpdateAsync({
        },
        updates,
      };
-      newConfigOnlyAddedValues = {
-        ios: {
-          runtimeVersion: newIosRuntimeVersion,
-        },
-        updates: {
-          url: easUpdateURL,
-        },
-      };
      break;
    }
    default: {
@@ -225,8 +172,8 @@ async function configureAppJSONForEASUpdateAsync({

  const result = await modifyConfigAsync(projectDir, newConfig);

-  const preexistingAndroidRuntimeVersion = exp.android?.runtimeVersion ?? exp.runtimeVersion;
-  const preexistingIosRuntimeVersion = exp.ios?.runtimeVersion ?? exp.runtimeVersion;
+  const prexistingAndroidRuntimeVersion = exp.android?.runtimeVersion ?? exp.runtimeVersion;
+  const prexistingIosRuntimeVersion = exp.ios?.runtimeVersion ?? exp.runtimeVersion;
  switch (result.type) {
    case 'success':
      if (exp.updates?.url) {
@@ -240,7 +187,7 @@ async function configureAppJSONForEASUpdateAsync({
      }

      if (
-        !preexistingAndroidRuntimeVersion &&
+        !prexistingAndroidRuntimeVersion &&
        [RequestedPlatform.Android, RequestedPlatform.All].includes(platform)
      ) {
        Log.withTick(
@@ -250,7 +197,7 @@ async function configureAppJSONForEASUpdateAsync({
        );
      }
      if (
-        !preexistingIosRuntimeVersion &&
+        !prexistingIosRuntimeVersion &&
        [RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)
      ) {
        Log.withTick(
@@ -272,7 +219,7 @@ async function configureAppJSONForEASUpdateAsync({
          'https://expo.fyi/eas-update-config.md'
        )}\n`
      );
-      Log.log(chalk.bold(JSON.stringify(newConfigOnlyAddedValues, null, 2)));
+      Log.log(chalk.bold(JSON.stringify(newConfig, null, 2)));
      Log.addNewLineIfNone();
      if (workflows['android'] === Workflow.GENERIC || workflows['ios'] === Workflow.GENERIC) {
        Log.warn(
@@ -295,8 +242,8 @@ async function configureAppJSONForEASUpdateAsync({
 }

 function isRuntimeEqual(
-  runtimeVersionA: string | { policy: 'sdkVersion' | 'nativeVersion' | 'appVersion' },
-  runtimeVersionB: string | { policy: 'sdkVersion' | 'nativeVersion' | 'appVersion' }
+  runtimeVersionA: string | { policy: 'sdkVersion' | 'nativeVersion' },
+  runtimeVersionB: string | { policy: 'sdkVersion' | 'nativeVersion' }
 ): boolean {
  if (typeof runtimeVersionA === 'string' && typeof runtimeVersionB === 'string') {
    return runtimeVersionA === runtimeVersionB;
@@ -36,9 +36,9 @@ async function deleteUpdateGroupAsync({
 }

 export default class UpdateDelete extends EasCommand {
-  static override description = 'delete all the updates in an update group';
+  static description = 'delete all the updates in an update group';

-  static override args = [
+  static args = [
    {
      name: 'groupId',
      required: true,
@@ -46,7 +46,7 @@ export default class UpdateDelete extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: `Return a json with the group ID of the deleted updates.`,
      default: false,
@@ -69,7 +69,7 @@ export default class UpdateDelete extends EasCommand {
            'This is a permanent operation.'
          )}\n\n` +
          `If you want to revert to a previous publish, you should use 'update --republish' targeted at the last working update group instead.\n\n` +
-          `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'update --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent caching behavior by clients.\n\n` +
+          `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'update --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent cacheing behavior by clients.\n\n` +
          `Would you like to abort?`,
      });

@@ -9,7 +9,6 @@ import gql from 'graphql-tag';
 import nullthrows from 'nullthrows';

 import { getEASUpdateURL } from '../../api';
-import { BRANCHES_LIMIT } from '../../branch/queries';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import fetch from '../../fetch';
@@ -19,17 +18,16 @@ import {
  PublishUpdateGroupInput,
  Robot,
  RootQueryUpdatesByGroupArgs,
-  StatuspageServiceName,
  Update,
+  UpdateBranchFragment,
  UpdateInfoGroup,
  UpdatePublishMutation,
  User,
  ViewBranchUpdatesQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log, { learnMore, link } from '../../log';
+import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
@@ -44,11 +42,10 @@ import {
  buildBundlesAsync,
  buildUnsortedUpdateInfoGroupAsync,
  collectAssetsAsync,
-  isUploadedAssetCountAboveWarningThreshold,
  uploadAssetsAsync,
 } from '../../project/publish';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
+import { confirmAsync, promptAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import {
@@ -57,12 +54,12 @@ import {
  getManifestBodyAsync,
  signManifestBody,
 } from '../../utils/code-signing';
-import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';
 import { getVcsClient } from '../../vcs';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
+import { listBranchesAsync } from '../branch/list';
 import { createUpdateChannelOnAppAsync } from '../channel/create';

 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
@@ -161,9 +158,9 @@ export async function ensureBranchExistsAsync({
 }

 export default class UpdatePublish extends EasCommand {
-  static override description = 'publish an update group';
+  static description = 'publish an update group';

-  static override flags = {
+  static flags = {
    branch: Flags.string({
      description: 'Branch to publish the update group on',
      required: false,
@@ -230,7 +227,6 @@ export default class UpdatePublish extends EasCommand {
        'non-interactive': nonInteractive,
      },
    } = await this.parse(UpdatePublish);
-
    if (jsonFlag) {
      enableJsonOutput();
    }
@@ -248,8 +244,6 @@ export default class UpdatePublish extends EasCommand {
      isPublicConfig: false,
    });

-    await maybeWarnAboutEasOutagesAsync([StatuspageServiceName.EasUpdate]);
-
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion);
@@ -289,50 +283,21 @@ export default class UpdatePublish extends EasCommand {
    }

    if (!branchName) {
+      const validationMessage = 'Branch name may not be empty.';
      if (nonInteractive) {
        throw new Error('Must supply --branch or use --auto when in non-interactive mode');
      }

-      const validationMessage = 'Branch name may not be empty.';
      if (jsonFlag) {
        throw new Error(validationMessage);
      }

-      const branches = await BranchQuery.listBranchesAsync({
-        appId: projectId,
-        limit: BRANCHES_LIMIT,
-        offset: 0,
-      });
-      if (branches.length === 0) {
-        ({ name: branchName } = await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'No branches found. Provide a branch name:',
-          initial:
-            (await getVcsClient().getBranchNameAsync()) ||
-            `branch-${Math.random().toString(36).substr(2, 4)}`,
-          validate: value => (value ? true : validationMessage),
-        }));
-      } else {
-        branchName = await selectAsync<string>(
-          'Which branch would you like to publish on?',
-          branches.map(branch => {
-            return {
-              title: `${branch.name} ${chalk.grey(
-                `- current update: ${formatUpdate(branch.updates[0])}`
-              )}`,
-              value: branch.name,
-            };
-          })
-        );
-      }
-      assert(branchName, 'Branch name must be specified.');
+      branchName = await getBranchNameToPublishOnAsync(projectId, validationMessage);
    }

    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
    let oldMessage: string, oldRuntimeVersion: string;
    let uploadedAssetCount = 0;
-    let assetLimitPerUpdateGroup = 0;

    if (republish) {
      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
@@ -353,12 +318,7 @@ export default class UpdatePublish extends EasCommand {
          throw new Error('You must specify the update group to republish.');
        }

-        updatesToRepublish = await getUpdatesToRepublishInteractiveAsync(
-          projectId,
-          branchName,
-          platformFlag,
-          50
-        );
+        updatesToRepublish = await getUpdatesToRepublishAsync(projectId, branchName, platformFlag);
      }
      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
        // Only republish to the specified platforms
@@ -409,7 +369,7 @@ export default class UpdatePublish extends EasCommand {
        ({ publishMessage: message } = await promptAsync({
          type: 'text',
          name: 'publishMessage',
-          message: `Provide an update message.`,
+          message: `Please enter an update message.`,
          initial: `Republish "${oldMessage!}" - group: ${group}`,
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -423,7 +383,6 @@ export default class UpdatePublish extends EasCommand {
        if (nonInteractive) {
          throw new Error('Must supply --message or use --auto when in non-interactive mode');
        }
-
        const validationMessage = 'publish message may not be empty.';
        if (jsonFlag) {
          throw new Error(validationMessage);
@@ -431,7 +390,7 @@ export default class UpdatePublish extends EasCommand {
        ({ publishMessage: message } = await promptAsync({
          type: 'text',
          name: 'publishMessage',
-          message: `Provide an update message.`,
+          message: `Please enter an update message.`,
          initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -453,17 +412,11 @@ export default class UpdatePublish extends EasCommand {
      try {
        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
-        const uploadResults = await uploadAssetsAsync(
+        const { uniqueUploadedAssetCount } = await uploadAssetsAsync(
          assets,
-          projectId,
-          (totalAssets, missingAssets) => {
-            assetSpinner.text = `Uploading assets. Finished (${
-              totalAssets - missingAssets
-            }/${totalAssets})`;
-          }
+          spinnerText => (assetSpinner.text = `Uploading assets... ${spinnerText}`)
        );
-        uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
-        assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
+        uploadedAssetCount = uniqueUploadedAssetCount;
        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
        const uploadAssetSuccessMessage = uploadedAssetCount
          ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'asset' : 'assets'}!`
@@ -583,7 +536,7 @@ export default class UpdatePublish extends EasCommand {
        const newUpdatesForRuntimeVersion = newUpdates.filter(
          update => update.runtimeVersion === runtime
        );
-        if (newUpdatesForRuntimeVersion.length === 0) {
+        if (!newUpdatesForRuntimeVersion.length) {
          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
        }
        const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
@@ -613,88 +566,57 @@ export default class UpdatePublish extends EasCommand {
          ])
        );
        Log.addNewLineIfNone();
-        if (
-          isUploadedAssetCountAboveWarningThreshold(uploadedAssetCount, assetLimitPerUpdateGroup)
-        ) {
-          Log.warn(
-            `This update group contains ${uploadedAssetCount} assets and is nearing the server cap of ${assetLimitPerUpdateGroup}.\n` +
-              `${learnMore('https://docs.expo.dev/eas-update/optimize-assets/', {
-                learnMoreMessage: 'Consider optimizing your usage of assets',
-                dim: false,
-              })}.`
-          );
-          Log.addNewLineIfNone();
-        }
      }
    }
  }
 }

-export async function getUpdatesToRepublishInteractiveAsync(
+export async function getUpdatesToRepublishAsync(
  projectId: string,
  branchName: string,
-  platformFlag: string,
-  pageSize: number,
-  offset: number = 0,
-  cumulativeUpdates: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'] = []
-): Promise<
-  Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates']
-> {
-  const fetchMoreValue = '_fetchMore';
+  platformFlag: string
+): Promise<AppUpdateObject[]> {
+  const queryUpdatesForBranchAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<AppUpdateObject>> => {
+    const { updates } = await ensureBranchExistsAsync({
+      appId: projectId,
+      name: branchName!,
+      limit: pageSize,
+      offset,
+    });
+    if (!updates.length) {
+      throw new Error(
+        `There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+      );
+    }
+    const relevantUpdates =
+      platformFlag === 'all'
+        ? updates
+        : updates.filter(update => {
+            // Only show groups that have updates on the specified platform(s).
+            return update.platform === platformFlag;
+          });
+    return {
+      queryResponse: relevantUpdates,
+      queryResponseRawLength: updates.length,
+    };
+  };

-  const { updates } = await ensureBranchExistsAsync({
-    appId: projectId,
-    name: branchName,
-    limit: pageSize + 1, // fetch an extra item so we know if there are additional pages
-    offset,
+  const getUpdateIdentifier = (update: AppUpdateObject): string => update.group;
+
+  return await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryUpdatesForBranchAsync,
+    promptOptions: {
+      type: 'select',
+      title: 'Which update would you like to republish?',
+      createDisplayTextForSelectionPromptListItem: formatUpdateTitle,
+      getIdentifierForQueryItem: getUpdateIdentifier,
+    },
  });
-  cumulativeUpdates = [
-    ...cumulativeUpdates,
-    // drop that extra item used for pagination from our render logic
-    ...updates.slice(0, updates.length - 1),
-  ];
-  const cumulativeUpdatesForTargetPlatforms =
-    platformFlag === 'all'
-      ? cumulativeUpdates
-      : cumulativeUpdates.filter(update => {
-          // Only show groups that have updates on the specified platform(s).
-          return update.platform === platformFlag;
-        });
-  const updateGroups = uniqBy(cumulativeUpdatesForTargetPlatforms, u => u.group).map(update => ({
-    title: formatUpdateTitle(update),
-    value: update.group,
-  }));
-  if (updateGroups.length === 0) {
-    throw new Error(
-      `There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
-    );
-  }
-
-  if (updates.length > pageSize) {
-    updateGroups.push({ title: 'Next page...', value: fetchMoreValue });
-  }
-
-  const selectedUpdateGroup = await selectAsync<string>(
-    'Which update would you like to republish?',
-    updateGroups
-  );
-  if (selectedUpdateGroup === fetchMoreValue) {
-    return await getUpdatesToRepublishInteractiveAsync(
-      projectId,
-      branchName,
-      platformFlag,
-      pageSize,
-      offset + pageSize,
-      cumulativeUpdates
-    );
-  }
-  return cumulativeUpdates.filter(update => update.group === selectedUpdateGroup);
 }

 async function getRuntimeVersionObjectAsync(
@@ -727,12 +649,24 @@ async function getRuntimeVersionObjectAsync(
  );
 }

-function formatUpdateTitle(
-  update: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'][number]
-): string {
+async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
+  const configuredURL = exp.updates?.url;
+  const projectId = await getProjectIdAsync(exp);
+  const expectedURL = getEASUpdateURL(projectId);
+
+  if (configuredURL !== expectedURL) {
+    throw new Error(
+      `The update URL is incorrectly configured for EAS Update. Please set updates.url to ${expectedURL} in your app.json.`
+    );
+  }
+}
+
+export type AppUpdateObject = Exclude<
+  Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
+  null | undefined
+>['updates'][0];
+
+export function formatUpdateTitle(update: AppUpdateObject): string {
  const { message, createdAt, actor, runtimeVersion } = update;

  let actorName: string;
@@ -755,18 +689,52 @@ function formatUpdateTitle(
  )} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
 }

-async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
-  const configuredURL = exp.updates?.url;
-  const projectId = await getProjectIdAsync(exp);
-  const expectedURL = getEASUpdateURL(projectId);
+async function getBranchNameToPublishOnAsync(
+  projectId: string,
+  validationMessage: string
+): Promise<string> {
+  const queryForBanchesToPublishOnAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<UpdateBranchFragment>> => {
+    const branches = await listBranchesAsync({ appId: projectId, limit: pageSize, offset });
+    if (branches.length === 0) {
+      const { name: newBranchName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'No branches found. Creating a new one. Please name the new branch:',
+        initial:
+          (await getVcsClient().getBranchNameAsync()) ||
+          `branch-${Math.random().toString(36).substring(2, 7)}`,
+        validate: value => (value ? true : validationMessage),
+      });
+      branches.push({
+        id: '_defaultId',
+        name: newBranchName,
+        updates: [],
+      });
+    }
+    return { queryResponse: branches, queryResponseRawLength: branches.length };
+  };
+  const formatBranchTitle = (branch: UpdateBranchFragment): string =>
+    `${branch.name} ${chalk.grey(`- current update: ${formatUpdate(branch.updates[0])}`)}`;
+  const getBranchIdentifier = (branch: UpdateBranchFragment): string => branch.id;

-  if (configuredURL !== expectedURL) {
-    throw new Error(
-      `The update URL is incorrectly configured for EAS Update. Set updates.url to ${expectedURL} in your ${chalk.bold(
-        'app.json'
-      )}.`
-    );
-  }
+  const branches = await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryForBanchesToPublishOnAsync,
+    promptOptions: {
+      type: 'select',
+      createDisplayTextForSelectionPromptListItem: formatBranchTitle,
+      getIdentifierForQueryItem: getBranchIdentifier,
+      title: 'Which branch would you like to publish on?',
+    },
+  });
+
+  const branchName = branches?.pop()?.name;
+  assert(branchName, validationMessage);
+  return branchName;
 }

 export const truncatePublishUpdateMessage = (originalMessage: string): string => {
@@ -4,25 +4,29 @@ import chalk from 'chalk';
 import CliTable from 'cli-table3';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ViewAllUpdatesQuery, ViewBranchUpdatesQuery } from '../../graphql/generated';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { UPDATES_LIMIT } from '../../update/queries';
-import {
-  UPDATE_COLUMNS,
-  UpdateGroupDescription,
-  formatUpdate,
-  getUpdateGroupsWithPlatforms,
-} from '../../update/utils';
+import { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
+import groupBy from '../../utils/expodash/groupBy';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { PaginatedQueryResponse, performPaginatedQueryAsync } from '../../utils/queries';
 import { getVcsClient } from '../../vcs';

-export default class BranchView extends EasCommand {
-  static override description = 'view the recent updates for a branch';
+type UpdateGroupDescription = FormatUpdateParameter & {
+  branch: string;
+  group: string;
+  platforms: string;
+  runtimeVersion: string;
+};

-  static override flags = {
+export default class BranchView extends EasCommand {
+  static description = 'view the recent updates for a branch';
+
+  static flags = {
    branch: Flags.string({
      description: 'List all updates on this branch',
      exclusive: ['all'],
@@ -50,19 +54,8 @@ export default class BranchView extends EasCommand {
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);

-    let updateGroupDescriptions: UpdateGroupDescription[];
    if (all) {
-      const branchesAndUpdates = await UpdateQuery.viewAllAsync({
-        appId: projectId,
-        limit: UPDATES_LIMIT,
-        offset: 0,
-      });
-      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
-        branchesAndUpdates.app.byId.updates.map(update => ({
-          ...update,
-          branch: update.branch.name,
-        }))
-      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
+      await fetchAllUpdatesForAppAsync(projectId, jsonFlag);
    } else {
      let branchInteractive: string | undefined;
      if (!branchFlag) {
@@ -73,7 +66,7 @@ export default class BranchView extends EasCommand {
        ({ name: branchInteractive } = await promptAsync({
          type: 'text',
          name: 'name',
-          message: 'Provide the name of the branch whose updates you wish to view:',
+          message: 'Please enter the name of the branch whose updates you wish to view:',
          initial: (await getVcsClient().getBranchNameAsync()) ?? undefined,
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -81,27 +74,120 @@ export default class BranchView extends EasCommand {
      const branch = branchFlag ?? branchInteractive;
      assert(branch, 'Branch name may not be empty.');

-      const branchesAndUpdates = await UpdateQuery.viewBranchAsync({
-        appId: projectId,
-        name: branch,
-        limit: UPDATES_LIMIT,
-        offset: 0,
-      });
-      const UpdateBranch = branchesAndUpdates.app?.byId.updateBranchByName;
-      if (!UpdateBranch) {
-        throw new Error(`Could not find branch "${branch}"`);
-      }
-      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
-        UpdateBranch.updates.map(update => ({ ...update, branch }))
-      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
+      fetchAllUpdatesForBranchAsync(projectId, branch, jsonFlag);
    }
+  }
+}
+
+type BranchUpdateObject = Exclude<
+  ViewBranchUpdatesQuery['app']['byId']['updateBranchByName'],
+  null | undefined
+>['updates'][0];
+type AppUpdateObject = ViewAllUpdatesQuery['app']['byId']['updates'][0];
+
+async function fetchAllUpdatesForBranchAsync(
+  projectId: string,
+  branchName: string,
+  jsonFlag: boolean
+): Promise<void> {
+  const queryToPerformAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<BranchUpdateObject>> => {
+    const branchesAndUpdates = await UpdateQuery.viewBranchAsync({
+      appId: projectId,
+      name: branchName,
+      limit: pageSize,
+      offset,
+    });
+    const UpdateBranch = branchesAndUpdates.app?.byId.updateBranchByName;
+    if (!UpdateBranch) {
+      throw new Error(`Could not find branch "${branchName}"`);
+    }
+
+    return {
+      queryResponse: UpdateBranch.updates,
+      queryResponseRawLength: UpdateBranch.updates.length,
+    };
+  };
+
+  const renderListItems = (currentPage: BranchUpdateObject[]): void => {
+    const updateGroupDescriptions = getUpdateGroupDescriptions(currentPage);

    if (jsonFlag) {
      printJsonOnlyOutput(updateGroupDescriptions);
    } else {
      logAsTable(updateGroupDescriptions);
    }
-  }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryToPerformAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'View next page of updates?',
+      renderListItems,
+    },
+  });
+}
+
+async function fetchAllUpdatesForAppAsync(projectId: string, jsonFlag: boolean): Promise<void> {
+  const queryToPerformAsync = async (
+    pageSize: number,
+    offset: number
+  ): Promise<PaginatedQueryResponse<AppUpdateObject>> => {
+    const viewAllUpdates = await UpdateQuery.viewAllAsync({
+      appId: projectId,
+      limit: pageSize,
+      offset,
+    });
+    const { updates } = viewAllUpdates.app.byId;
+
+    return {
+      queryResponse: updates,
+      queryResponseRawLength: updates.length,
+    };
+  };
+
+  const renderListItems = (currentPage: AppUpdateObject[]): void => {
+    const updateGroupDescriptions = getUpdateGroupDescriptions(currentPage);
+
+    if (jsonFlag) {
+      printJsonOnlyOutput(updateGroupDescriptions);
+    } else {
+      logAsTable(updateGroupDescriptions);
+    }
+  };
+
+  await performPaginatedQueryAsync({
+    pageSize: 50,
+    offset: 0,
+    queryToPerform: queryToPerformAsync,
+    promptOptions: {
+      type: 'confirm',
+      title: 'View next page of updates?',
+      renderListItems,
+    },
+  });
+}
+
+function getUpdateGroupDescriptions(
+  updates: (BranchUpdateObject | AppUpdateObject)[]
+): UpdateGroupDescription[] {
+  return Object.values(groupBy(updates, update => update.group))
+    .map(updateGroup => {
+      return {
+        platforms: updateGroup
+          .map(update => update.platform)
+          .sort()
+          .join(', '),
+        ...updateGroup[0],
+        branch: updateGroup[0].branch.name,
+      } as UpdateGroupDescription;
+    })
+    .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
 }

 function logAsTable(updateGroupDescriptions: UpdateGroupDescription[]): void {
@@ -51,9 +51,9 @@ export async function viewUpdateAsync({
  return data;
 }
 export default class UpdateView extends EasCommand {
-  static override description = 'update group details';
+  static description = 'update group details';

-  static override args = [
+  static args = [
    {
      name: 'groupId',
      required: true,
@@ -61,7 +61,7 @@ export default class UpdateView extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    json: Flags.boolean({
      description: `Return a json with the updates belonging to the group.`,
      default: false,
@@ -9,9 +9,9 @@ import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUt
 import { prepareInputParamsAsync } from '../../webhooks/input';

 export default class WebhookCreate extends EasCommand {
-  static override description = 'create a webhook';
+  static description = 'create a webhook';

-  static override flags = {
+  static flags = {
    event: Flags.enum({
      description: 'Event type that triggers the webhook',
      options: [WebhookType.Build, WebhookType.Submit],
@@ -14,9 +14,9 @@ import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { formatWebhook } from '../../webhooks/formatWebhook';

 export default class WebhookDelete extends EasCommand {
-  static override description = 'delete a webhook';
+  static description = 'delete a webhook';

-  static override args = [
+  static args = [
    {
      name: 'ID',
      required: false,
@@ -57,7 +57,7 @@ export default class WebhookDelete extends EasCommand {
    Log.addNewLineIfNone();
    Log.log(formatWebhook(webhook));
    Log.newLine();
-    Log.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
+    Log.warn(`You are about to permamently delete this webhook.\nThis action is irreversible.`);
    Log.newLine();
    const confirmed = await toggleConfirmAsync({
      message: 'Are you sure you wish to proceed?',
@@ -15,9 +15,9 @@ import {
 import { formatWebhook } from '../../webhooks/formatWebhook';

 export default class WebhookList extends EasCommand {
-  static override description = 'list webhooks';
+  static description = 'list webhooks';

-  static override flags = {
+  static flags = {
    event: Flags.enum({
      description: 'Event type that triggers the webhook',
      options: [WebhookType.Build, WebhookType.Submit],
@@ -9,9 +9,9 @@ import pick from '../../utils/expodash/pick';
 import { prepareInputParamsAsync } from '../../webhooks/input';

 export default class WebhookUpdate extends EasCommand {
-  static override description = 'update a webhook';
+  static description = 'update a webhook';

-  static override flags = {
+  static flags = {
    id: Flags.string({
      description: 'Webhook ID',
      required: true,