v2.0.0

Update CHANGELOG.md
fix typo in promptToConfigurePushNotifications (#1332 )
2026-11-14 10:08:06 -10:00 · 2022-09-01 13:30:03 +02:00 · 2022-09-01 13:24:46 +02:00 · 2022-09-01 13:20:18 +02:00 · 2022-08-31 14:24:40 -07:00 · 2022-08-29 09:58:55 +00:00
216 changed files with 14555 additions and 5529 deletions
@@ -1 +1,2 @@
+* text eol=lf
 **/yarn.lock linguist-generated
@@ -1,20 +0,0 @@
-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
@@ -0,0 +1,146 @@
+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'
+            })
@@ -0,0 +1,26 @@
+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,8 +27,11 @@ 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,6 +2,7 @@
 packages/*/build
 packages/eas-cli/dist
 packages/eas-cli/tmp
+scripts/build

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

 ### 🛠 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))
+
 ### 🎉 New features

 ### 🐛 Bug fixes

+- Fix dynamic config update warning. ([#1322](https://github.com/expo/eas-cli/pull/1322) by [@wschurman](https://github.com/wschurman))
+
 ### 🧹 Chores

+## [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
+
+- Fix submission archive URLs. ([#1179](https://github.com/expo/eas-cli/pull/1179) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- 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

 ### 🎉 New features
@@ -21,6 +183,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes

 - Surface ASC errors in metadata for normal API rejections. ([#1167](https://github.com/expo/eas-cli/pull/1167) by [@byCedric](https://github.com/byCedric))
+- Add metadata schema to bundled eas-cli package. ([#1166](https://github.com/expo/eas-cli/pull/1166) by [@byCedric](https://github.com/byCedric))

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

@@ -37,7 +200,6 @@ This is the log of notable changes to EAS CLI and related packages.

 - Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00/))
 - `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
- Add metadata schema to bundled eas-cli package. ([#1166](https://github.com/expo/eas-cli/pull/1166) by [@byCedric](https://github.com/byCedric))

 ### 🧹 Chores

@@ -3,9 +3,13 @@
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95

-packages/eas-cli/src/submit @barthap @dsokal
-packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+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/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric

@@ -1,130 +0,0 @@
-#!/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": "0.54.1"
+  "version": "2.0.0"
 }
@@ -17,22 +17,22 @@
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@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",
+    "@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",
    "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.0",
-    "jest-watch-typeahead": "1.1.0",
+    "jest": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
    "lerna": "4.0.0",
-    "oclif": "3.0.1",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.2",
-    "typescript": "4.6.4"
+    "oclif": "3.1.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
+    "typescript": "4.7.4"
  },
  "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
  }
 }
@@ -2,6 +2,24 @@ 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,6 +19,28 @@ 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
@@ -49,6 +71,8 @@ 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)
@@ -100,7 +124,7 @@ ALIASES
  $ eas login
 ```

-_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)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

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

-_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)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:view`

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

-_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)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

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

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

 ## `eas autocomplete [SHELL]`

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

-_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)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

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

-_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)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

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

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

 FLAGS
-  --json  return output as JSON
+  --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.

 DESCRIPTION
  list all branches
 ```

-_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)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

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

-_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)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

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

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

 ARGUMENTS
  NAME  Name of the branch to view

 FLAGS
-  --json  return a json with the branch's ID name and recent update groups.
+  --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.

 DESCRIPTION
  view a branch
 ```

-_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)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

@@ -282,9 +314,10 @@ 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>]
+    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>] [-m <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
@@ -302,7 +335,7 @@ DESCRIPTION
  start a build
 ```

-_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)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

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

-_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)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

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

-_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)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:inspect`

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

 ## `eas build:list`

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

-_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)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:submit`

@@ -431,6 +464,44 @@ 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.0.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.0.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+
 ## `eas build:view [BUILD_ID]`

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

-_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)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

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

-_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)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

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

-_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)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

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

-_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)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:view [NAME]`

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

-_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)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

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

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

 ## `eas credentials`

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

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

 DESCRIPTION
  manage credentials
 ```

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

 ## `eas device:create`

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

 ## `eas device:delete`

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

-_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)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

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

-_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)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:view [UDID]`

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

-_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)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -633,7 +707,7 @@ DESCRIPTION
  display environment info
 ```

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

 ## `eas help [COMMAND]`

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

 ## `eas metadata:push`

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

 ## `eas project:info`

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

-_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)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

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

-_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)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas secret:create`

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

 ## `eas secret:delete`

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

-_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)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/secret/delete.ts)_

 ## `eas secret:list`

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

-_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)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas submit`

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

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

 ## `eas update`

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

-_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)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

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

-_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)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

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

-_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)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

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

-_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)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:view GROUPID`

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

-_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)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas webhook:create`

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

-_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)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

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

-_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)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

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

-_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)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

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

-_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)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

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

-_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)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v2.0.0/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -14,7 +14,7 @@ generates:
      dedupeOperationSuffix: true
    hooks:
      afterOneFileWrite:
-        - ./annotate-graphql-codegen.sh
+        - 'node ./scripts/annotate-graphql-codegen.js'
  ./graphql.schema.json:
    plugins:
      - 'introspection'
@@ -1,38 +1,39 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "0.54.1",
+  "version": "2.0.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.33",
+    "@expo/apple-utils": "0.0.0-alpha.34",
    "@expo/code-signing-certificates": "0.0.2",
-    "@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/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.85",
+    "@expo/eas-json": "2.0.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.2.0",
    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "3.1.6",
+    "@expo/prebuild-config": "5.0.3",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.6.0",
+    "@expo/spawn-async": "1.7.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.9.0",
-    "@urql/core": "2.4.4",
+    "@oclif/core": "1.13.10",
+    "@urql/core": "2.6.1",
    "@urql/exchange-retry": "0.3.3",
    "ajv": "^6.12.6",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.0",
+    "cli-progress": "3.11.2",
    "cli-table3": "0.6.2",
    "dateformat": "4.6.3",
    "env-paths": "2.2.0",
@@ -54,7 +55,7 @@
    "keychain": "1.3.0",
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
-    "minimatch": "5.0.1",
+    "minimatch": "5.1.0",
    "nanoid": "3.3.4",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
@@ -62,12 +63,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",
@@ -77,33 +78,35 @@
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@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",
+    "@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",
    "@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.5.7",
-    "@types/node-forge": "1.0.2",
+    "@types/node-fetch": "2.6.2",
+    "@types/node-forge": "1.0.4",
+    "@types/promise-retry": "1.1.3",
    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.9",
-    "@types/tar": "6.1.1",
+    "@types/semver": "7.3.10",
+    "@types/tar": "6.1.2",
    "@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",
-    "form-data": "4.0.0",
-    "memfs": "3.4.3",
+    "memfs": "3.4.7",
    "mockdate": "3.0.5",
-    "nock": "13.2.4",
-    "tempy": "0.7.0",
-    "ts-deepmerge": "2.0.1",
-    "typescript": "4.6.4"
+    "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"
  },
  "engines": {
    "node": ">=14.0.0"
@@ -166,11 +169,11 @@
    },
    "warn-if-update-available": {
      "timeoutInDays": 0.5,
-      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
+      "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"
    },
    "update": {
      "node": {
-        "version": "12.13.0"
+        "version": "18.6.0"
      },
      "s3": {
        "templates": {
@@ -190,8 +193,8 @@
  },
  "repository": "expo/eas-cli",
  "scripts": {
-    "postpack": "rm -f oclif.manifest.json",
-    "prepack": "./scripts/prepack.sh",
+    "postpack": "rimraf oclif.manifest.json",
+    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
    "watch": "yarn build --watch --preserveWatchOutput",
@@ -199,6 +202,10 @@
    "test": "jest",
    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rm -rf dist build tmp node_modules yarn-error.log"
+    "clean": "rimraf dist build tmp node_modules yarn-error.log"
+  },
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
  }
 }
@@ -1,13 +1,15 @@
-#!/usr/bin/env sh
+const fs = require('fs/promises');

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

-content="/**
+(async () => {
+  const generatedCode = await fs.readFile(path, 'utf8');
+  const comment = `/**
 * 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`;

-printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
+  await fs.writeFile(path, comment + generatedCode);
+})();
@@ -1,4 +1,4 @@
-const { promises: fs } = require('fs');
+const fs = require('fs/promises');

 (async () => {
  // Patch `oclif readme` path and link generation
@@ -0,0 +1,7 @@
+const spawn = require('@expo/spawn-async');
+
+(async () => {
+  if (!process.env.CLI_SIZE_CHECK) {
+    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
+  }
+})();
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-rm -rf build
-yarn build
-
-if [ -z "$CLI_SIZE_CHECK" ]; then
-  yarn oclif manifest
-fi
@@ -0,0 +1,17 @@
+import { fixS3Url } from '../uploads';
+
+describe(fixS3Url, () => {
+  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);
+  });
+
+  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);
+  });
+});
@@ -15,6 +15,9 @@ 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 {
@@ -0,0 +1,109 @@
+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 => [
+        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());
+  }
+}
@@ -0,0 +1,14 @@
+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)}...`);
+  });
+});
@@ -89,7 +89,7 @@ describe(bumpVersionAsync, () => {
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
  });

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

@@ -1,10 +1,12 @@
 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';

 import AndroidCredentialsProvider, {
  AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
+import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
 import {
@@ -27,6 +29,7 @@ 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>
@@ -44,7 +47,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('Please update eas.json and come back again.');
+      Log.error('Update eas.json and come back again.');
      process.exit(1);
    }
  }
@@ -59,8 +62,18 @@ 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 };
+  return { applicationId, gradleContext, versionCodeOverride };
 }

 export async function prepareAndroidBuildAsync(
@@ -75,7 +88,10 @@ export async function prepareAndroidBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
      });
    },
    prepareJobAsync: async (
@@ -87,7 +103,8 @@ export async function prepareAndroidBuildAsync(
    sendBuildRequestAsync: async (
      appId: string,
      job: Android.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
@@ -95,6 +112,7 @@ export async function prepareAndroidBuildAsync(
        appId,
        job: graphqlJob,
        metadata: graphqlMetadata,
+        buildParams,
      });
    },
  });
@@ -13,6 +13,7 @@ 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,
    artifactPath: job.artifactPath,
    username: job.username,
@@ -75,6 +75,11 @@ export async function prepareJobAsync(
    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, BuildProfile } from '@expo/eas-json';
+import { AndroidVersionAutoIncrement } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -15,15 +15,14 @@ import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './ver
 export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
-  buildProfile,
+  localAutoIncrement,
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  buildProfile: BuildProfile<Platform.ANDROID>;
+  localAutoIncrement?: AndroidVersionAutoIncrement;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const { autoIncrement } = buildProfile;
-  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
@@ -1,16 +1,21 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
+import { AndroidConfig, Updates } 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';
@@ -46,9 +51,10 @@ export async function bumpVersionAsync({

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

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

 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
@@ -151,3 +169,97 @@ 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);
+  }
+}
@@ -11,6 +11,7 @@ import { getExpoWebsiteBaseUrl } from '../api';
 import {
  AppPlatform,
  BuildFragment,
+  BuildParamsInput,
  BuildPriority,
  BuildStatus,
  UploadSessionType,
@@ -24,7 +25,7 @@ import {
  appPlatformEmojis,
  requestedPlatformDisplayNames,
 } from '../platform';
-import { uploadAsync } from '../uploads';
+import { uploadFileAtPathToS3Async } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -53,11 +54,22 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
  ): Promise<CredentialsResult<Credentials> | undefined>;
  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
-  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
+  sendBuildRequestAsync(
+    appId: string,
+    job: TJob,
+    metadata: Metadata,
+    buildParams: BuildParamsInput
+  ): Promise<BuildResult>;
 }

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

+function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): BuildParamsInput {
+  return {
+    resourceClass: ctx.resourceClass,
+  };
+}
+
 export async function prepareBuildRequestForPlatformAsync<
  TPlatform extends Platform,
  Credentials,
@@ -100,6 +112,7 @@ export async function prepareBuildRequestForPlatformAsync<
      } as const);

  const metadata = await collectMetadataAsync(ctx);
+  const buildParams = resolveBuildParamsInput(ctx);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
    credentials: credentialsResult?.credentials,
@@ -107,11 +120,11 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, ctx.localBuildOptions);
+      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
      return undefined;
    } else {
      try {
-        return await sendBuildRequestAsync(builder, job, metadata);
+        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
      } catch (error: any) {
        handleBuildRequestError(error, job.platform);
      }
@@ -121,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, please upgrade to the latest eas-cli version.');
+    Log.error('EAS Build API has changed. 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, please try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build is down for maintenance. 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, please try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build free tier is temporarily disabled. Try again later. Check https://status.expo.dev/ for updates.'
    );
    throw new Error('Build request failed.');
  } else if (
@@ -144,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, please report the issue.'
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
    );
  }
  throw error;
@@ -166,7 +179,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        const projectTarball = await makeProjectTarballAsync();
        projectTarballPath = projectTarball.path;

-        const { bucketKey } = await uploadAsync(
+        const { bucketKey } = await uploadFileAtPathToS3Async(
          UploadSessionType.EasBuildProjectSources,
          projectTarball.path,
          createProgressTracker({
@@ -197,7 +210,8 @@ async function uploadProjectAsync<TPlatform extends Platform>(
 async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
  builder: Builder<TPlatform, Credentials, TJob>,
  job: TJob,
-  metadata: Metadata
+  metadata: Metadata,
+  buildParams: BuildParamsInput
 ): Promise<BuildFragment> {
  const { ctx } = builder;
  return await withAnalyticsAsync(
@@ -209,7 +223,8 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
      const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
        ctx.projectId,
        job,
-        metadata
+        metadata,
+        buildParams
      );

      printDeprecationWarnings(deprecationInfo);
@@ -228,11 +243,7 @@ type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  {
-    // 2 hours (max build time limit) + 10 minutes (possible queue time)
-    timeoutSec = 2 * 60 * 60 + 10 * 60,
-    intervalSec = 10,
-  } = {}
+  { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
  let spinner;
  let originalSpinnerText;
@@ -244,8 +255,7 @@ 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();
  }
-  const endTime = new Date().getTime() + timeoutSec * 1000;
-  while (new Date().getTime() <= endTime) {
+  while (true) {
    const builds = await getBuildsSafelyAsync(buildIds);
    const { refetch } =
      builds.length === 1
@@ -256,10 +266,6 @@ 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[]> {
@@ -337,7 +343,7 @@ async function handleSingleBuildProgressAsync(
          );
        }
        Log.newLine();
-        Log.log('Waiting in queue');
+        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
        queueProgressBar.start(
          build.initialQueuePosition + 1,
          build.initialQueuePosition - build.queuePosition + 1,
@@ -370,6 +376,12 @@ 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,11 +1,11 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { BuildProfile, EasJson } from '@expo/eas-json';

 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
+import { BuildResourceClass } from '../graphql/generated';
 import { GradleBuildContext } from '../project/android/gradle';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
@@ -16,29 +16,35 @@ 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;
  clearCache: boolean;
  credentialsCtx: CredentialsContext;
  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,12 +1,14 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { BuildProfile, EasJson } 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';

 import { TrackingContext } from '../analytics/common';
 import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
+import { BuildResourceClass } from '../graphql/generated';
 import { getExpoConfig } from '../project/expoConfig';
 import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
@@ -20,19 +22,27 @@ import { LocalBuildOptions } from './local';
 export async function createBuildContextAsync<T extends Platform>({
  buildProfileName,
  buildProfile,
+  easJsonCliConfig,
  clearCache = false,
  localBuildOptions,
-  nonInteractive = false,
+  nonInteractive,
+  noWait,
  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 });

@@ -42,6 +52,7 @@ 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,
@@ -49,6 +60,7 @@ export async function createBuildContextAsync<T extends Platform>({
    projectDir,
    user,
    env: buildProfile.env,
+    easJsonCliConfig,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -63,6 +75,8 @@ 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);

@@ -70,11 +84,14 @@ export async function createBuildContextAsync<T extends Platform>({
    accountName,
    buildProfile,
    buildProfileName,
+    resourceClass,
+    easJsonCliConfig,
    clearCache,
    credentialsCtx,
    exp,
    localBuildOptions,
    nonInteractive,
+    noWait,
    platform,
    projectDir,
    projectId,
@@ -82,6 +99,8 @@ export async function createBuildContextAsync<T extends Platform>({
    trackingCtx,
    user,
    workflow,
+    message,
+    runFromCI,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -3,6 +3,7 @@ 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 {
@@ -17,6 +18,12 @@ 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
@@ -51,14 +58,34 @@ 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,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -76,13 +103,25 @@ 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,
-      buildSettings: {
-        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
-      },
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

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

-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.APP_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,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
@@ -121,12 +173,25 @@ 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,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

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

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

-import { IosCredentials, Target } from '../../credentials/ios/types';
+import { IosCredentials } from '../../credentials/ios/types';
+import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
@@ -15,6 +15,7 @@ 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>
@@ -43,14 +44,22 @@ export async function createIosContextAsync(
    env: buildProfile.env,
  });
  const applicationTarget = findApplicationTarget(targets);
-  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
-
+  const buildNumberOverride =
+    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+      ? await resolveRemoteBuildNumberAsync({
+          projectDir: ctx.projectDir,
+          projectId: ctx.projectId,
+          exp: ctx.exp,
+          applicationTarget,
+          buildProfile,
+        })
+      : undefined;
  return {
    bundleIdentifier: applicationTarget.bundleIdentifier,
    applicationTarget,
-    applicationTargetBuildSettings,
    targets,
    xcodeBuildContext,
+    buildNumberOverride,
  };
 }

@@ -66,8 +75,11 @@ export async function prepareIosBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
-        buildSettings: ctx.ios.applicationTargetBuildSettings,
+        targets: ctx.ios.targets,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
      });
    },
    prepareJobAsync: async (
@@ -82,7 +94,8 @@ export async function prepareIosBuildAsync(
    sendBuildRequestAsync: async (
      appId: string,
      job: Ios.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
@@ -90,22 +103,8 @@ export async function prepareIosBuildAsync(
        appId,
        job: graphqlJob,
        metadata: graphqlMetadata,
+        buildParams,
      });
    },
  });
 }
-
-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 { Env, Ios } from '@expo/eas-build-job';
+import { Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';

 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
@@ -14,6 +14,7 @@ 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,
    artifactPath: job.artifactPath,
@@ -26,7 +27,6 @@ export function transformJob(job: Ios.Job): IosJobInput {

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

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

  return {
    buildCredentials,
-    environmentSecrets: secrets.env,
  };
 }
@@ -66,6 +66,11 @@ export async function prepareJobAsync(
    buildConfiguration: ctx.buildProfile.buildConfiguration,
    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 { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { IosVersionAutoIncrement } from '@expo/eas-json';

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

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  }
@@ -1,16 +1,25 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig, Updates } 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 } from '../utils/version';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

 export enum BumpStrategy {
  APP_VERSION,
@@ -22,21 +31,25 @@ export async function bumpVersionAsync({
  bumpStrategy,
  projectDir,
  exp,
-  buildSettings,
+  targets,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  bumpStrategy: BumpStrategy;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): 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 writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+  await updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    buildNumber: exp.ios?.buildNumber,
+    targets,
+  });
  Log.log('Synchronized versions with Info.plist');
 }

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

-async function writeInfoPlistAsync({
+export async function updateNativeVersionsAsync({
  projectDir,
-  infoPlist,
-  buildSettings,
+  version,
+  buildNumber,
+  targets,
 }: {
  projectDir: string;
-  infoPlist: IOSConfig.InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  version?: string;
+  buildNumber?: string;
+  targets: Target[];
 }): Promise<void> {
-  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  await writePlistAsync(infoPlistPath, infoPlist);
+  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);
+  }
 }

-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');
-  }
+function trimQuotes(s: string): string {
+  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
 }

 export function evaluateTemplateString(
@@ -216,3 +250,106 @@ 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 } from '@expo/eas-build-job';
+import { Job, Metadata } 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.85';
+const PLUGIN_PACKAGE_VERSION = '0.0.99';

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

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

-async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
-  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+async function getCommandAndArgsAsync(
+  job: Job,
+  metadata: Metadata
+): Promise<{ command: string; args: string[] }> {
+  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
    return {
      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobBase64],
+      args: [jobAndMetadataBase64],
    };
  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
    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,12 +24,13 @@ 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 = {
+  const metadata: Metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
@@ -43,14 +44,20 @@ export async function collectMetadataAsync<T extends Platform>(
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await getVcsClient().getCommitHashAsync(),
-    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitMessage: truncateGitCommitMessage(
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+    ),
+    isGitWorkingTreeDirty: await vcsClient.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);
 }
@@ -60,14 +67,32 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
    const iosContext = ctx as BuildContext<Platform.IOS>;
-    return await maybeResolveIosVersionsAsync(
+    const resolvedVersion = await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext.ios.applicationTargetBuildSettings
+      iosContext.ios.targets
    );
+    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>;
-    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      androidCtx.buildProfile
+    );
+    if (androidCtx.android.versionCodeOverride) {
+      return {
+        ...resolvedVersion,
+        appBuildVersion: androidCtx.android.versionCodeOverride,
+      };
+    }
+    return resolvedVersion;
  } else {
    throw new Error(`Unsupported platform ${ctx.platform}`);
  }
@@ -149,3 +174,13 @@ 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,9 +1,23 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
+import {
+  AppVersionSource,
+  BuildProfile,
+  EasJson,
+  EasJsonReader,
+  SubmitProfile,
+} from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

-import { AppPlatform, BuildFragment, BuildStatus, SubmissionFragment } from '../graphql/generated';
+import {
+  AppPlatform,
+  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 {
@@ -14,8 +28,14 @@ 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';
@@ -30,6 +50,7 @@ import { BuildContext } from './context';
 import { createBuildContextAsync } from './createContext';
 import { prepareIosBuildAsync } from './ios/build';
 import { LocalBuildOptions } from './local';
+import { UserInputResourceClass } from './types';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from './utils/repository';
@@ -47,8 +68,24 @@ export interface BuildFlags {
  autoSubmit: boolean;
  submitProfile?: string;
  localBuildOptions: LocalBuildOptions;
+  userInputResourceClass?: UserInputResourceClass;
+  message?: string;
 }

+const platformToGraphQLResourceClassMapping: Record<
+  Platform,
+  Record<UserInputResourceClass, BuildResourceClass>
+> = {
+  [Platform.ANDROID]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
+  },
+  [Platform.IOS]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  },
+};
+
 export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFlags): Promise<void> {
  await getVcsClient().ensureRepoExistsAsync();
  await ensureRepoIsCleanAsync(flags.nonInteractive);
@@ -58,6 +95,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    nonInteractive: flags.nonInteractive,
  });
  const easJsonReader = new EasJsonReader(projectDir);
+  const easJsonCliConfig: EasJson['cli'] = (await easJsonReader.getCliConfigAsync()) ?? {};

  const platforms = toPlatforms(flags.requestedPlatform);
  const buildProfiles = await getProfilesAsync({
@@ -73,8 +111,12 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    buildProfiles,
  });

+  for (const buildProfile of buildProfiles) {
+    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
+  }
+
  const startedBuilds: {
-    build: BuildFragment;
+    build: BuildWithSubmissionsFragment | BuildFragment;
    buildProfile: ProfileData<'build'>;
  }[] = [];
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
@@ -85,6 +127,11 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
      flags,
      moreBuilds: platforms.length > 1,
      buildProfile,
+      resourceClass:
+        platformToGraphQLResourceClassMapping[buildProfile.platform][
+          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+        ],
+      easJsonCliConfig,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -123,6 +170,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
        submitProfile,
        nonInteractive: flags.nonInteractive,
      });
+      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
      submissions.push(submission);
    }

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

  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 {
-    // the following function also exits with non zero code if any of the submissions failed
-    await waitForSubmissionsToCompleteAsync(submissions);
+    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);
  }
 }

@@ -161,20 +223,28 @@ async function prepareAndStartBuildAsync({
  flags,
  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,
+    resourceClass,
    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) {
@@ -186,7 +256,10 @@ 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);
@@ -12,3 +12,8 @@ export enum BuildDistributionType {
  INTERNAL = 'internal',
  SIMULATOR = 'simulator',
 }
+
+export enum UserInputResourceClass {
+  DEFAULT = 'default',
+  LARGE = 'large',
+}
@@ -14,7 +14,6 @@ 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 {
@@ -32,18 +31,14 @@ export function printLogsUrls(builds: BuildFragment[]): void {
  }
 }

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

@@ -99,14 +94,14 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
    return;
  }
  if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
-    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
+    Log.warn('This command is using API that soon will be deprecated. Upgrade 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. Please report it as a bug:');
+    Log.warn('An unexpected warning was encountered. Report it as a bug:');
    Log.warn(deprecationInfo);
  }
 }
@@ -28,7 +28,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  });

  if (!answer) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('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, please ${chalk.bold(
-      'commit all your changes before proceeding'
+    `This operation needs to be run on a clean working tree. ${chalk.bold(
+      'Commit all your changes before proceeding'
    )}.`
  );
  if (nonInteractive) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('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('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
  }
 }

@@ -1,5 +1,9 @@
 import { EasJsonReader } from '@expo/eas-json';
+import * as PackageManagerUtils from '@expo/package-manager';
 import { Command } from '@oclif/core';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
 import semver from 'semver';

 import {
@@ -8,6 +12,7 @@ import {
  initAsync as initAnalyticsAsync,
  logEvent,
 } from '../analytics/rudderstackClient';
+import { learnMore } from '../log';
 import { findProjectRootAsync } from '../project/projectUtils';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
@@ -28,8 +33,11 @@ export default abstract class EasCommand extends Command {
  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
    await initAnalyticsAsync();
+
    if (this.mustBeRunInsideProject) {
-      await this.applyCliConfigAsync();
+      const projectDir = await findProjectRootAsync();
+      await this.applyCliConfigAsync(projectDir);
+      await this.ensureEasCliIsNotInDependenciesAsync(projectDir);
    }

    if (this.requiresAuthentication) {
@@ -53,8 +61,7 @@ export default abstract class EasCommand extends Command {
    return super.finally(err);
  }

-  private async applyCliConfigAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
+  private async applyCliConfigAsync(projectDir: string): Promise<void> {
    const easJsonReader = new EasJsonReader(projectDir);
    const config = await easJsonReader.getCliConfigAsync();
    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
@@ -66,4 +73,50 @@ 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
+    );
+  }
 }
@@ -0,0 +1,58 @@
+import { Flags } from '@oclif/core';
+
+export const getPaginatedQueryOptions = (
+  flags: Record<keyof typeof EasPaginatedQueryFlags, any>
+): PaginatedQueryOptions => {
+  return {
+    json: flags.json ?? false,
+    offset: flags.offset ?? 0,
+    nonInteractive: flags['non-interactive'] ?? false,
+    ...('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),
+  }),
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+  }),
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+// options required to control a paginated query
+// from user input
+export type PaginatedQueryOptions = {
+  nonInteractive: boolean;
+  json: boolean;
+  limit?: number;
+  offset: number;
+};
@@ -91,7 +91,7 @@ export default class BranchCreate extends EasCommand {
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Please name the branch:',
+        message: 'Provide a branch name:',
        initial:
          (await getVcsClient().getBranchNameAsync()) ||
          `branch-${Math.random().toString(36).substr(2, 4)}`,
@@ -115,7 +115,7 @@ export default class BranchDelete extends EasCommand {
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Please enter the name of the branch to delete:',
+        message: 'Provide the name of the branch to delete:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -1,106 +1,28 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
+import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  BranchesByAppQuery,
-  BranchesByAppQueryVariables,
-  UpdateBranchFragment,
-} from '../../graphql/generated';
-import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
-import Log from '../../log';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-const BRANCHES_LIMIT = 10_000;
-
-export async function listBranchesAsync({
-  projectId,
-}: {
-  projectId: string;
-}): Promise<UpdateBranchFragment[]> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
-        gql`
-          query BranchesByAppQuery($appId: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  ...UpdateBranchFragment
-                }
-              }
-            }
-          }
-          ${print(UpdateBranchFragmentNode)}
-        `,
-        {
-          appId: projectId,
-          limit: BRANCHES_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
-      )
-      .toPromise()
-  );
-
-  return data?.app?.byId.updateBranches ?? [];
-}
+import { enableJsonOutput } from '../../utils/json';

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

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

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

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(exp);
-    const branches = await listBranchesAsync({ projectId });
-    if (flags.json) {
-      printJsonOnlyOutput(branches);
-    } else {
-      const table = new CliTable({
-        head: ['Branch', ...UPDATE_COLUMNS],
-        wordWrap: true,
-      });
-
-      table.push(
-        ...branches.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 with their most recent update group:'));
-      Log.log(table.toString());
-      if (branches.length >= BRANCHES_LIMIT) {
-        Log.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
-      }
-    }
+    await listAndRenderPaginatedBranchesAsync(projectId, options);
  }
 }
@@ -90,7 +90,7 @@ export default class BranchRename extends EasCommand {
      ({ currentName } = await promptAsync({
        type: 'text',
        name: 'currentName',
-        message: 'Please enter the current name of the branch to rename:',
+        message: "Provide the name of the branch you'd like 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: `Please rename ${currentName}`,
+        message: `Rename ${currentName}`,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -1,17 +1,10 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import Table from 'cli-table3';
-
+import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log from '../../log';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-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 { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
+import { enableJsonOutput } from '../../utils/json';

 export default class BranchView extends EasCommand {
  static description = 'view a branch';
@@ -25,18 +18,17 @@ export default class BranchView extends EasCommand {
  ];

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

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

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

-    if (!name) {
-      const validationMessage = 'Branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the branch to view:',
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
-
-    const { app } = await UpdateQuery.viewBranchAsync({
-      appId: projectId,
-      name,
-    });
-    const UpdateBranch = app?.byId.updateBranchByName;
-    if (!UpdateBranch) {
-      throw new Error(`Could not find branch "${name}"`);
-    }
-
-    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
-      group => group[0]
-    );
-
-    if (jsonFlag) {
-      printJsonOnlyOutput({ ...UpdateBranch, updates });
-    } else {
-      const groupTable = new Table({
-        head: UPDATE_COLUMNS,
-        wordWrap: true,
-      });
-
-      for (const update of updates) {
-        groupTable.push([
-          formatUpdate(update),
-          update.runtimeVersion,
-          update.group,
-          getPlatformsForGroup({
-            updates: UpdateBranch.updates,
-            group: update.group,
-          }),
-        ]);
+    // 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.');
      }

-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branch:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: UpdateBranch.name },
-          { label: 'ID', value: UpdateBranch.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Recently published update groups:'));
-      Log.log(groupTable.toString());
+      ({ 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 }
+      ));
    }
+
+    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
  }
 }
@@ -2,11 +2,14 @@ import { Errors, Flags } from '@oclif/core';
 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 from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { enableJsonOutput } from '../../utils/json';
+import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';

 interface RawBuildFlags {
  platform?: string;
@@ -21,6 +24,8 @@ interface RawBuildFlags {
  json: boolean;
  'auto-submit': boolean;
  'auto-submit-with-profile'?: string;
+  'resource-class'?: UserInputResourceClass;
+  message?: string;
 }

 export default class Build extends EasCommand {
@@ -79,21 +84,43 @@ export default class Build extends EasCommand {
      helpValue: 'PROFILE_NAME',
      exclusive: ['auto-submit'],
    }),
+    'resource-class': Flags.enum({
+      options: Object.values(UserInputResourceClass),
+      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 = await this.sanitizeFlagsAsync(rawFlags);
+    const flags = this.sanitizeFlags(rawFlags);

    const projectDir = await findProjectRootAsync();

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

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

-    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 });
-      }
-    }
+    const requestedPlatform =
+      flags.platform &&
+      Object.values(RequestedPlatform).includes(flags.platform.toLowerCase() as RequestedPlatform)
+        ? (flags.platform.toLowerCase() as RequestedPlatform)
+        : undefined;

    if (flags['skip-credentials-check']) {
      Log.warnDeprecatedFlag(
@@ -136,6 +153,11 @@ 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,
@@ -155,6 +177,34 @@ export default class Build extends EasCommand {
      json: flags['json'],
      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,
    };
  }
 }
@@ -0,0 +1,113 @@
+import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } 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 description = 'Update version of an app.';
+
+  static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios'],
+    }),
+    profile: Flags.string({
+      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 easJsonReader = new EasJsonReader(projectDir);
+    await ensureVersionSourceIsRemoteAsync(projectDir, easJsonReader);
+    const profile = await easJsonReader.getBuildProfileAsync(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';
+  }
+}
@@ -0,0 +1,183 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile, EasJsonReader } 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 description = 'Update a version in native code with a value stored on EAS servers';
+
+  public static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
+    profile: Flags.string({
+      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 easJsonReader = new EasJsonReader(projectDir);
+    await ensureVersionSourceIsRemoteAsync(projectDir, easJsonReader);
+
+    const platforms = toPlatforms(requestedPlatform);
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      easJsonReader,
+      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) });
+    }
+  }
+}
@@ -99,7 +99,7 @@ export default class ChannelCreate extends EasCommand {
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Please name the channel:',
+        message: 'Provide a channel name:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -70,7 +70,7 @@ export default class ChannelDelete extends EasCommand {
        await promptAsync({
          type: 'text',
          name: 'name',
-          message: 'Please enter the name of the channel to delete:',
+          message: 'Provide the name of the channel to delete:',
          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
        })
      ).name;
@@ -127,9 +127,7 @@ 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. Please manage it with "channel:rollout" instead.'
-      );
+      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
    }

    const branchName = flags.branch ?? (await promptForBranchAsync());
@@ -140,7 +138,7 @@ export default class ChannelEdit extends EasCommand {
    });
    if (!branch) {
      throw new Error(
-        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+        `Could not find a branch named "${branchName}". Check what branches exist on this project with ${chalk.bold(
          'eas branch:list'
        )}.`
      );
@@ -173,7 +171,7 @@ async function promptForChannelAsync(): Promise<string> {
  const { name } = await promptAsync({
    type: 'text',
    name: 'name',
-    message: 'Please enter the name of the channel to edit:',
+    message: 'Provide the name of the channel to edit:',
    validate: value => (value ? true : 'The channel name may not be empty.'),
  });
  return name;
@@ -92,7 +92,7 @@ async function startRolloutAsync({
  });
  if (!branch) {
    throw new Error(
-      `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+      `Could not find a branch named "${branchName}". Check which 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}". Please check what branches exist on this project with ${chalk.bold(
+        `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
          'eas branch:list'
        )}.`
      );
@@ -354,7 +354,7 @@ export default class ChannelRollout extends EasCommand {
    });
    if (!channel) {
      throw new Error(
-        `Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk.bold(
+        `Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk.bold(
          'eas channel:list'
        )}.`
      );
@@ -176,7 +176,7 @@ export default class ChannelView extends EasCommand {
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Please name the channel:',
+        message: 'Provide a channel name:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -1,10 +1,17 @@
+import { Flags } from '@oclif/core';
+
 import EasCommand from '../commandUtils/EasCommand';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';

 export default class Credentials extends EasCommand {
  static description = 'manage credentials';

+  static flags = {
+    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
+  };
+
  async runAsync(): Promise<void> {
-    await new SelectPlatform().runAsync();
+    const { flags } = await this.parse(Credentials);
+    await new SelectPlatform(flags.platform).runAsync();
  }
 }
@@ -51,11 +51,11 @@ export default class MetadataPull extends EasCommand {
      const relativePath = path.relative(process.cwd(), filePath);

      Log.addNewLineIfNone();
-      Log.log(`🎉 Your store configuration is ready.
+      Log.log(`🎉 Your store config 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 configuration.
+- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store config.
 - ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
    } catch (error: any) {
      handleMetadataError(error);
@@ -3,7 +3,11 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';
+import {
+  fetchProjectIdFromServerAsync,
+  findProjectRootAsync,
+  saveProjectIdToAppConfigAsync,
+} from '../../project/projectUtils';

 export default class ProjectInit extends EasCommand {
  static description = 'create or link an EAS project';
@@ -20,6 +24,9 @@ export default class ProjectInit extends EasCommand {
      return;
    }

-    await setProjectIdAsync(projectDir);
+    const projectId = await fetchProjectIdFromServerAsync(exp);
+    await saveProjectIdToAppConfigAsync(projectDir, projectId);
+
+    Log.withTick(`Linked app.json to project with ID ${chalk.bold(projectId)}`);
  }
 }
@@ -22,7 +22,7 @@ export default class EnvironmentSecretList extends EasCommand {
    const projectAccountName = await getProjectAccountNameAsync(exp);

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

    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
@@ -3,7 +3,7 @@ import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';

 import EasCommand from '../commandUtils/EasCommand';
-import { SubmissionFragment } from '../graphql/generated';
+import { StatuspageServiceName, SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -16,9 +16,14 @@ import {
 import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
-import { submitAsync, waitToCompleteAsync } from '../submit/submit';
+import {
+  exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
+  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;
@@ -87,18 +92,23 @@ export default class Submit extends EasCommand {

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

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

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

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

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

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

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

-    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 }
-        );
-      }
-    }
+    const requestedPlatform =
+      flags.platform &&
+      Object.values(RequestedPlatform).includes(flags.platform.toLowerCase() as RequestedPlatform)
+        ? (flags.platform.toLowerCase() as RequestedPlatform)
+        : undefined;

    return {
      archiveFlags,
@@ -167,4 +178,24 @@ 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,
+    };
+  }
 }
@@ -117,6 +117,7 @@ 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)) {
@@ -129,6 +130,26 @@ 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
@@ -142,6 +163,22 @@ 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;
    }
@@ -153,6 +190,14 @@ async function configureAppJSONForEASUpdateAsync({
        },
        updates,
      };
+      newConfigOnlyAddedValues = {
+        android: {
+          runtimeVersion: newAndroidRuntimeVersion,
+        },
+        updates: {
+          url: easUpdateURL,
+        },
+      };
      break;
    }
    case RequestedPlatform.Ios: {
@@ -163,6 +208,14 @@ async function configureAppJSONForEASUpdateAsync({
        },
        updates,
      };
+      newConfigOnlyAddedValues = {
+        ios: {
+          runtimeVersion: newIosRuntimeVersion,
+        },
+        updates: {
+          url: easUpdateURL,
+        },
+      };
      break;
    }
    default: {
@@ -219,7 +272,7 @@ async function configureAppJSONForEASUpdateAsync({
          'https://expo.fyi/eas-update-config.md'
        )}\n`
      );
-      Log.log(chalk.bold(JSON.stringify(newConfig, null, 2)));
+      Log.log(chalk.bold(JSON.stringify(newConfigOnlyAddedValues, null, 2)));
      Log.addNewLineIfNone();
      if (workflows['android'] === Workflow.GENERIC || workflows['ios'] === Workflow.GENERIC) {
        Log.warn(
@@ -242,8 +295,8 @@ async function configureAppJSONForEASUpdateAsync({
 }

 function isRuntimeEqual(
-  runtimeVersionA: string | { policy: 'sdkVersion' | 'nativeVersion' },
-  runtimeVersionB: string | { policy: 'sdkVersion' | 'nativeVersion' }
+  runtimeVersionA: string | { policy: 'sdkVersion' | 'nativeVersion' | 'appVersion' },
+  runtimeVersionB: string | { policy: 'sdkVersion' | 'nativeVersion' | 'appVersion' }
 ): boolean {
  if (typeof runtimeVersionA === 'string' && typeof runtimeVersionB === 'string') {
    return runtimeVersionA === runtimeVersionB;
@@ -9,6 +9,7 @@ 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';
@@ -18,6 +19,7 @@ import {
  PublishUpdateGroupInput,
  Robot,
  RootQueryUpdatesByGroupArgs,
+  StatuspageServiceName,
  Update,
  UpdateInfoGroup,
  UpdatePublishMutation,
@@ -25,8 +27,9 @@ import {
  ViewBranchUpdatesQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log, { link } from '../../log';
+import Log, { learnMore, link } from '../../log';
 import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
@@ -41,6 +44,7 @@ import {
  buildBundlesAsync,
  buildUnsortedUpdateInfoGroupAsync,
  collectAssetsAsync,
+  isUploadedAssetCountAboveWarningThreshold,
  uploadAssetsAsync,
 } from '../../project/publish';
 import { resolveWorkflowAsync } from '../../project/workflow';
@@ -56,9 +60,9 @@ import {
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 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'];
@@ -128,8 +132,8 @@ export async function ensureBranchExistsAsync({
 }: {
  appId: string;
  name: string;
-  limit?: number;
-  offset?: number;
+  limit: number;
+  offset: number;
 }): Promise<{
  id: string;
  updates: Exclude<
@@ -226,6 +230,7 @@ export default class UpdatePublish extends EasCommand {
        'non-interactive': nonInteractive,
      },
    } = await this.parse(UpdatePublish);
+
    if (jsonFlag) {
      enableJsonOutput();
    }
@@ -243,6 +248,8 @@ export default class UpdatePublish extends EasCommand {
      isPublicConfig: false,
    });

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

    const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion);
@@ -291,12 +298,16 @@ export default class UpdatePublish extends EasCommand {
        throw new Error(validationMessage);
      }

-      const branches = await listBranchesAsync({ projectId });
+      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. Creating a new one. Please name the new branch:',
+          message: 'No branches found. Provide a branch name:',
          initial:
            (await getVcsClient().getBranchNameAsync()) ||
            `branch-${Math.random().toString(36).substr(2, 4)}`,
@@ -321,6 +332,7 @@ export default class UpdatePublish extends EasCommand {
    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.
@@ -397,7 +409,7 @@ export default class UpdatePublish extends EasCommand {
        ({ publishMessage: message } = await promptAsync({
          type: 'text',
          name: 'publishMessage',
-          message: `Please enter an update message.`,
+          message: `Provide an update message.`,
          initial: `Republish "${oldMessage!}" - group: ${group}`,
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -419,7 +431,7 @@ export default class UpdatePublish extends EasCommand {
        ({ publishMessage: message } = await promptAsync({
          type: 'text',
          name: 'publishMessage',
-          message: `Please enter an update message.`,
+          message: `Provide an update message.`,
          initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -441,11 +453,17 @@ export default class UpdatePublish extends EasCommand {
      try {
        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
-        const { uniqueUploadedAssetCount } = await uploadAssetsAsync(
+        const uploadResults = await uploadAssetsAsync(
          assets,
-          spinnerText => (assetSpinner.text = `Uploading assets... ${spinnerText}`)
+          projectId,
+          (totalAssets, missingAssets) => {
+            assetSpinner.text = `Uploading assets. Finished (${
+              totalAssets - missingAssets
+            }/${totalAssets})`;
+          }
        );
-        uploadedAssetCount = uniqueUploadedAssetCount;
+        uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
+        assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
        const uploadAssetSuccessMessage = uploadedAssetCount
          ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'asset' : 'assets'}!`
@@ -457,6 +475,8 @@ export default class UpdatePublish extends EasCommand {
      }
    }

+    const truncatedMessage = truncatePublishUpdateMessage(message!);
+
    const runtimeToPlatformMapping: Record<string, string[]> = {};
    for (const runtime of new Set(Object.values(runtimeVersions))) {
      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
@@ -468,6 +488,7 @@ export default class UpdatePublish extends EasCommand {
      appId: projectId,
      name: branchName,
      limit: 0,
+      offset: 0,
    });

    // Sort the updates into different groups based on their platform specific runtime versions
@@ -489,7 +510,7 @@ export default class UpdatePublish extends EasCommand {
          branchId,
          updateInfoGroup: localUpdateInfoGroup,
          runtimeVersion: republish ? oldRuntimeVersion : runtime,
-          message,
+          message: truncatedMessage,
          awaitingCodeSigningInfo: !!codeSigningInfo,
        };
      }
@@ -562,7 +583,7 @@ export default class UpdatePublish extends EasCommand {
        const newUpdatesForRuntimeVersion = newUpdates.filter(
          update => update.runtimeVersion === runtime
        );
-        if (!newUpdatesForRuntimeVersion.length) {
+        if (newUpdatesForRuntimeVersion.length === 0) {
          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
        }
        const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
@@ -587,11 +608,23 @@ export default class UpdatePublish extends EasCommand {
              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
              : []),
            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: message! },
+            { label: 'Message', value: truncatedMessage },
            { label: 'Website link', value: updateGroupLink },
          ])
        );
        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();
+        }
      }
    }
  }
@@ -637,7 +670,7 @@ export async function getUpdatesToRepublishInteractiveAsync(
    title: formatUpdateTitle(update),
    value: update.group,
  }));
-  if (!updateGroups.length) {
+  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?`
    );
@@ -729,7 +762,17 @@ async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {

  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.`
+      `The update URL is incorrectly configured for EAS Update. Set updates.url to ${expectedURL} in your ${chalk.bold(
+        'app.json'
+      )}.`
    );
  }
 }
+
+export const truncatePublishUpdateMessage = (originalMessage: string): string => {
+  if (originalMessage.length > 1024) {
+    Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
+    return originalMessage.substring(0, 1021) + '...';
+  }
+  return originalMessage;
+};
@@ -4,24 +4,21 @@ import chalk from 'chalk';
 import CliTable from 'cli-table3';

 import EasCommand from '../../commandUtils/EasCommand';
-import { ViewAllUpdatesQuery } 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 { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
-import groupBy from '../../utils/expodash/groupBy';
+import { UPDATES_LIMIT } from '../../update/queries';
+import {
+  UPDATE_COLUMNS,
+  UpdateGroupDescription,
+  formatUpdate,
+  getUpdateGroupsWithPlatforms,
+} from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { getVcsClient } from '../../vcs';

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

@@ -55,10 +52,17 @@ export default class BranchView extends EasCommand {

    let updateGroupDescriptions: UpdateGroupDescription[];
    if (all) {
-      const branchesAndUpdates = await UpdateQuery.viewAllAsync({ appId: projectId });
-      updateGroupDescriptions = getUpdateGroupDescriptions(
-        branchesAndUpdates.app.byId.updateBranches
-      );
+      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());
    } else {
      let branchInteractive: string | undefined;
      if (!branchFlag) {
@@ -69,7 +73,7 @@ export default class BranchView extends EasCommand {
        ({ name: branchInteractive } = await promptAsync({
          type: 'text',
          name: 'name',
-          message: 'Please enter the name of the branch whose updates you wish to view:',
+          message: 'Provide the name of the branch whose updates you wish to view:',
          initial: (await getVcsClient().getBranchNameAsync()) ?? undefined,
          validate: (value: any) => (value ? true : validationMessage),
        }));
@@ -80,12 +84,16 @@ export default class BranchView extends EasCommand {
      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 = getUpdateGroupDescriptions([UpdateBranch]);
+      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
+        UpdateBranch.updates.map(update => ({ ...update, branch }))
+      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
    }

    if (jsonFlag) {
@@ -96,29 +104,6 @@ export default class BranchView extends EasCommand {
  }
 }

-function getUpdateGroupDescriptions(
-  branchesAndUpdates: ViewAllUpdatesQuery['app']['byId']['updateBranches']
-): UpdateGroupDescription[] {
-  const flattenedBranchesAndUpdates = branchesAndUpdates.flatMap(branch =>
-    branch.updates.map(update => {
-      return { branch: branch.name, ...update };
-    })
-  );
-  const updateGroupDescriptions = Object.values(
-    groupBy(flattenedBranchesAndUpdates, update => update.group)
-  ).map(updateGroup => {
-    const platforms = updateGroup
-      .map(update => update.platform)
-      .sort()
-      .join(', ');
-    return { ...updateGroup[0], platforms };
-  });
-  updateGroupDescriptions.sort(
-    (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
-  );
-  return updateGroupDescriptions;
-}
-
 function logAsTable(updateGroupDescriptions: UpdateGroupDescription[]): void {
  const table = new CliTable({
    head: ['Branch', ...UPDATE_COLUMNS],
@@ -18,6 +18,7 @@ export const jester2: Actor = {

 export const testUsername = jester.username;
 export const testSlug = 'testApp';
+export const testProjectId = '7ef93448-3bc7-4b57-be32-99326dcf24f0';
 export const testBundleIdentifier = 'test.com.app';
 export const testPackageName = 'test.com.app';
 export const testExperienceName = `@${testUsername}/${testSlug}`;
@@ -35,6 +36,11 @@ export const testAppJson = {
  sdkVersion: '38.0.0',
  ios: { bundleIdentifier: testBundleIdentifier },
  android: { package: testPackageName },
+  extra: {
+    eas: {
+      projectId: testProjectId,
+    },
+  },
 };

 export const testAppJsonWithDifferentOwner = {
@@ -54,7 +54,7 @@ export class RemoveKeystore {
      )
    );
    Log.warn(
-      'Please read https://docs.expo.dev/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.'
+      'Read https://docs.expo.dev/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.'
    );
    Log.newLine();
    Log.warn(
@@ -7,8 +7,8 @@ import {
  CommonAndroidAppCredentialsFragment,
  GoogleServiceAccountKeyFragment,
 } from '../../../graphql/generated';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { Account } from '../../../user/Account';
-import { AppQuery } from '../../ios/api/graphql/queries/AppQuery';
 import { GoogleServiceAccountKey, KeystoreWithType } from '../credentials';
 import { AndroidAppBuildCredentialsMutation } from './graphql/mutations/AndroidAppBuildCredentialsMutation';
 import { AndroidAppCredentialsMutation } from './graphql/mutations/AndroidAppCredentialsMutation';
@@ -1,5 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
+import { EasJson } from '@expo/eas-json';
 import chalk from 'chalk';

 import Log from '../log';
@@ -19,6 +20,7 @@ export class CredentialsContext {
  public readonly nonInteractive: boolean;
  public readonly projectDir: string;
  public readonly user: Actor;
+  public readonly easJsonCliConfig?: EasJson['cli'];

  private shouldAskAuthenticateAppStore: boolean = true;
  private resolvedExp?: ExpoConfig;
@@ -26,12 +28,14 @@ export class CredentialsContext {
  constructor(
    private options: {
      exp?: ExpoConfig;
+      easJsonCliConfig?: EasJson['cli'];
      nonInteractive?: boolean;
      projectDir: string;
      user: Actor;
      env?: Env;
    }
  ) {
+    this.easJsonCliConfig = options.easJsonCliConfig;
    this.projectDir = options.projectDir;
    this.user = options.user;
    this.nonInteractive = options.nonInteractive ?? false;
@@ -1,8 +1,6 @@
 export class MissingCredentialsNonInteractiveError extends Error {
  constructor(message?: string) {
-    super(
-      message ?? 'Credentials are not set up. Please run this command again in interactive mode.'
-    );
+    super(message ?? 'Credentials are not set up. Run this command again in interactive mode.');
  }
 }

@@ -1,10 +1,16 @@
 import { Platform } from '@expo/eas-build-job';
-import { CredentialsSource, DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
+import {
+  CredentialsSource,
+  DistributionType,
+  EasJsonReader,
+  IosEnterpriseProvisioning,
+} from '@expo/eas-json';
+import fs from 'fs-extra';

 import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
 import Log from '../../log';
 import { findApplicationTarget } from '../../project/ios/target';
-import { confirmAsync } from '../../prompts';
+import { selectAsync } from '../../prompts';
 import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
@@ -21,6 +27,12 @@ interface Options {
  enterpriseProvisioning?: IosEnterpriseProvisioning;
 }

+enum PushNotificationSetupOption {
+  YES,
+  NO,
+  NO_DONT_ASK_AGAIN,
+}
+
 export default class IosCredentialsProvider {
  public readonly platform = Platform.IOS;

@@ -89,13 +101,39 @@ export default class IosCredentialsProvider {
      return null;
    }

-    const confirmSetup = await confirmAsync({
-      message: `Would you like to set up Push Notifications for your project?`,
-    });
-    if (!confirmSetup) {
+    if (ctx.easJsonCliConfig?.promptToConfigurePushNotifications === false) {
      return null;
    }
-    return await setupPushKeyAction.runAsync(ctx);
+
+    const setupOption = await selectAsync(
+      `Would you like to set up Push Notifications for your project?`,
+      [
+        { title: 'Yes', value: PushNotificationSetupOption.YES },
+        { title: 'No', value: PushNotificationSetupOption.NO },
+        {
+          title: `No, don't ask again (preference will be saved to eas.json)`,
+          value: PushNotificationSetupOption.NO_DONT_ASK_AGAIN,
+        },
+      ]
+    );
+    if (setupOption === PushNotificationSetupOption.YES) {
+      return await setupPushKeyAction.runAsync(ctx);
+    } else {
+      if (setupOption === PushNotificationSetupOption.NO_DONT_ASK_AGAIN) {
+        await this.disablePushNotificationsSetupInEasJsonAsync(ctx);
+      }
+      return null;
+    }
+  }
+
+  private async disablePushNotificationsSetupInEasJsonAsync(
+    ctx: CredentialsContext
+  ): Promise<void> {
+    const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
+    const easJson = await fs.readJSON(easJsonPath);
+    easJson.cli = { ...easJson?.cli, promptToConfigurePushNotifications: false };
+    await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+    Log.withTick('Updated eas.json');
  }

  private assertProvisioningProfileType(provisioningProfile: string, targetName?: string): void {
@@ -147,8 +147,8 @@ const APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR = `
 You can have only ${chalk.underline(
  'three'
 )} Apple Distribution Certificates generated on your Apple Developer account.
-Please revoke the old ones or reuse existing from your other apps.
-Please remember that Apple Distribution Certificates are not application specific!
+Revoke the old ones or reuse existing from your other apps.
+Remember that Apple Distribution Certificates are not application specific!
 `;

 export async function provideOrGenerateDistributionCertificateAsync(
@@ -45,7 +45,7 @@ export class SetUpAdhocProvisioningProfile {
        return nullthrows(await getBuildCredentialsAsync(ctx, this.app, IosDistributionType.AdHoc));
      } else {
        throw new MissingCredentialsNonInteractiveError(
-          'Provisioning profile is not configured correctly. Please run this command again in interactive mode.'
+          'Provisioning profile is not configured correctly. Run this command again in interactive mode.'
        );
      }
    }
@@ -254,11 +254,11 @@ export class SetUpAdhocProvisioningProfile {
    ctx: CredentialsContext,
    appleTeam: AppleTeamFragment
  ): Promise<AppleDeviceFragment[]> {
-    const action = new DeviceCreateAction(this.app.account, appleTeam);
+    const action = new DeviceCreateAction(ctx.appStore, this.app.account, appleTeam);
    const method = await action.runAsync();

    while (true) {
-      if (method !== RegistrationMethod.INPUT) {
+      if (method === RegistrationMethod.WEBSITE) {
        Log.newLine();
        Log.log(chalk.bold("Press any key if you've already finished device registration."));
        await pressAnyKeyToContinueAsync();
@@ -70,7 +70,7 @@ export class SetUpInternalProvisioningProfile {
    } else {
      if (adhocBuildCredentialsExist && enterpriseBuildCredentialsExist) {
        throw new Error(
-          `You're in non-interactive mode. You have set up both adhoc and universal distribution credentials. Please set the 'enterpriseProvisioning' property (to 'adhoc' or 'universal') in eas.json to choose the credentials to use.`
+          `You're in non-interactive mode. You have set up both adhoc and universal distribution credentials. Set the 'enterpriseProvisioning' property (to 'adhoc' or 'universal') in eas.json to choose the credentials to use.`
        );
      } else if (adhocBuildCredentialsExist) {
        return await this.setupAdhocProvisioningProfileAsync(ctx);
@@ -78,7 +78,7 @@ export class SetUpInternalProvisioningProfile {
        return await this.setupUniversalProvisioningProfileAsync(ctx);
      } else {
        throw new Error(
-          `You're in non-interactive mode. EAS CLI couldn't find any credentials suitable for internal distribution. Please run again in interactive mode.`
+          `You're in non-interactive mode. EAS CLI couldn't find any credentials suitable for internal distribution. Run this command again in interactive mode.`
        );
      }
    }
@@ -95,7 +95,7 @@ export class SetUpProvisioningProfile {
    }
    if (ctx.nonInteractive) {
      throw new MissingCredentialsNonInteractiveError(
-        'Provisioning profile is not configured correctly. Please run this command again in interactive mode.'
+        'Provisioning profile is not configured correctly. Run this command again in interactive mode.'
      );
    }

@@ -48,7 +48,7 @@ export class SetUpSubmissionCredentials {

  async promptForAppSpecificPasswordAsync(): Promise<string> {
    Log.addNewLineIfNone();
-    Log.log(`Please enter your Apple app-specific password.`);
+    Log.log(`Enter your Apple app-specific password.`);
    Log.log(learnMore('https://expo.fyi/apple-app-specific-password'));
    Log.warn(
      wrapAnsi(
@@ -14,6 +14,7 @@ import {
  IosAppBuildCredentialsFragment,
  IosDistributionType,
 } from '../../../graphql/generated';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { isWildcardBundleIdentifier } from '../../../project/ios/bundleIdentifier';
 import { Account } from '../../../user/Account';
 import { DistributionCertificate, PushKey } from '../appstore/Credentials.types';
@@ -33,7 +34,6 @@ import { ApplePushKeyMutation } from './graphql/mutations/ApplePushKeyMutation';
 import { AppleTeamMutation } from './graphql/mutations/AppleTeamMutation';
 import { IosAppBuildCredentialsMutation } from './graphql/mutations/IosAppBuildCredentialsMutation';
 import { IosAppCredentialsMutation } from './graphql/mutations/IosAppCredentialsMutation';
-import { AppQuery } from './graphql/queries/AppQuery';
 import { AppStoreConnectApiKeyQuery } from './graphql/queries/AppStoreConnectApiKeyQuery';
 import { AppleAppIdentifierQuery } from './graphql/queries/AppleAppIdentifierQuery';
 import { AppleDeviceQuery } from './graphql/queries/AppleDeviceQuery';
@@ -1,14 +1,14 @@
-import { ApiKey, ApiKeyType, UserRole } from '@expo/apple-utils';
+import { ApiKey, ApiKeyType, UnexpectedResponse, UserRole } from '@expo/apple-utils';

 import {
  createAscApiKeyAsync,
+  downloadWithRetryAsync,
  getAscApiKeyAsync,
  listAscApiKeysAsync,
  revokeAscApiKeyAsync,
 } from '../ascApiKey';
 import { getRequestContext } from '../authenticate';

-jest.mock('@expo/apple-utils');
 jest.mock('../authenticate');
 jest.mock('../../../../ora');

@@ -96,3 +96,38 @@ test(`revokeAscApiKeyAsync`, async () => {
  expect(mockApiKey.revokeAsync).toBeCalled();
  expect(result).toEqual(mockAscApiKeyInfo);
 });
+
+test(`downloadWithRetryAsync`, async () => {
+  const cacheFailureMessage = `The specified resource does not exist - There is no resource of type 'apiKeys' with id 'TEST-ID'`;
+
+  // complete failure
+  const mockApiKeyWithDownloadError = {
+    ...mockApiKey,
+    downloadAsync: jest.fn(() => {
+      throw new UnexpectedResponse(cacheFailureMessage);
+    }),
+  } as unknown as ApiKey;
+  await expect(
+    downloadWithRetryAsync(mockApiKeyWithDownloadError, { minTimeout: 1 }) // stay within jest timeout window
+  ).rejects.toThrowError(cacheFailureMessage);
+  // expect to try once and retry 3 times = 4 total
+  expect(mockApiKeyWithDownloadError.downloadAsync as jest.Mock).toBeCalledTimes(7);
+
+  // one time failure
+  const mockApiKeyWithOneTimeDownloadError = mockApiKey as unknown as ApiKey;
+  (mockApiKeyWithOneTimeDownloadError.downloadAsync as jest.Mock).mockClear();
+  (mockApiKeyWithOneTimeDownloadError.downloadAsync as jest.Mock).mockImplementationOnce(() => {
+    throw new UnexpectedResponse(cacheFailureMessage);
+  });
+  const keyP8AfterOneFailure = await downloadWithRetryAsync(mockApiKeyWithOneTimeDownloadError, {
+    minTimeout: 1,
+  });
+  expect(keyP8AfterOneFailure).toBe('super secret');
+
+  // successful case
+  (mockApiKey.downloadAsync as jest.Mock).mockClear();
+  const keyP8NoFailure = await downloadWithRetryAsync(mockApiKeyWithOneTimeDownloadError, {
+    minTimeout: 1,
+  });
+  expect(keyP8NoFailure).toBe('super secret');
+});
@@ -94,6 +94,30 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      'com.apple.security.application-groups': [
        'group.CY-A5149AC2-49FC-11E7-B3F3-0335A16FFB8D.com.cydia.Extender',
      ],
+
+      'com.apple.developer.fileprovider.testing-mode': true,
+      'com.apple.developer.healthkit.recalibrate-estimates': true,
+      'com.apple.developer.maps': true,
+      'com.apple.developer.user-management': true,
+      'com.apple.developer.networking.custom-protocol': true,
+      'com.apple.developer.system-extension.install': true,
+      'com.apple.developer.push-to-talk': true,
+      'com.apple.developer.driverkit.transport.usb': true,
+      'com.apple.developer.kernel.increased-memory-limit': true,
+      'com.apple.developer.driverkit.communicates-with-drivers': true,
+      'com.apple.developer.media-device-discovery-extension': true,
+      'com.apple.developer.driverkit.allow-third-party-userclients': true,
+      'com.apple.developer.weatherkit': true,
+      'com.apple.developer.on-demand-install-capable': true,
+      'com.apple.developer.driverkit.family.scsicontroller': true,
+      'com.apple.developer.driverkit.family.serial': true,
+      'com.apple.developer.driverkit.family.networking': true,
+      'com.apple.developer.driverkit.family.hid.eventservice': true,
+      'com.apple.developer.driverkit.family.hid.device': true,
+      'com.apple.developer.driverkit': true,
+      'com.apple.developer.driverkit.transport.hid': true,
+      'com.apple.developer.driverkit.family.audio': true,
+      'com.apple.developer.shared-with-you': true,
    });

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
@@ -135,36 +159,153 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      },
      { capabilityType: 'AUTOFILL_CREDENTIAL_PROVIDER', option: 'ON' },
      { capabilityType: 'APP_GROUPS', option: 'ON' },
+      {
+        capabilityType: 'FILEPROVIDER_TESTINGMODE',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'HEALTHKIT_RECALIBRATE_ESTIMATES',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'MAPS',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'USER_MANAGEMENT',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'NETWORK_CUSTOM_PROTOCOL',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'SYSTEM_EXTENSION_INSTALL',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'PUSH_TO_TALK',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_USBTRANSPORT_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'INCREASED_MEMORY_LIMIT',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_COMMUNICATESWITHDRIVERS',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'MEDIA_DEVICE_DISCOVERY',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_ALLOWTHIRDPARTY_USERCLIENTS',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'WEATHERKIT',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'ONDEMANDINSTALL_EXTENSIONS',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_SCSICONTROLLER_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_SERIAL_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_NETWORKING_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_HIDEVENTSERVICE_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_HIDDEVICE_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_PUBLIC',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_TRANSPORT_HID_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'DRIVERKIT_FAMILY_AUDIO_PUB',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'SHARED_WITH_YOU',
+        option: 'ON',
+      },
    ]);

-    expect(results.enabled).toStrictEqual([
-      'HealthKit',
-      'Apple Pay Payment Processing',
-      'iCloud',
-      'ClassKit',
-      'Data Protection',
-      'Network Extensions',
-      'Personal VPN',
-      'Hotspot',
-      'Extended Virtual Address Space',
-      'HomeKit',
-      'Multipath',
-      'Wireless Accessory Configuration',
-      'Inter-App Audio',
-      'Wallet',
-      'Fonts',
-      'App Attest',
-      'NFC Tag Reading',
-      'Sign In with Apple',
-      'SiriKit',
-      'Access WiFi Information',
-      'Communication Notifications',
-      'Time Sensitive Notifications',
-      'Group Activities',
-      'Family Controls',
-      'AutoFill Credential Provider',
-      'App Groups',
-    ]);
+    expect(results.enabled).toMatchInlineSnapshot(`
+      Array [
+        "HealthKit",
+        "Apple Pay Payment Processing",
+        "iCloud",
+        "ClassKit",
+        "Data Protection",
+        "Network Extensions",
+        "Personal VPN",
+        "Hotspot",
+        "Extended Virtual Address Space",
+        "HomeKit",
+        "Multipath",
+        "Wireless Accessory Configuration",
+        "Inter-App Audio",
+        "Wallet",
+        "Fonts",
+        "App Attest",
+        "NFC Tag Reading",
+        "Sign In with Apple",
+        "SiriKit",
+        "Access WiFi Information",
+        "Communication Notifications",
+        "Time Sensitive Notifications",
+        "Group Activities",
+        "Family Controls",
+        "AutoFill Credential Provider",
+        "App Groups",
+        "FileProvider TestingMode",
+        "Recalibrate Estimates",
+        "Maps",
+        "TV Services",
+        "Custom Network Protocol",
+        "System Extension",
+        "Push to Talk",
+        "DriverKit USB Transport (development)",
+        "Increased Memory Limit",
+        "Communicates with Drivers",
+        "Media Device Discovery",
+        "DriverKit Allow Third Party UserClients",
+        "WeatherKit",
+        "On Demand Install Capable for App Clip Extensions",
+        "DriverKit Family SCSIController (development)",
+        "DriverKit Family Serial (development)",
+        "DriverKit Family Networking (development)",
+        "DriverKit Family HID EventService (development)",
+        "DriverKit Family HID Device (development)",
+        "DriverKit for Development",
+        "DriverKit Transport HID (development)",
+        "DriverKit Family Audio (development)",
+        "Shared with You",
+      ]
+    `);
    expect(results.disabled).toStrictEqual([]);
  });

@@ -153,7 +153,7 @@ describe(syncCapabilityIdentifiersForEntitlementsAsync, () => {
      (_ctx: any, { identifier }: { identifier: string }): any => {
        // e2e test with: merchant.expodemo
        throw new Error(
-          `There is a problem with the request entity - A Merchant ID with Identifier '${identifier}' is not available. Please enter a different string.`
+          `There is a problem with the request entity - A Merchant ID with Identifier '${identifier}' is not available. Enter a different string.`
        );
      }
    );
@@ -167,6 +167,6 @@ describe(syncCapabilityIdentifiersForEntitlementsAsync, () => {
      syncCapabilityIdentifiersForEntitlementsAsync(bundleId, {
        'com.apple.developer.in-app-payments': ['merchant.bacon'],
      })
-    ).rejects.toThrow(/is not available. Please enter a different string/);
+    ).rejects.toThrow(/is not available. Enter a different string/);
  });
 });
@@ -1,6 +1,8 @@
 import { ApiKey, ApiKeyProps, ApiKeyType, UserRole } from '@expo/apple-utils';
+import promiseRetry from 'promise-retry';

-import Log from '../../../log';
+import { Analytics, SubmissionEvent } from '../../../analytics/events';
+import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
 import { AscApiKey, AscApiKeyInfo } from './Credentials.types';
 import { getRequestContext } from './authenticate';
@@ -49,6 +51,73 @@ export async function getAscApiKeyAsync(
  }
 }

+/**
+ * There is a bug in Apple's infrastructure that does not propagate newly created objects for a
+ * while. If the key has not propagated and you try to download it, Apple will error saying that
+ * the resource does not exist. We retry with exponential backoff until the key propagates and
+ * is available for download.
+ * */
+export async function downloadWithRetryAsync(
+  key: ApiKey,
+  {
+    minTimeout = 1000,
+    retries = 6,
+    factor = 2,
+  }: { minTimeout?: number; retries?: number; factor?: number } = {}
+): Promise<string | null> {
+  const RESOURCE_DOES_NOT_EXIST_MESSAGE =
+    'The specified resource does not exist - There is no resource of type';
+  try {
+    const keyP8 = await promiseRetry(
+      async (retry, number) => {
+        try {
+          return await key.downloadAsync();
+        } catch (e: any) {
+          if (
+            e.name === 'UnexpectedAppleResponse' &&
+            e.message.includes(RESOURCE_DOES_NOT_EXIST_MESSAGE)
+          ) {
+            const secondsToRetry = Math.pow(factor, number);
+            Log.log(
+              `Received an unexpected response from Apple, retrying in ${secondsToRetry} seconds...`
+            );
+            Analytics.logEvent(SubmissionEvent.API_KEY_DOWNLOAD_RETRY, {
+              errorName: e.name,
+              reason: e.message,
+              retry: number,
+            });
+            return retry(e);
+          }
+          throw e;
+        }
+      },
+      {
+        retries,
+        factor,
+        minTimeout,
+      }
+    );
+    Analytics.logEvent(SubmissionEvent.API_KEY_DOWNLOAD_SUCCESS, {});
+    return keyP8;
+  } catch (e: any) {
+    if (
+      e.name === 'UnexpectedAppleResponse' &&
+      e.message.includes(RESOURCE_DOES_NOT_EXIST_MESSAGE)
+    ) {
+      Log.warn(
+        `Unable to download Api Key from Apple at this time. Create and upload your key manually by running 'eas credentials' ${learnMore(
+          'https://expo.fyi/creating-asc-api-key'
+        )}`
+      );
+    }
+    Analytics.logEvent(SubmissionEvent.API_KEY_DOWNLOAD_FAIL, {
+      errorName: e.name,
+      reason: e.message,
+    });
+    throw e;
+  }
+}
+
 /**
 * Create an App Store Connect API Key.
 * **Does not support App Store Connect API (CI).**
@@ -71,7 +140,7 @@ export async function createAscApiKeyAsync(
      roles: roles ?? [UserRole.ADMIN],
      keyType: keyType ?? ApiKeyType.PUBLIC_API,
    });
-    const keyP8 = await key.downloadAsync();
+    const keyP8 = await downloadWithRetryAsync(key);
    if (!keyP8) {
      const { nickname, roles } = key.attributes;
      const humanReadableKey = `App Store Connect Key '${nickname}' (${
@@ -484,6 +484,7 @@ export const CapabilityMapping: CapabilityClassifier[] = [
  {
    // https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_networking_vpn_api
    name: 'Push Notifications',
+    // com.apple.developer.aps-environment
    entitlement: 'aps-environment',
    capability: CapabilityType.PUSH_NOTIFICATIONS,
    validateOptions: validateDevProdString,
@@ -522,6 +523,181 @@ export const CapabilityMapping: CapabilityClassifier[] = [
    validateOptions: validateDevProdString,
    getOptions: getDefinedOptions,
  },
+  {
+    entitlement: 'com.apple.developer.coremedia.hls.low-latency',
+    name: 'Low Latency HLS',
+    capability: CapabilityType.HLS_LOW_LATENCY,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.associated-domains.mdm-managed',
+    name: 'MDM Managed Associated Domains',
+    capability: CapabilityType.MDM_MANAGED_ASSOCIATED_DOMAINS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.fileprovider.testing-mode',
+    name: 'FileProvider TestingMode',
+    capability: CapabilityType.FILE_PROVIDER_TESTING_MODE,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.healthkit.recalibrate-estimates',
+    name: 'Recalibrate Estimates',
+    capability: CapabilityType.HEALTH_KIT_RECALIBRATE_ESTIMATES,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.maps',
+    name: 'Maps',
+    capability: CapabilityType.MAPS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.user-management',
+    name: 'TV Services',
+    capability: CapabilityType.USER_MANAGEMENT,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.networking.custom-protocol',
+    name: 'Custom Network Protocol',
+    capability: CapabilityType.NETWORK_CUSTOM_PROTOCOL,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.system-extension.install',
+    name: 'System Extension',
+    capability: CapabilityType.SYSTEM_EXTENSION_INSTALL,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.push-to-talk',
+    name: 'Push to Talk',
+    capability: CapabilityType.PUSH_TO_TALK,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.transport.usb',
+    name: 'DriverKit USB Transport (development)',
+    capability: CapabilityType.DRIVER_KIT_USB_TRANSPORT_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.kernel.increased-memory-limit',
+    name: 'Increased Memory Limit',
+    capability: CapabilityType.INCREASED_MEMORY_LIMIT,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.communicates-with-drivers',
+    name: 'Communicates with Drivers',
+    capability: CapabilityType.DRIVER_KIT_COMMUNICATES_WITH_DRIVERS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.media-device-discovery-extension',
+    name: 'Media Device Discovery',
+    capability: CapabilityType.MEDIA_DEVICE_DISCOVERY,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.allow-third-party-userclients',
+    name: 'DriverKit Allow Third Party UserClients',
+    capability: CapabilityType.DRIVER_KIT_ALLOW_THIRD_PARTY_USER_CLIENTS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.weatherkit',
+    name: 'WeatherKit',
+    capability: CapabilityType.WEATHER_KIT,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.on-demand-install-capable',
+    name: 'On Demand Install Capable for App Clip Extensions',
+    capability: CapabilityType.ON_DEMAND_INSTALL_EXTENSIONS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.scsicontroller',
+    name: 'DriverKit Family SCSIController (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_SCSI_CONTROLLER_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.serial',
+    name: 'DriverKit Family Serial (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_SERIAL_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.networking',
+    name: 'DriverKit Family Networking (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_NETWORKING_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.hid.eventservice',
+    name: 'DriverKit Family HID EventService (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_HID_EVENT_SERVICE_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.hid.device',
+    name: 'DriverKit Family HID Device (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_HID_DEVICE_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit',
+    name: 'DriverKit for Development',
+    capability: CapabilityType.DRIVER_KIT_PUBLIC,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.transport.hid',
+    name: 'DriverKit Transport HID (development)',
+    capability: CapabilityType.DRIVER_KIT_TRANSPORT_HID_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.driverkit.family.audio',
+    name: 'DriverKit Family Audio (development)',
+    capability: CapabilityType.DRIVER_KIT_FAMILY_AUDIO_PUB,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.shared-with-you',
+    name: 'Shared with You',
+    capability: CapabilityType.SHARED_WITH_YOU,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },

  // These don't appear to have entitlements, so it's unclear how we can automatically enable / disable them at this time.
  // TODO: Maybe add a warning about manually enabling features?
@@ -534,24 +710,9 @@ export const CapabilityMapping: CapabilityClassifier[] = [
  //   },
  //   {
  //     entitlement: '',
-  //     name: 'FileProvider TestingMode',
-  //     capability: 'FILEPROVIDER_TESTINGMODE',
-  //   },
-  //   {
-  //     entitlement: '',
  //     name: 'HLS Interstitial Previews',
  //     capability: 'HLS_INTERSTITIAL_PREVIEW',
  //   },
-  //   {
-  //     entitlement: '',
-  //     name: 'Low Latency HLS',
-  //     capability: 'COREMEDIA_HLS_LOW_LATENCY',
-  //   },
-  //   {
-  //     entitlement: '',
-  //     name: 'MDM Managed Associated Domains',
-  //     capability: 'MDM_MANAGED_ASSOCIATED_DOMAINS',
-  //   },

  // "Game Controllers" doesn't appear in Dev Portal but it does show up in Xcode,
  // toggling in Xcode causes no network request to be sent.
@@ -67,7 +67,7 @@ async function getRequiredContractMessagesAsync(
  // prompt the user to open an issue so we can address the new contract state if it ever appears.
  // TODO: Maybe a silent analytic would be better
  Log.error(
-    `\nUnexpected Apple developer contract status "${status}". Please open an issue on https://github.com/expo/eas-cli`
+    `\nUnexpected Apple developer contract status "${status}". Open an issue on https://github.com/expo/eas-cli`
  );
  Log.newLine();
  return { messages: (await getContractMessagesAsync(context)) ?? [], isFatal: false };
@@ -62,7 +62,7 @@ export async function ensureBundleIdExistsWithNameAsync(
      spinner.fail(
        `The bundle identifier ${chalk.bold(bundleIdentifier)} is not available to team "${
          authCtx.team.name
-        }" (${authCtx.team.id}), please change it in your app config and try again.`
+        }" (${authCtx.team.id}), change it in your app config and try again.`
      );
    } else {
      spinner.fail(`Failed to register bundle identifier ${chalk.dim(bundleIdentifier)}`);
@@ -196,13 +196,13 @@ export async function ensureAppExistsAsync(
    } catch (error: any) {
      if (error.message.match(/An App ID with Identifier '(.*)' is not available/)) {
        throw new Error(
-          `\nThe bundle identifier "${bundleIdentifier}" is not available to provider "${userAuthCtx.authState?.session.provider.name}. Please change it in your app config and try again.\n`
+          `\nThe bundle identifier "${bundleIdentifier}" is not available to provider "${userAuthCtx.authState?.session.provider.name}. Change it in your app config and try again.\n`
        );
      }

      spinner.fail(`Failed to create App Store app ${chalk.dim(name)}`);
      error.message +=
-        '\nPlease visit https://appstoreconnect.apple.com and resolve any warnings, then try again.';
+        '\nVisit https://appstoreconnect.apple.com and resolve any warnings, then try again.';
      throw error;
    }
  } else {
@@ -12,8 +12,8 @@ const { MaxKeysCreatedError } = Keys;

 export const APPLE_KEYS_TOO_MANY_GENERATED_ERROR = `
 You can have only ${chalk.underline('two')} Apple Keys generated on your Apple Developer account.
-Please revoke the old ones or reuse existing from your other apps.
-Please remember that Apple Keys are not application specific!
+Revoke the old ones or reuse existing from your other apps.
+Remember that Apple Keys are not application specific!
 `;

 /**
@@ -1,4 +1,5 @@
 import { JSONObject } from '@expo/json-file';
+import type { XCBuildConfiguration } from 'xcode';

 import {
  CommonIosAppCredentialsFragment,
@@ -17,6 +18,7 @@ export interface Target {
  bundleIdentifier: string;
  parentBundleIdentifier?: string;
  entitlements: JSONObject;
+  buildSettings?: XCBuildConfiguration['buildSettings'];
 }

 export interface TargetCredentials {
@@ -4,10 +4,7 @@ import assert from 'assert';

 import Log, { learnMore } from '../../log';
 import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
-import {
-  getProjectAccountName,
-  promptToCreateProjectIfNotExistsAsync,
-} from '../../project/projectUtils';
+import { getProjectAccountName, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
@@ -80,12 +77,6 @@ export class ManageAndroid {
    while (true) {
      try {
        if (ctx.hasProjectContext) {
-          const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
-          if (!maybeProjectId) {
-            throw new Error(
-              'Your project must be registered with EAS in order to use the credentials manager.'
-            );
-          }
          const appLookupParams = await getAppLookupParamsFromContextAsync(ctx, gradleContext);
          const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(
            appLookupParams
@@ -156,12 +147,10 @@ export class ManageAndroid {
    buildProfile: BuildProfile<Platform.ANDROID>
  ): Promise<GradleBuildContext | undefined> {
    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-    const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
-    if (!maybeProjectId) {
-      throw new Error(
-        'Your project must be registered with EAS in order to use the credentials manager.'
-      );
-    }
+
+    // ensure the project exists on the EAS server
+    await getProjectIdAsync(ctx.exp);
+
    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
  }

@@ -11,10 +11,7 @@ import {
 import Log, { learnMore } from '../../log';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { resolveTargetsAsync } from '../../project/ios/target';
-import {
-  getProjectAccountName,
-  promptToCreateProjectIfNotExistsAsync,
-} from '../../project/projectUtils';
+import { getProjectAccountName, getProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
 import { Account, findAccountByName } from '../../user/Account';
 import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
@@ -175,12 +172,9 @@ export class ManageIos {
    targets: Target[];
  }> {
    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-    const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
-    if (!maybeProjectId) {
-      throw new Error(
-        'Your project must be registered with EAS in order to use the credentials manager.'
-      );
-    }
+
+    // ensure the project exists on the EAS server
+    await getProjectIdAsync(ctx.exp);

    const app = { account, projectName: ctx.exp.slug };
    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
@@ -45,7 +45,7 @@ export class SelectIosDistributionTypeGraphqlFromBuildProfile {

    if (ctx.nonInteractive) {
      throw new Error(
-        'Unable to determine type of internal distribution. Please run this command in interactive mode.'
+        'Unable to determine type of internal distribution. Run this command in interactive mode.'
      );
    }

@@ -1,22 +1,16 @@
-import { promptAsync } from '../../prompts';
+import { selectPlatformAsync } from '../../platform';
 import { ManageAndroid } from './ManageAndroid';
 import { ManageIos } from './ManageIos';

 export class SelectPlatform {
+  constructor(private readonly flagPlatform?: string) {}
+
  async runAsync(): Promise<void> {
-    const { platform } = await promptAsync({
-      type: 'select',
-      name: 'platform',
-      message: 'Select platform',
-      choices: [
-        { value: 'android', title: 'Android' },
-        { value: 'ios', title: 'iOS' },
-      ],
-    });
+    const platform = await selectPlatformAsync(this.flagPlatform);

    if (platform === 'ios') {
-      return await new ManageIos(new SelectPlatform(), process.cwd()).runAsync();
+      return await new ManageIos(new SelectPlatform(platform), process.cwd()).runAsync();
    }
-    return await new ManageAndroid(new SelectPlatform(), process.cwd()).runAsync();
+    return await new ManageAndroid(new SelectPlatform(platform), process.cwd()).runAsync();
  }
 }
@@ -28,7 +28,7 @@ const EXPERT_PROMPT = (): void => {
  }
  Log.warn(`
 In this mode, we won't be able to make sure that your credentials are valid.
-Please double check that you're uploading valid files for your app otherwise you may encounter strange errors!
+Double check that you're uploading valid files for your app otherwise you may encounter strange errors!
 When building for IOS make sure you've created your App ID on the Apple Developer Portal, that your App ID
 is in app.json as \`bundleIdentifier\`, and that the provisioning profile you
 upload matches that Team ID and App ID.
@@ -0,0 +1 @@
+export const runDeveloperPortalMethodAsync = jest.fn();
@@ -1,13 +1,17 @@
 import prompts from 'prompts';
+import { instance, mock } from 'ts-mockito';

+import AppStoreApi from '../../../../credentials/ios/appstore/AppStoreApi';
 import { Account } from '../../../../user/Account';
 import DeviceCreateAction, { RegistrationMethod } from '../action';
+import { runDeveloperPortalMethodAsync } from '../developerPortalMethod';
 import { runInputMethodAsync } from '../inputMethod';
 import { runRegistrationUrlMethodAsync } from '../registrationUrlMethod';

 jest.mock('prompts');
-jest.mock('../registrationUrlMethod');
+jest.mock('../developerPortalMethod');
 jest.mock('../inputMethod');
+jest.mock('../registrationUrlMethod');

 beforeEach(() => {
  const promptsMock = jest.mocked(prompts);
@@ -25,6 +29,8 @@ describe(DeviceCreateAction, () => {
      jest.mocked(prompts).mockImplementationOnce(async () => ({
        method: RegistrationMethod.WEBSITE,
      }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);

      const account: Account = {
        id: 'account_id',
@@ -35,7 +41,7 @@ describe(DeviceCreateAction, () => {
        appleTeamIdentifier: 'ABC123Y',
        appleTeamName: 'John Doe (Individual)',
      };
-      const action = new DeviceCreateAction(account, appleTeam);
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
      await action.runAsync();

      expect(runRegistrationUrlMethodAsync).toBeCalled();
@@ -45,6 +51,8 @@ describe(DeviceCreateAction, () => {
      jest.mocked(prompts).mockImplementationOnce(async () => ({
        method: RegistrationMethod.INPUT,
      }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);

      const account: Account = {
        id: 'account_id',
@@ -55,10 +63,32 @@ describe(DeviceCreateAction, () => {
        appleTeamIdentifier: 'ABC123Y',
        appleTeamName: 'John Doe (Individual)',
      };
-      const action = new DeviceCreateAction(account, appleTeam);
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
      await action.runAsync();

      expect(runInputMethodAsync).toBeCalled();
    });
+
+    it('calls runDeveloperPortalMethodAsync if user chooses the developer portal method', async () => {
+      jest.mocked(prompts).mockImplementationOnce(async () => ({
+        method: RegistrationMethod.DEVELOPER_PORTAL,
+      }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);
+
+      const account: Account = {
+        id: 'account_id',
+        name: 'foobar',
+      };
+      const appleTeam = {
+        id: 'apple-team-id',
+        appleTeamIdentifier: 'ABC123Y',
+        appleTeamName: 'John Doe (Individual)',
+      };
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
+      await action.runAsync();
+
+      expect(runDeveloperPortalMethodAsync).toBeCalled();
+    });
  });
 });
@@ -1,20 +1,24 @@
 import chalk from 'chalk';

+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
 import { AppleTeam } from '../../../graphql/generated';
 import Log from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
+import { runDeveloperPortalMethodAsync } from './developerPortalMethod';
 import { runInputMethodAsync } from './inputMethod';
 import { runRegistrationUrlMethodAsync } from './registrationUrlMethod';

 export enum RegistrationMethod {
  WEBSITE,
  INPUT,
+  DEVELOPER_PORTAL,
  EXIT,
 }

 export default class DeviceCreateAction {
  constructor(
+    private appStoreApi: AppStoreApi,
    private account: Account,
    private appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
  ) {}
@@ -23,6 +27,8 @@ export default class DeviceCreateAction {
    const method = await this.askForRegistrationMethodAsync();
    if (method === RegistrationMethod.WEBSITE) {
      await runRegistrationUrlMethodAsync(this.account.id, this.appleTeam);
+    } else if (method === RegistrationMethod.DEVELOPER_PORTAL) {
+      await runDeveloperPortalMethodAsync(this.appStoreApi, this.account.id, this.appleTeam);
    } else if (method === RegistrationMethod.INPUT) {
      await runInputMethodAsync(this.account.id, this.appleTeam);
    } else if (method === RegistrationMethod.EXIT) {
@@ -44,6 +50,12 @@ export default class DeviceCreateAction {
          )} - generates a registration URL to be opened on your devices`,
          value: RegistrationMethod.WEBSITE,
        },
+        {
+          title: `${chalk.bold(
+            'Developer Portal'
+          )} - import devices already registered on Apple Developer Portal`,
+          value: RegistrationMethod.DEVELOPER_PORTAL,
+        },
        {
          title: `${chalk.bold('Input')} - allows you to type in UDIDs (advanced option)`,
          value: RegistrationMethod.INPUT,
@@ -0,0 +1,131 @@
+import { Device, DeviceClass } from '@expo/apple-utils';
+
+import { AppleDeviceMutation } from '../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import {
+  AppleDeviceFragmentWithAppleTeam,
+  AppleDeviceQuery,
+} from '../../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
+import { getRequestContext } from '../../../credentials/ios/appstore/authenticate';
+import { AuthCtx } from '../../../credentials/ios/appstore/authenticateTypes';
+import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import Log from '../../../log';
+import { ora } from '../../../ora';
+import { promptAsync } from '../../../prompts';
+import chunk from '../../../utils/expodash/chunk';
+
+const DEVICE_IMPORT_CHUNK_SIZE = 10;
+const DEVICE_CLASS_TO_GRAPHQL_TYPE: Partial<Record<DeviceClass, AppleDeviceClass>> = {
+  [DeviceClass.IPAD]: AppleDeviceClass.Ipad,
+  [DeviceClass.IPHONE]: AppleDeviceClass.Iphone,
+};
+
+export async function runDeveloperPortalMethodAsync(
+  appStoreApi: AppStoreApi,
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
+): Promise<void> {
+  const appleAuthCtx = await appStoreApi.ensureAuthenticatedAsync();
+  const unregisteredPortalDevices = await findUnregisteredPortalDevicesAsync(
+    appleAuthCtx,
+    accountId,
+    appleTeam
+  );
+  if (unregisteredPortalDevices.length === 0) {
+    Log.log('All your devices registered on Apple Developer Portal are already imported to EAS.');
+    return;
+  }
+  const devicesToImport = await chooseDevicesToImportAsync(unregisteredPortalDevices);
+  await importDevicesAsync(accountId, appleTeam, devicesToImport);
+}
+
+async function importDevicesAsync(
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>,
+  devices: Device[]
+): Promise<void> {
+  const spinner = ora(
+    `Importing ${devices.length} Apple device${devices.length === 1 ? '' : 's'} to EAS`
+  ).start();
+  const deviceChunks = chunk(devices, DEVICE_IMPORT_CHUNK_SIZE);
+  try {
+    for (const deviceChunk of deviceChunks) {
+      await importDeviceChunkAsync(accountId, appleTeam, deviceChunk);
+    }
+  } catch (err) {
+    spinner.fail();
+    throw err;
+  }
+  spinner.succeed();
+}
+
+async function importDeviceChunkAsync(
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>,
+  devices: Device[]
+): Promise<void> {
+  const promises = devices.map(device => {
+    return AppleDeviceMutation.createAppleDeviceAsync(
+      {
+        appleTeamId: appleTeam.id,
+        identifier: device.attributes.udid,
+        name: device.attributes.name,
+        deviceClass: DEVICE_CLASS_TO_GRAPHQL_TYPE[device.attributes.deviceClass] ?? undefined,
+      },
+      accountId
+    );
+  });
+  await Promise.all(promises);
+}
+
+async function findUnregisteredPortalDevicesAsync(
+  appleAuthCtx: AuthCtx,
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
+): Promise<Device[]> {
+  const expoRegisteredDevices = await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(
+    accountId,
+    appleTeam.appleTeamIdentifier,
+    { useCache: false }
+  );
+  const expoRegisteredDevicesByUdid = expoRegisteredDevices.reduce((acc, device) => {
+    acc[device.identifier] = device;
+    return acc;
+  }, {} as Record<string, AppleDeviceFragmentWithAppleTeam>);
+
+  const portalDevices = await Device.getAllIOSProfileDevicesAsync(getRequestContext(appleAuthCtx));
+  return portalDevices.filter(
+    portalDevice =>
+      !(portalDevice.attributes.udid in expoRegisteredDevicesByUdid) &&
+      [DeviceClass.IPAD, DeviceClass.IPHONE].includes(portalDevice.attributes.deviceClass)
+  );
+}
+
+async function chooseDevicesToImportAsync(devices: Device[]): Promise<Device[]> {
+  const { chosenDevices } = await promptAsync({
+    type: 'multiselect',
+    name: 'chosenDevices',
+    message: 'Which devices do you want to import to EAS?',
+    choices: devices.map(device => ({
+      value: device,
+      title: formatDeviceLabel(device),
+      selected: true,
+    })),
+  });
+  return chosenDevices;
+}
+
+export function formatDeviceLabel(device: Device): string {
+  const deviceDetails = formatDeviceDetails(device);
+  return `${device.attributes.name} - ${device.attributes.udid})${
+    deviceDetails !== '' ? ` - ${deviceDetails}` : ''
+  }`;
+}
+
+function formatDeviceDetails(device: Device): string {
+  let details: string = device.attributes.deviceClass;
+  if (device.attributes.model) {
+    details = device.attributes.model;
+  }
+  return details === '' ? details : `(${details})`;
+}
				`@@ -0,0 +1 @@`
				`export const runDeveloperPortalMethodAsync = jest.fn();`