update oclif forks

update all oclif packages
use fork
2026-11-14 10:08:06 -10:00 · 2021-12-16 12:57:57 +01:00 · 2021-12-15 14:50:28 +01:00 · 2021-12-15 14:29:44 +01:00 · 2021-12-15 13:04:17 +00:00 · 2021-12-15 13:58:34 +01:00
438 changed files with 32131 additions and 52568 deletions
@@ -26,6 +26,10 @@ module.exports = {
            name: 'lodash',
            message: "Don't use lodash, it's heavy!",
          },
+          {
+            name: 'node-fetch',
+            message: 'Use got instead, node-fetch is used only for the GraphQL client.',
+          },
        ],
      },
    ],
@@ -1,2 +1 @@
-* text eol=lf
 **/yarn.lock linguist-generated
@@ -1,5 +1,5 @@
 name: "\U0001F41B Bug Report in EAS CLI"
-labels: 'needs review'
+labels: 'bug'
 description: 'You want to report a reproducible bug or regression in EAS CLI.'
 body:
  - type: markdown
@@ -14,11 +14,6 @@ body:
  - type: markdown
    attributes:
      value: If you leave out sections there is a high likelihood your issue will be closed. If you have a question, not a bug report, please post it on our [forums](https://forums.expo.dev/) instead.
-  - type: input
-    attributes:
-      label: Build/Submit details page URL
-      description: If you're reporting an issue with EAS Build and/or EAS Submit, please provide the URL to the details page URL. The page can be only viewed by the Expo team members. Providing the URL is optional but it makes debugging the issue easier.
-      placeholder: https://expo.dev/accounts/ACCOUNT_NAME/projects/PROJECT_NAME/builds/BUILD_ID
  - type: textarea
    validations:
      required: true
@@ -26,18 +21,19 @@ body:
      label: Summary
      description: Describe the issue in 1 or 2 sentences
      placeholder: Clearly describe what the expected behavior is vs. what is actually happening. This should be as short as possible, while still communicating all the necessary information. If your summary is just 'X library/method isn't working', then you need to continue debugging yourself and provide more information.
-  - type: input
+  - type: textarea
    validations:
      required: true
    attributes:
      label: Managed or bare?
-      description: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project. See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
+      description: See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
+      placeholder: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project.
  - type: textarea
    validations:
      required: true
    attributes:
      label: Environment
-      description: Run `npx expo-env-info` and `expo doctor`, and paste the output here.
+      placeholder: Run `eas diagnostics` and paste the output here
  - type: textarea
    validations:
      required: false
@@ -1,5 +1,5 @@
 name: "\U0001F64B Enhancement"
-labels: 'enhancement,needs review'
+labels: 'enhancement'
 description: 'Want us to add something to EAS CLI?'
 body:
  - type: markdown
@@ -12,7 +12,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - name: Checkout Pull Request
        run: hub pr checkout ${{ github.event.issue.number }}
        env:
@@ -0,0 +1,18 @@
+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
+      - run: eas --version
@@ -1,146 +0,0 @@
-name: Issue Triage
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  needs-repro:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing or invalid repro') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hi there! It looks like your issue requires a minimal reproducible example, but it is invalid or absent. Please prepare such an example and share it in a new issue.
-
-              **The best way to get attention to your issue is to provide a clean and easy way for a developer to reproduce the issue on their own machine.** Please do not provide your entire project, or a project with more code than is necessary to reproduce the issue.
-
-              A side benefit of going through the process of narrowing down the minimal amount of code needed to reproduce the issue is that you may get lucky and discover that the bug is due to a mistake in your application code that you can quickly fix on your own.
-
-              ### Resources
-
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-
-              ### Common concerns
-
-              #### "I've only been able to reproduce it in private, proprietary code"
-
-              You may not have spent enough time narrowing down the root cause of the issue. Try out the techniques discussed in this [manual debugging guide](https://expo.fyi/manual-debugging) to learn how to isolate the problem from the rest of your codebase.
-
-              #### "I didn't have time to create one"
-
-              That's understandable, it can take some time to prepare. We ask that you hold off on filing an issue until you are able to fully complete the required fields in the issue template.
-
-              #### "You can reproduce it by yourself by creating a project and following these steps"
-
-              This is useful knowledge, but it's still valuable to have the resulting project that is produced from running the steps, where you have verified you can reproduce the issue.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  needs-info:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing info') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! There isn't enough information provided in your issue description for us to be able to help you. The best way to get help is to provide information to enable other developers to understand the issue and reproduce it on their own machines.
-
-              Please create a new issue and fill out the entire issue template to the best of your ability. Refer to the following resources for more information on how to create a good issue report.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  issue-accepted:
-    runs-on: ubuntu-20.04
-    if: github.event.label.name == 'issue accepted'
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Thank you for filing this issue!
-              This comment acknowledges we believe this may be a bug and there’s enough information to investigate it.
-              However, we can’t promise any sort of timeline for resolution. We prioritize issues based on severity, breadth of impact, and alignment with our roadmap. If you’d like to help move it more quickly, you can continue to investigate it more deeply and/or you can open a pull request that fixes the cause.
-            `})
-
-  question:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: question') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you have a question about Expo or related tools, please post on our forums at https://forums.expo.dev/ or join our Discord at https://chat.expo.dev/.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["Join the community"](https://docs.expo.dev/next-steps/community/)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  feature-request:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: feature request') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you would like to request a feature, please post to https://expo.canny.io/feature-requests.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
@@ -27,28 +27,20 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn build
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
-      - id: x64
-        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm
-        run: echo "::set-output name=filename::$(ls eas-*-arm.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets linux-x64,linux-arm
      - name: Upload linux-x64 tarball
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-x64.tar.gz
+          asset_name: eas-linux-x64.tar.gz
          asset_content_type: application/gzip
      - name: Upload linux-arm tarball
        uses: actions/upload-release-asset@v1
@@ -56,8 +48,8 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm.outputs.filename }}
-          asset_name: ${{ steps.arm.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-arm.tar.gz
+          asset_name: eas-linux-arm.tar.gz
          asset_content_type: application/gzip
  build-mac:
    name: Build for macOS
@@ -68,25 +60,20 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn build
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets darwin-x64
-      - id: x64
-        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets darwin-x64
      - name: Upload darwin-x64 tarball
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-darwin-x64.tar.gz
+          asset_name: eas-darwin-x64.tar.gz
          asset_content_type: application/gzip
  build-windows:
    name: Build for Windows
@@ -96,27 +83,25 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: sudo apt-get install nsis
      - run: yarn build
-      - run: |
-          yarn pretarball-ci
-          yarn oclif pack:win
+      - run: yarn oclif-dev pack:win
        working-directory: ${{ github.workspace }}/packages/eas-cli
      - id: x64
        run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
      - id: x86
        run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
      - name: Upload x64 installer
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x64.outputs.filename }}
          asset_name: ${{ steps.x64.outputs.filename }}
          asset_content_type: application/gzip
      - name: Upload x86 installer
@@ -125,7 +110,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x86.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
          asset_name: ${{ steps.x86.outputs.filename }}
          asset_content_type: application/gzip
  publish-to-npm:
@@ -138,7 +123,7 @@ jobs:
        with:
          registry-url: 'https://registry.npmjs.org/'
          scope: 'expo'
-          node-version: 18
+          node-version: '16'
      - name: Install dependencies
        run: yarn install --frozen-lockfile --check-files
      - name: Build
@@ -155,7 +140,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - name: Install dependencies
        working-directory: ./scripts
        run: yarn install --frozen-lockfile --check-files
@@ -9,12 +9,10 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: '16'
      - uses: preactjs/compressed-size-action@v2
        with:
          build-script: 'build:tarballs:linux'
          repo-token: '${{ secrets.GITHUB_TOKEN }}'
          pattern: './packages/eas-cli/dist/*.tar.gz'
          compression: 'none'
-          strip-hash: "v\\d+.\\d+.\\d+-\\w+-"
-          clean-script: 'clean'
@@ -1,24 +0,0 @@
-name: Close inactive issues
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          ascending: false
-          operations-per-run: 300
-          days-before-issue-stale: 30
-          days-before-issue-close: 7
-          stale-issue-label: "stale"
-          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. If there is no activity in the next 7 days, the issue will be closed."
-          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale. Please open a new issue if you believe you are encountering a related problem."
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          enable-statistics: true
-          exempt-issue-labels: "needs review"
-          exempt-all-assignees: true
@@ -1,26 +0,0 @@
-name: Test scripts
-
-defaults:
-  run:
-    working-directory: scripts
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'scripts/**'
-  pull_request:
-    paths:
-      - 'scripts/**'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18
-      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn typecheck
@@ -10,9 +10,9 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node: ['14', '16', '18']
+        node: ['12', '14', '16']
        include:
-          - node: '18'
+          - node: '16'
            coverage: true
    name: Test with Node ${{ matrix.node }}
    steps:
@@ -27,11 +27,8 @@ jobs:
        if: ${{ !matrix.coverage }}
      - run: yarn test --coverage
        if: ${{ matrix.coverage }}
-        env:
-          # Oclif seems to cause OOM errors when testing with coverage enabled.
-          # Remove this whenever we solved those OOM errors.
-          NODE_OPTIONS: --max-old-space-size=4096
      - run: yarn lint --max-warnings=0
+      - run: shellcheck bin/*.sh
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
@@ -1,13 +1,10 @@
 # Build directories
 packages/*/build
 packages/eas-cli/dist
-packages/eas-cli/tmp
-scripts/build

 # Code editors
 .idea
 .history
-.vscode

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

 ### 🎉 New features

- Add `-e` as a shortcut for `--profile` flag. ([#1342](https://github.com/expo/eas-cli/pull/1342) by [@szdziedzic](https://github.com/szdziedzic))
- Support JSON5 in **eas.json**. ([#1350](https://github.com/expo/eas-cli/pull/1350) by [@dsokal](https://github.com/dsokal))
+- Add shell completion for bash and zsh. ([#852](https://github.com/expo/eas-cli/pull/852) by [@wkozyra95](https://github.com/wkozyra95))

 ### 🐛 Bug fixes

 ### 🧹 Chores

-## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05
-
-### 🎉 New features
-
- Add tvOS credentials compatibility for Adhoc and App store builds. ([#1325](https://github.com/expo/eas-cli/pull/1325) by [@quinlanj](https://github.com/quinlanj))
- Add `eas open` command for opening project page in web browser. ([#1337](https://github.com/expo/eas-cli/pull/1337) by [@dsokal](https://github.com/dsokal))
- Add support for buildArtifactPaths. Rename artifactPath to applicationArchivePath. ([#1321](https://github.com/expo/eas-cli/pull/1321) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix viewing branch list when a branch has no associated platforms. ([#1326](https://github.com/expo/eas-cli/pull/1326) by [@hbiede](https://github.com/hbiede))
- Fix description of `help` command in help prompt. ([#1341](https://github.com/expo/eas-cli/pull/1341) by [@Simek](https://github.com/Simek))
- Resolve paths from the root when checking for gitignored values. ([#1336](https://github.com/expo/eas-cli/pull/1336) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add noImplicitOverride to tsconfigs. ([#1327](https://github.com/expo/eas-cli/pull/1327) by [@wschurman](https://github.com/wschurman))
- Fix typos. ([#1340](https://github.com/expo/eas-cli/pull/1340) by [@hbiede](https://github.com/hbiede))
-
-## [2.0.0](https://github.com/expo/eas-cli/releases/tag/v2.0.0) - 2022-09-01
-
-### 🛠 Breaking changes
-
- Fix typo in `cli.promptToConfigurePushNotifications` field in **eas.json**. EAS CLI will throw an error if the old field name is in **eas.json**. ([#1332](https://github.com/expo/eas-cli/pull/1332) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix dynamic config update warning. ([#1322](https://github.com/expo/eas-cli/pull/1322) by [@wschurman](https://github.com/wschurman))
-
-## [1.2.0](https://github.com/expo/eas-cli/releases/tag/v1.2.0) - 2022-08-29
-
-### 🎉 New features
-
- Add 2022 Apple capabilities. ([#1307](https://github.com/expo/eas-cli/pull/1307) by [@EvanBacon](https://github.com/EvanBacon))
- Print warning when eas-cli is installed as project dependency. ([#1310](https://github.com/expo/eas-cli/pull/1310) by [@dsokal](https://github.com/dsokal))
- Add eas.json to skip push notifications credentials setup. ([#1315](https://github.com/expo/eas-cli/pull/1315) by [@dsokal](https://github.com/dsokal))
- Warn about EAS outages when running `build`, `submit`, and `update` commands. ([#1312](https://github.com/expo/eas-cli/pull/1312) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
- Replace promptToCreateProjectIfNotExistsAsync with getProjectIdAsync. ([#1303](https://github.com/expo/eas-cli/pull/1303) by [@wschurman](https://github.com/wschurman))
- Use AppQuery instead of ProjectQuery. ([#1304](https://github.com/expo/eas-cli/pull/1304) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Improve instructions on setting `extra.eas.projectId` in app configuration. ([#1316](https://github.com/expo/eas-cli/pull/1316) by [@dsokal](https://github.com/dsokal))
- Improve copy in EAS Submit - "e-mail" -> email, and make the link to app on App Store go directly to the TestFlight tab. ([#1318](https://github.com/expo/eas-cli/pull/1318) by [@brentvatne](https://github.com/brentvatne))
-
-## [1.1.1](https://github.com/expo/eas-cli/releases/tag/v1.1.1) - 2022-08-23
-
-### 🎉 New features
-
- Add support for `autoIncrement` option at the root of the build profile. ([#1298](https://github.com/expo/eas-cli/pull/1298) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
- Handle trailing backslash in `.gitignore`. ([#1306](https://github.com/expo/eas-cli/pull/1306) by [@wkozyra95](https://github.com/wkozyra95))
- Retry ASC Api Key downloads if it has not fully propagated on Apple's infrastructure. ([#1302](https://github.com/expo/eas-cli/pull/1302) by [@quinlanj](https://github.com/quinlanj))
-
-## [1.1.0](https://github.com/expo/eas-cli/releases/tag/v1.1.0) - 2022-08-23
-
-### 🎉 New features
-
- Add support for passing platform flag to `credentials` command. ([#1277](https://github.com/expo/eas-cli/pull/1277) by [@Simek](https://github.com/Simek))
-
-### 🐛 Bug fixes
-
- Prevent throwing dynamic app config write error when configuring project ID. ([#1301](https://github.com/expo/eas-cli/pull/1301) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Remove unused dependency and devDependency from the CLI. ([#1297](https://github.com/expo/eas-cli/pull/1297) by [@Simek](https://github.com/Simek))
-
-## [1.0.0](https://github.com/expo/eas-cli/releases/tag/v1.0.0) - 2022-08-22
-
-### 🛠 Breaking changes
-
- Remove timeout when waiting for build / submission. ([#1289](https://github.com/expo/eas-cli/pull/1289) by [@dsokal](https://github.com/dsokal))
-
-### 🎉 New features
-
- Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
- Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
- Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))
- Fix initializing git repository in monorepo. ([#1279](https://github.com/expo/eas-cli/pull/1279) by [@dsokal](https://github.com/dsokal))
- Limit the number of SignedAssetUploadSpecifications fetched at a time. ([#1287](https://github.com/expo/eas-cli/pull/1287) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Remove unused install script. ([#1280](https://github.com/expo/eas-cli/pull/1280), [#1281](https://github.com/expo/eas-cli/pull/1281) by [@wkozyra95](https://github.com/wkozyra95))
- Remove "please" from output ([#1250](https://github.com/expo/eas-cli/pull/1250) by [@jonsamp](https://github.com/jonsamp))
-
-## [0.60.0](https://github.com/expo/eas-cli/releases/tag/v0.60.0) - 2022-08-12
-
-### 🎉 New features
-
- Add `appVersion` runtime policy. ([#1267](https://github.com/expo/eas-cli/pull/1267) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add JSON Schema `metadataPath` to iOS submission profile. ([#1269](https://github.com/expo/eas-cli/pull/1269) by [@byCedric](https://github.com/byCedric))
- Add warning when `appVersion` runtime policy is not supported. ([#1271](https://github.com/expo/eas-cli/pull/1271) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.59.0](https://github.com/expo/eas-cli/releases/tag/v0.59.0) - 2022-08-10
-
-### 🐛 Bug fixes
-
- Fix building Android projects locally that don't have execute permissions set for `gradlew`. ([82231](https://github.com/expo/eas-cli/commit/822313e90e94bd6ddd3872061a0c25a8aa4db7cd) by [@dsokal](https://github.com/dsokal))
- Disable `nativeVersion` policy only for remote version source. ([#1261](https://github.com/expo/eas-cli/pull/1261) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Improve wording on version auto-increment. ([#1260](https://github.com/expo/eas-cli/pull/1260) by [@wkozyra95](https://github.com/wkozyra95))
- Upgrade dependencies. ([#1262](https://github.com/expo/eas-cli/pull/1262) by [@dsokal](https://github.com/dsokal))
-
-## [0.58.0](https://github.com/expo/eas-cli/releases/tag/v0.58.0) - 2022-08-09
-
-### 🎉 New features
-
- Managed app versions support. ([#1209](https://github.com/expo/eas-cli/pull/1209), [#1219](https://github.com/expo/eas-cli/pull/1219), [#1232](https://github.com/expo/eas-cli/pull/1232) by [@wkozyra95](https://github.com/wkozyra95))
- Add a warning when publishing an update with too many assets. ([#1243](https://github.com/expo/eas-cli/pull/1243) by [@kgc00](https://github.com/kgc00))
- Add submission info when building with `--json` option. ([#1246](https://github.com/expo/eas-cli/pull/1246) by [@wkozyra95](https://github.com/wkozyra95))
- Set all environment variables (documented in https://docs.expo.dev/build-reference/variables/) when running local build. ([#1256](https://github.com/expo/eas-cli/pull/1256) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
- Do not include sources in `eas-json` npm package. ([#1248](https://github.com/expo/eas-cli/pull/1248) by [@wkozyra95](https://github.com/wkozyra95))
- Swallow error when unable to track file in no commit workflow. ([#1109](https://github.com/expo/eas-cli/pull/1109) by [@brentvatne](https://github.com/brentvatne))
-
-## [0.57.0](https://github.com/expo/eas-cli/releases/tag/v0.57.0) - 2022-08-03
-
-### 🎉 New features
-
- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
-
-## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
-
-### 🎉 New features
-
- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🐛 Bug fixes
-
- Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
- Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
-
-### 🐛 Bug fixes
-
- Fix asset upload crash. ([#1205](https://github.com/expo/eas-cli/pull/1205) by [@wschurman](https://github.com/wschurman))
-
-## [0.55.0](https://github.com/expo/eas-cli/releases/tag/v0.55.0) - 2022-07-11
-
-### 🎉 New features
-
- Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
- Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
- Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
- Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
- Add review details to metadata store configuration. ([#1184](https://github.com/expo/eas-cli/pull/1184) by [@byCedric](https://github.com/byCedric))
- Override applicationId via env. ([#1203](https://github.com/expo/eas-cli/pull/1203) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
- 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
-
- Add App Store Connect link after `eas metadata:push`. ([#1168](https://github.com/expo/eas-cli/pull/1168) by [@byCedric](https://github.com/byCedric))
-
-### 🐛 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
-
-### 🛠 Breaking changes
-
- Remove fallback for legacy format in `eas.json`. ([#1158](https://github.com/expo/eas-cli/pull/1158), [#1163](https://github.com/expo/eas-cli/pull/1163) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🎉 New features
-
- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
- Added first beta of `eas metadata` to sync store information using store configuration files ([#1136](https://github.com/expo/eas-cli/pull/1136) by [@bycedric](https://github.com/bycedric))
-
-### 🐛 Bug fixes
-
- 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/))
-
-### 🧹 Chores
-
- Update `eas-build-job`. ([#1162](https://github.com/expo/eas-cli/pull/1162) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.53.1](https://github.com/expo/eas-cli/releases/tag/v0.53.1) - 2022-06-07
-
-### 🐛 Bug fixes
-
- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00/))
-
-### 🧹 Chores
-
- Display project archive docs before compressing/uploading to EAS Build. ([#1127](https://github.com/expo/eas-cli/pull/1127) by [@dsokal](https://github.com/dsokal))
- Add new common error code for submits. ([#1129](https://github.com/expo/eas-cli/pull/1129) by [@dsokal](https://github.com/dsokal))
-
-## [0.53.0](https://github.com/expo/eas-cli/releases/tag/v0.53.0) - 2022-05-30
-
-### 🛠 Breaking changes
-
- Drop support for Node < 14. ([#1098](https://github.com/expo/eas-cli/pull/1098) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Match bundle identifier capabilities more accurately. ([#1112](https://github.com/expo/eas-cli/pull/1112) by [@EvanBacon](https://github.com/EvanBacon))
- Limit concurrent asset uploads. ([#1153](https://github.com/expo/eas-cli/pull/1153) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
- Update dependencies. ([#1095](https://github.com/expo/eas-cli/pull/1095), [#1115](https://github.com/expo/eas-cli/pull/1115) by [@dsokal](https://github.com/dsokal))
- Better spinner placement for multiple builds. ([#1105](https://github.com/expo/eas-cli/pull/1105) by [@dsokal](https://github.com/dsokal))
- Use getExpoConfig to access config. ([#1122](https://github.com/expo/eas-cli/pull/1122) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.52.0](https://github.com/expo/eas-cli/releases/tag/v0.52.0) - 2022-04-26
-
-### 🎉 New features
-
- Support target specific entitlements. ([#1078](https://github.com/expo/eas-cli/pull/1078) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.51.0](https://github.com/expo/eas-cli/releases/tag/v0.51.0) - 2022-04-19
-
-### 🎉 New features
-
- Add non-interactive flag to eas update command. ([#1066](https://github.com/expo/eas-cli/pull/1066) by [@wschurman](https://github.com/wschurman))
- Handle new EAS Submit common error - expired Apple's certificates. ([#1068](https://github.com/expo/eas-cli/pull/1068) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Enable full bundling logging for eas update when debugging. ([#1070](https://github.com/expo/eas-cli/pull/1070) by [@byCedric](https://github.com/byCedric))
-
-### 🧹 Chores
-
- Upgrade `@expo/[email protected]` (now with license). ([#1064](https://github.com/expo/eas-cli/pull/1064) by [@EvanBacon](https://github.com/EvanBacon))
- Unify Google Service Account key prompts. ([#1063](https://github.com/expo/eas-cli/pull/1063) by [@dsokal](https://github.com/dsokal))
-
-## [0.50.0](https://github.com/expo/eas-cli/releases/tag/v0.50.0) - 2022-04-11
-
-### 🎉 New features
-
- Provide queue position progress and estimated wait time. ([#1049](https://github.com/expo/eas-cli/pull/1049), [#1058](https://github.com/expo/eas-cli/pull/1058) by [@dsokal](https://github.com/dsokal))
- Enable App Store authentication for ASC Api Keys with environment variables. ([#1051](https://github.com/expo/eas-cli/pull/1051) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
- Prompt for user/password authentication where required. ([#1055](https://github.com/expo/eas-cli/pull/1055) by [@quinlanj](https://github.com/quinlanj))
- Require private-key-path to be specified for updating when code signing configured. ([#1059](https://github.com/expo/eas-cli/pull/1059) by [@wschurman](https://github.com/wschurman))
-
-## [0.49.0](https://github.com/expo/eas-cli/releases/tag/v0.49.0) - 2022-04-05
-
-### 🎉 New features
-
- Added experimental App Store Connect API provisioning profile regeneration. ([#1038](https://github.com/expo/eas-cli/pull/1038) by [@EvanBacon](https://github.com/EvanBacon))
- Experimental support for iOS App Extensions in managed projects. ([#1039](https://github.com/expo/eas-cli/pull/1039) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
- Fix proxy support. ([#1032](https://github.com/expo/eas-cli/pull/1032) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add annotations regarding App Store Connect Token session support. ([#1029](https://github.com/expo/eas-cli/pull/1029) by [@EvanBacon](https://github.com/EvanBacon))
- Upgrade dependencies. ([#1043](https://github.com/expo/eas-cli/pull/1043) by [@dsokal](https://github.com/dsokal))
- Make default deprecation message more generic. ([#1047](https://github.com/expo/eas-cli/pull/1047) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.48.2](https://github.com/expo/eas-cli/releases/tag/v0.48.2) - 2022-03-21
-
-### 🎉 New features
-
- Add proxy support. ([#1005](https://github.com/expo/eas-cli/pull/1005) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
- Do not retry build requests. ([#1024](https://github.com/expo/eas-cli/pull/1024) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.48.1](https://github.com/expo/eas-cli/releases/tag/v0.48.1) - 2022-03-15
-
-### 🐛 Bug fixes
-
- Fix code signing error when not yet configured. ([#1018](https://github.com/expo/eas-cli/pull/1018) by [@wschurman](https://github.com/wschurman))
- Fix link to build details page to use `project.slug`. ([#1021](https://github.com/expo/eas-cli/pull/1021) by [@giautm](https://github.com/giautm))
-
-### 🧹 Chores
-
- Improve apple login prompt for internal distribution builds. ([#1016](https://github.com/expo/eas-cli/pull/1016) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.48.0](https://github.com/expo/eas-cli/releases/tag/v0.48.0) - 2022-03-14
-
-### 🎉 New features
-
- Add code signing. ([#964](https://github.com/expo/eas-cli/pull/964) by [@wschurman](https://github.com/wschurman))
- Install expo-updates when running update:configure. ([#977](https://github.com/expo/eas-cli/pull/977) by [@jkhales](https://github.com/jkhales))
- Make `update:configure` work on native files. ([#978](https://github.com/expo/eas-cli/pull/978) by [@jkhales](https://github.com/jkhales))
-
-### 🐛 Bug fixes
-
- Fix `"Unknown status"` error when a build is canceled. ([#1012](https://github.com/expo/eas-cli/pull/1012) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
- Add error message when package.json is outside git repository. ([#971](https://github.com/expo/eas-cli/pull/971) by [@wkozyra95](https://github.com/wkozyra95))
- Make runtime version policy warning on the update command more descriptive. ([#979](https://github.com/expo/eas-cli/pull/979) by [@kbrandwijk](https://github.com/kbrandwijk))
- Remove unused flag. ([#995](https://github.com/expo/eas-cli/pull/995) by [@wkozyra95](https://github.com/wkozyra95))
- Replace `got` with `node-fetch`. ([#1000](https://github.com/expo/eas-cli/pull/1000) by [@wkozyra95](https://github.com/wkozyra95))
- Upgrade dependencies. ([#1015](https://github.com/expo/eas-cli/pull/1015) by [@dsokal](https://github.com/dsokal))
-
-## [0.47.0](https://github.com/expo/eas-cli/releases/tag/v0.47.0) - 2022-02-08
-
-### 🐛 Bug fixes
-
- Return informative error when running `eas channel:rollout` with a channel that does not exist. ([#930](https://github.com/expo/eas-cli/pull/930) by [@jkhales](https://github.com/jkhales))
- Check if `expo-updates` is installed before publish. ([#953](https://github.com/expo/eas-cli/pull/953) by [@jkhales](https://github.com/jkhales))
-
-### 🧹 Chores
-
- Upgrade dependencies. ([#946](https://github.com/expo/eas-cli/pull/946) by [@dsokal](https://github.com/dsokal))
-
-## [0.46.0](https://github.com/expo/eas-cli/releases/tag/v0.46.0) - 2022-01-26
-
-### 🛠 Breaking changes
-
- Drop support for building iOS builds on macOS Catalina. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix URL placeholder for iOS submits. ([#941](https://github.com/expo/eas-cli/pull/941) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
- Unify EAS command descriptions style. ([#925](https://github.com/expo/eas-cli/pull/925) by [@dsokal](https://github.com/dsokal))
- Upgrade dependencies. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
-
-## [0.45.1](https://github.com/expo/eas-cli/releases/tag/v0.45.1) - 2022-01-19
-
-### 🎉 New features
-
- Add json output for started builds when using `--no-wait`. ([#921](https://github.com/expo/eas-cli/pull/921) by [@kbrandwijk](https://github.com/kbrandwijk))
- Add support to `eas build` for specifying a custom `prebuildCommand` in `eas.json`. ([#919](https://github.com/expo/eas-cli/pull/919) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🧹 Chores
-
- Add macOS Monterey image. ([#922](https://github.com/expo/eas-cli/pull/922) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.45.0](https://github.com/expo/eas-cli/releases/tag/v0.45.0) - 2022-01-18
-
-### 🎉 New features
-
- Add `eas device:delete`. ([#890](https://github.com/expo/eas-cli/pull/890) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🧹 Chores
-
- Upgrade dependencies. ([#872](https://github.com/expo/eas-cli/pull/872) by [@dsokal](https://github.com/dsokal))
-
-## [0.44.1](https://github.com/expo/eas-cli/releases/tag/v0.44.1) - 2022-01-11
-
-### 🐛 Bug fixes
-
- Fix build:configure expo-updates configuration to only run on generic projects. ([#904](https://github.com/expo/eas-cli/pull/904) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
- Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))
-
-## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
-
-### 🛠 Breaking changes
-
- No longer enable APNS (iOS Push Notifications) capability by default anymore. ([#797](https://github.com/expo/eas-cli/pull/797) by [@EvanBacon](https://github.com/EvanBacon))
- Don't configure Android projects locally. Clean up old Gradle signing config. Streamline `expo-updates` configuration. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
-
-### 🎉 New features
-
- Add `update:list` command. ([#884](https://github.com/expo/eas-cli/pull/884) by [@jkhales](https://github.com/jkhales))
- Improve error message for outdated Apple PLA error. ([#889](https://github.com/expo/eas-cli/pull/889) by [@EvanBacon](https://github.com/EvanBacon))
- Add `--output` flag to the build command. ([#885](https://github.com/expo/eas-cli/pull/885) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
- Fix creating project archive with symlink cycle. ([#891](https://github.com/expo/eas-cli/pull/891) by [@wkozyra95](https://github.com/wkozyra95))
- Sign Android debug builds with the correct keystore. Previously, all debug builds would be signed with a default debug keystore. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
-
-## [0.43.0](https://github.com/expo/eas-cli/releases/tag/v0.43.0) - 2022-01-03
-
-### 🎉 New features
-
- Add `eas channel:delete`. ([#846](https://github.com/expo/eas-cli/pull/846), [#869](https://github.com/expo/eas-cli/pull/869) by [@jkhales](https://github.com/jkhales))
- Add `eas autocomplete`. ([#870](https://github.com/expo/eas-cli/pull/870) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
- Fix saving `build:inspect` results to project subdirectory. ([#863](https://github.com/expo/eas-cli/pull/863) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.42.4](https://github.com/expo/eas-cli/releases/tag/v0.42.4) - 2021-12-21
-
-### 🐛 Bug fixes
-
- Add missing dependency - `@oclif/plugin-help`. ([#865](https://github.com/expo/eas-cli/pull/865) by [@dsokal](https://github.com/dsokal))
-
-## [0.42.3](https://github.com/expo/eas-cli/releases/tag/v0.42.3) - 2021-12-21
-
-### 🐛 Bug fixes
-
- Allow select eas commands to be run outside of a project. ([#851](https://github.com/expo/eas-cli/pull/851) by [@jkhales](https://github.com/jkhales))
-
-### 🧹 Chores
-
- Replace all oclif dependencies with `@oclif/core`. ([#858](https://github.com/expo/eas-cli/pull/858) by [@dsokal](https://github.com/dsokal))
-
-## [0.41.1](https://github.com/expo/eas-cli/releases/tag/v0.41.1) - 2021-12-16
-
-### 🎉 New features
-
- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates.
-  - Adds `eas update`, which can bundle and publish updates on a branch.
-  - Adds `eas branch`, which manages branches. Branches contain a list of updates and are linked to channels.
-  - Adds `eas channel`, which manages channels. Channels are specified inside builds and are linked to branches, allowing us to link specific updates with specific builds.
-  - Read more in our [feature preview docs](https://docs.expo.dev/eas-update/introduction/).
-
-### 🐛 Bug fixes
-
- Fix `eas submit` displaying a prompt in non-interactive mode when some ASC API credentials are missing in `eas.json`. ([#841](https://github.com/expo/eas-cli/pull/841) by [@barthap](https://github.com/barthap))
-
 ## [0.41.0](https://github.com/expo/eas-cli/releases/tag/v0.41.0) - 2021-12-13

 ### 🎉 New features
@@ -1,16 +1,7 @@
-* @dsokal @wkozyra95
-
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95

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

 packages/eas-json @dsokal @wkozyra95
@@ -0,0 +1,131 @@
+#!/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="https://github.com/expo/eas-cli/releases/latest/download/eas-$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 +1 @@
-../packages/eas-cli/bin/dev
+../packages/eas-cli/bin/run
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "2.1.0"
+  "version": "0.41.0"
 }
@@ -5,34 +5,33 @@
  ],
  "scripts": {
    "build": "lerna run build",
-    "build:tarballs:linux": "yarn build-for-size-check",
-    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
+    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
    "typecheck": "lerna run typecheck",
    "start": "lerna run watch --parallel",
    "watch": "yarn start",
    "eas": "packages/eas-cli/bin/run",
    "lint": "eslint .",
-    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
+    "release": "./scripts/bin/run update-local-plugin && lerna version",
    "test": "jest",
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@types/jest": "28.1.6",
-    "@types/node": "18.6.5",
-    "eslint": "8.21.0",
-    "eslint-config-universe": "11.1.0",
-    "eslint-plugin-async-protect": "2.1.0",
+    "@expo/oclif-dev-cli": "1.26.9-expo",
+    "@types/jest": "27.0.1",
+    "@types/node": "16.7.8",
+    "eslint": "7.32.0",
+    "eslint-config-universe": "8.0.0",
+    "eslint-plugin-async-protect": "1.1.0",
    "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.3",
-    "jest-watch-typeahead": "2.0.0",
+    "jest": "27.1.0",
+    "jest-watch-typeahead": "0.6.4",
    "lerna": "4.0.0",
-    "oclif": "3.1.2",
-    "prettier": "2.7.1",
-    "ts-jest": "28.0.7",
-    "typescript": "4.7.4"
+    "prettier": "2.4.1",
+    "ts-jest": "27.0.5",
+    "typescript": "4.5.2"
  },
  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
  }
 }
@@ -2,24 +2,6 @@ const rootEslintrc = require('../../.eslintrc.js');

 module.exports = {
  rules: {
-    'no-restricted-properties': [
-      'warn',
-      {
-        object: 'it',
-        property: 'only',
-        message: 'it.only should not be committed to main.',
-      },
-      {
-        object: 'test',
-        property: 'only',
-        message: 'test.only should not be committed to main.',
-      },
-      {
-        object: 'describe',
-        property: 'only',
-        message: 'describe.only should not be committed to main.',
-      },
-    ],
    'no-restricted-imports': [
      'error',
      {
@@ -1,15 +1,13 @@
-const fs = require('fs/promises');
+#!/usr/bin/env sh

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

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

-  await fs.writeFile(path, comment + generatedCode);
-})();
+printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-
-const oclif = require('@oclif/core');
-const path = require('path');
-
-const project = path.join(__dirname, '..', 'tsconfig.json');
-
-// In dev mode -> use ts-node and dev plugins
-process.env.NODE_ENV = 'development';
-
-require('ts-node').register({ project });
-
-// In dev mode, always show stack traces
-oclif.settings.disableJsonFlag = true
-
-// Start the CLI
-oclif.run().then(oclif.flush).catch(oclif.Errors.handle);
@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\dev" %*
@@ -1,6 +1,6 @@
 #!/usr/bin/env node

-require('@oclif/core')
+require('@oclif/command')
  .run()
-  .then(require('@oclif/core/flush'))
-  .catch(require('@oclif/core/handle'));
+  .then(require('@oclif/command/flush'))
+  .catch(require('@oclif/errors/handle'));
@@ -14,7 +14,7 @@ generates:
      dedupeOperationSuffix: true
    hooks:
      afterOneFileWrite:
-        - 'node ./scripts/annotate-graphql-codegen.js'
+        - ./annotate-graphql-codegen.sh
  ./graphql.schema.json:
    plugins:
      - 'introspection'
@@ -1,122 +1,111 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "2.1.0",
+  "version": "0.41.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.34",
-    "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "7.0.1",
-    "@expo/config-plugins": "5.0.1",
-    "@expo/config-types": "46.0.2",
-    "@expo/eas-build-job": "0.2.90",
-    "@expo/eas-json": "2.1.0",
-    "@expo/json-file": "8.2.36",
-    "@expo/multipart-body-parser": "1.1.0",
-    "@expo/package-manager": "0.0.56",
-    "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.18",
-    "@expo/plugin-autocomplete": "1.4.0",
-    "@expo/plugin-help": "5.3.0",
-    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "5.0.3",
+    "@expo/apple-utils": "0.0.0-alpha.26",
+    "@expo/config": "6.0.11",
+    "@expo/config-plugins": "4.0.11",
+    "@expo/eas-build-job": "0.2.61",
+    "@expo/eas-json": "^0.41.0",
+    "@expo/json-file": "8.2.34",
+    "@expo/pkcs12": "0.0.6",
+    "@expo/plist": "0.0.16",
+    "@expo/plugin-autocomplete": "1.0.0",
+    "@expo/plugin-warn-if-update-available": "2.0.1",
+    "@expo/prebuild-config": "3.0.11",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
+    "@expo/spawn-async": "1.5.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.13.10",
-    "@urql/core": "2.6.1",
-    "@urql/exchange-retry": "0.3.3",
-    "ajv": "^6.12.6",
-    "better-opn": "3.0.2",
+    "@oclif/command": "1.8.10",
+    "@oclif/config": "1.18.2",
+    "@oclif/errors": "1.3.5",
+    "@oclif/plugin-help": "3.2.14",
+    "@urql/core": "2.3.1",
+    "@urql/exchange-retry": "0.3.0",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
-    "cli-table3": "0.6.2",
-    "dateformat": "4.6.3",
+    "cli-table3": "0.6.0",
+    "dateformat": "4.5.1",
    "env-paths": "2.2.0",
    "envinfo": "7.8.1",
-    "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.11",
+    "fast-glob": "3.2.7",
    "figures": "3.2.0",
-    "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "form-data": "3.0.0",
+    "fs-extra": "10.0.0",
    "getenv": "1.0.0",
-    "gradle-to-js": "2.0.1",
-    "graphql": "16.5.0",
-    "graphql-tag": "2.12.6",
-    "https-proxy-agent": "5.0.1",
-    "ignore": "5.2.0",
+    "got": "11.8.2",
+    "gradle-to-js": "2.0.0",
+    "graphql": "15.5.1",
+    "graphql-tag": "2.12.5",
+    "ignore": "5.1.8",
    "indent-string": "4.0.0",
-    "jks-js": "1.0.2",
-    "joi": "17.6.0",
+    "jks-js": "1.0.1",
+    "joi": "17.4.2",
    "keychain": "1.3.0",
    "log-symbols": "4.1.0",
-    "mime": "3.0.0",
-    "minimatch": "5.1.0",
-    "nanoid": "3.3.4",
-    "node-fetch": "2.6.7",
-    "node-forge": "1.3.1",
+    "mime": "2.5.2",
+    "minimatch": "3.0.4",
+    "nanoid": "3.1.25",
+    "node-fetch": "2.6.1",
+    "node-forge": "0.10.0",
    "nullthrows": "1.1.1",
    "ora": "5.1.0",
    "pkg-dir": "4.2.0",
-    "promise-limit": "2.7.0",
-    "promise-retry": "2.0.1",
-    "prompts": "2.4.2",
+    "prompts": "2.3.2",
    "qrcode-terminal": "0.12.0",
    "resolve-from": "5.0.0",
-    "semver": "7.3.7",
+    "semver": "7.3.5",
    "slash": "3.0.0",
+    "strip-ansi": "6.0.0",
    "tar": "6.1.11",
    "terminal-link": "2.1.1",
-    "tslib": "2.4.0",
+    "tslib": "2.3.1",
    "turndown": "7.1.1",
    "untildify": "4.0.0",
    "uuid": "8.3.2",
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@graphql-codegen/cli": "2.11.5",
-    "@graphql-codegen/introspection": "2.2.1",
-    "@graphql-codegen/typescript": "2.7.3",
-    "@graphql-codegen/typescript-operations": "2.5.3",
-    "@types/cli-progress": "3.11.0",
+    "@graphql-codegen/cli": "^1.19.2",
+    "@graphql-codegen/introspection": "^1.18.0",
+    "@graphql-codegen/typescript": "^1.17.11",
+    "@graphql-codegen/typescript-operations": "^1.17.10",
    "@types/dateformat": "3.0.1",
    "@types/envinfo": "7.8.1",
-    "@types/fs-extra": "9.0.13",
+    "@types/form-data": "^2.5.0",
+    "@types/fs-extra": "9.0.12",
    "@types/getenv": "^1.0.0",
    "@types/mime": "2.0.3",
-    "@types/node-fetch": "2.6.2",
-    "@types/node-forge": "1.0.4",
-    "@types/promise-retry": "1.1.3",
-    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.10",
-    "@types/tar": "6.1.2",
-    "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "8.3.4",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node-forge": "^0.9.5",
+    "@types/prompts": "^2.0.9",
+    "@types/semver": "7.3.8",
+    "@types/tar": "4.0.5",
+    "@types/tough-cookie": "4.0.1",
+    "@types/uuid": "8.3.1",
    "@types/wrap-ansi": "3.0.0",
-    "axios": "0.27.2",
+    "axios": "0.21.4",
    "eslint-plugin-graphql": "4.0.0",
-    "memfs": "3.4.7",
-    "mockdate": "3.0.5",
-    "nock": "13.2.9",
-    "rimraf": "3.0.2",
-    "ts-deepmerge": "2.0.5",
-    "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "memfs": "3.2.2",
+    "mockdate": "^3.0.2",
+    "nock": "^13.0.5",
+    "tempy": "0.7.0",
+    "ts-deepmerge": "1.0.8",
+    "typescript": "4.5.2"
  },
  "engines": {
-    "node": ">=14.0.0"
+    "node": ">=12.0.0"
  },
  "files": [
    "/bin",
    "/build",
-    "/oclif.manifest.json",
-    "/schema"
+    "/oclif.manifest.json"
  ],
  "homepage": "https://github.com/expo/eas-cli",
  "keywords": [
@@ -129,16 +118,13 @@
    "bin": "eas",
    "commands": "./build/commands",
    "plugins": [
-      "@expo/plugin-autocomplete",
-      "@expo/plugin-help",
-      "@expo/plugin-warn-if-update-available"
+      "@oclif/plugin-help",
+      "@expo/plugin-warn-if-update-available",
+      "@expo/plugin-autocomplete"
    ],
    "topics": {
      "account": {
-        "description": "manage account"
-      },
-      "branch": {
-        "description": "manage update branches"
+        "description": "manage your account"
      },
      "build": {
        "description": "build app binaries"
@@ -147,13 +133,10 @@
        "description": "manage update channels"
      },
      "device": {
-        "description": "manage Apple devices for Internal Distribution"
-      },
-      "metadata": {
-        "description": "manage store configuration"
+        "description": "manage your Apple devices for internal distribution"
      },
      "project": {
-        "description": "manage project"
+        "description": "manage your project"
      },
      "release": {
        "description": "manage update releases"
@@ -170,11 +153,11 @@
    },
    "warn-if-update-available": {
      "timeoutInDays": 0.5,
-      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
    },
    "update": {
      "node": {
-        "version": "18.6.0"
+        "version": "12.13.0"
      },
      "s3": {
        "templates": {
@@ -184,29 +167,18 @@
          }
        }
      }
-    },
-    "additionalHelpFlags": [
-      "-h"
-    ],
-    "additionalVersionFlags": [
-      "-v"
-    ]
+    }
  },
  "repository": "expo/eas-cli",
  "scripts": {
-    "postpack": "rimraf oclif.manifest.json",
-    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
-    "pretarball-ci": "./scripts/pretarball-ci.sh",
+    "postpack": "rm -f oclif.manifest.json",
+    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme && node patch-readme",
    "build": "tsc --project tsconfig.build.json",
    "watch": "yarn build --watch --preserveWatchOutput",
    "typecheck": "tsc",
    "test": "jest",
-    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
+    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rimraf dist build tmp node_modules yarn-error.log"
-  },
-  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "clean": "rm -rf dist build node_modules yarn-error.log"
  }
 }
@@ -1,7 +1,7 @@
-const fs = require('fs/promises');
+const { promises: fs } = require('fs');

 (async () => {
-  // Patch `oclif readme` path and link generation
+  // Patch `oclif-dev readme` path and link generation
  let readmeContent = await fs.readFile('README.md', 'utf8');
  readmeContent = readmeContent.replace(/\[build\//g, '[src/');
  readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
@@ -1,793 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-06/schema",
-  "type": "object",
-  "definitions": {
-    "apple": {
-      "AppleKidsAge": {
-        "enum": [
-          "FIVE_AND_UNDER",
-          "SIX_TO_EIGHT",
-          "NINE_TO_ELEVEN"
-        ]
-      },
-      "AppleRating": {
-        "enum": [
-          "NONE",
-          "INFREQUENT_OR_MILD",
-          "FREQUENT_OR_INTENSE"
-        ]
-      },
-      "AppleCategory": {
-        "type": "array",
-        "description": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array.",
-        "markdownDescription": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array. E.g.\n\n- `[\"SPORTS\"]`\n- `[\"SPORTS\", \"LIFESTYLE\"]`\n- `[[\"GAMES\", \"GAMES_CARD\"], \"ENTERTAINMENT\"]`\n- `[\"GAMES\", \"WEATHER\"]`",
-        "minItems": 1,
-        "maxItems": 2,
-        "uniqueItems": true,
-        "defaultSnippets": [
-          {
-            "label": "Basic categories",
-            "description": "Add two simple categories",
-            "body": [
-              "$1",
-              "$2"
-            ]
-          },
-          {
-            "label": "Category with subcategories",
-            "description": "Add a category containing subcategories",
-            "body": [
-              [
-                "${1|GAMES,STICKERS|}",
-                "$3",
-                "$4"
-              ]
-            ]
-          }
-        ],
-        "items": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/root"
-            },
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/parent"
-            },
-            {
-              "type": "array",
-              "description": "The GAMES category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "GAMES"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                }
-              ]
-            },
-            {
-              "type": "array",
-              "description": "The STICKERS category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "STICKERS"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                }
-              ]
-            }
-          ]
-        },
-        "categories": {
-          "root": {
-            "enum": [
-              "BUSINESS",
-              "SOCIAL_NETWORKING",
-              "MEDICAL",
-              "FOOD_AND_DRINK",
-              "EDUCATION",
-              "BOOKS",
-              "SPORTS",
-              "FINANCE",
-              "REFERENCE",
-              "GRAPHICS_AND_DESIGN",
-              "DEVELOPER_TOOLS",
-              "HEALTH_AND_FITNESS",
-              "MUSIC",
-              "WEATHER",
-              "TRAVEL",
-              "ENTERTAINMENT",
-              "LIFESTYLE",
-              "MAGAZINES_AND_NEWSPAPERS",
-              "UTILITIES",
-              "SHOPPING",
-              "PRODUCTIVITY",
-              "NEWS",
-              "PHOTO_AND_VIDEO",
-              "NAVIGATION"
-            ]
-          },
-          "parent": {
-            "enum": [
-              "GAMES",
-              "STICKERS"
-            ]
-          },
-          "games": {
-            "enum": [
-              "GAMES_SPORTS",
-              "GAMES_WORD",
-              "GAMES_MUSIC",
-              "GAMES_ADVENTURE",
-              "GAMES_ACTION",
-              "GAMES_ROLE_PLAYING",
-              "GAMES_CASUAL",
-              "GAMES_BOARD",
-              "GAMES_TRIVIA",
-              "GAMES_CARD",
-              "GAMES_PUZZLE",
-              "GAMES_CASINO",
-              "GAMES_STRATEGY",
-              "GAMES_SIMULATION",
-              "GAMES_RACING",
-              "GAMES_FAMILY"
-            ]
-          },
-          "stickers": {
-            "enum": [
-              "STICKERS_PLACES_AND_OBJECTS",
-              "STICKERS_EMOJI_AND_EXPRESSIONS",
-              "STICKERS_CELEBRATIONS",
-              "STICKERS_CELEBRITIES",
-              "STICKERS_MOVIES_AND_TV",
-              "STICKERS_SPORTS_AND_ACTIVITIES",
-              "STICKERS_EATING_AND_DRINKING",
-              "STICKERS_CHARACTERS",
-              "STICKERS_ANIMALS",
-              "STICKERS_FASHION",
-              "STICKERS_ART",
-              "STICKERS_GAMING",
-              "STICKERS_KIDS_AND_FAMILY",
-              "STICKERS_PEOPLE",
-              "STICKERS_MUSIC"
-            ]
-          }
-        }
-      },
-      "AppleInfo": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "title",
-          "privacyPolicyUrl"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Create the minimum required locale properties",
-            "body": {
-              "title": "${1:App title}",
-              "privacyPolicyUrl": "https://${3:www.}"
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Create all available locale properties",
-            "body": {
-              "title": "${1:App title}",
-              "subtitle": "${2:Subtitle for your app}",
-              "description": "${3:A longer description of what your app does}",
-              "keywords": [
-                "${4:keyword}"
-              ],
-              "releaseNotes": "${5:Bug fixes and improved stability}",
-              "promoText": "${6:Short tagline for your app}",
-              "marketingUrl": "https://${7:www.}",
-              "supportUrl": "https://${8:www.}",
-              "privacyPolicyUrl": "https://${9:www.}",
-              "privacyChoicesUrl": "https://${10:www.}"
-            }
-          }
-        ],
-        "properties": {
-          "title": {
-            "type": "string",
-            "description": "Name of the app in the store. This should be similar to the installed app name.",
-            "minLength": 2,
-            "maxLength": 30,
-            "meta": {
-              "storeInfo": "The name will be reviewed before it is made available on the App Store."
-            }
-          },
-          "subtitle": {
-            "type": "string",
-            "description": "Subtext for the app. Example: 'A Fun Game For Friends'",
-            "maxLength": 30,
-            "meta": {
-              "storeInfo": "The subtitle will be reviewed before it is made available on the App Store."
-            }
-          },
-          "description": {
-            "type": "string",
-            "description": "Main description of what the app does",
-            "minLength": 10,
-            "maxLength": 4000,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "keywords": {
-            "type": "array",
-            "description": "List of keywords to help users find the app in the App Store",
-            "uniqueItems": true,
-            "items": {
-              "maxLength": 100,
-              "type": "string"
-            },
-            "meta": {
-              "versioned": true
-            }
-          },
-          "releaseNotes": {
-            "type": "string",
-            "description": "Changes since the last public version",
-            "maxLength": 4000,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "promoText": {
-            "type": "string",
-            "description": "Short tagline for the app",
-            "maxLength": 170,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true,
-              "aso": false
-            }
-          },
-          "marketingUrl": {
-            "type": "string",
-            "description": "URL to the app marketing page",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "supportUrl": {
-            "type": "string",
-            "description": "URL to the app support page",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "privacyPolicyText": {
-            "type": "string",
-            "description": "Privacy policy for Apple TV"
-          },
-          "privacyPolicyUrl": {
-            "type": "string",
-            "description": "A URL that links to your privacy policy. A privacy policy is required for all apps.",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "privacyChoicesUrl": {
-            "type": "string",
-            "description": "A URL where users can modify and delete the data collected from the app, or decide how their data is used and shared.",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true,
-              "optional": true
-            }
-          }
-        }
-      },
-      "AppleAdvisory": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "alcoholTobaccoOrDrugUseOrReferences",
-          "contests",
-          "gamblingSimulated",
-          "horrorOrFearThemes",
-          "matureOrSuggestiveThemes",
-          "medicalOrTreatmentInformation",
-          "profanityOrCrudeHumor",
-          "sexualContentGraphicAndNudity",
-          "sexualContentOrNudity",
-          "violenceCartoonOrFantasy",
-          "violenceRealistic",
-          "violenceRealisticProlongedGraphicOrSadistic",
-          "gambling",
-          "unrestrictedWebAccess",
-          "kidsAgeBand",
-          "seventeenPlus"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Create an advisory that disables all age-rated properties, for when your app does nothing",
-            "body": {
-              "alcoholTobaccoOrDrugUseOrReferences": "NONE",
-              "contests": "NONE",
-              "gamblingSimulated": "NONE",
-              "horrorOrFearThemes": "NONE",
-              "matureOrSuggestiveThemes": "NONE",
-              "medicalOrTreatmentInformation": "NONE",
-              "profanityOrCrudeHumor": "NONE",
-              "sexualContentGraphicAndNudity": "NONE",
-              "sexualContentOrNudity": "NONE",
-              "violenceCartoonOrFantasy": "NONE",
-              "violenceRealistic": "NONE",
-              "violenceRealisticProlongedGraphicOrSadistic": "NONE",
-              "gambling": false,
-              "unrestrictedWebAccess": false,
-              "kidsAgeBand": null,
-              "seventeenPlus": false
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Create an advisory that enables some of the age-rated properties",
-            "body": {
-              "alcoholTobaccoOrDrugUseOrReferences": "${1|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "contests": "${2|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "gamblingSimulated": "${3|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "horrorOrFearThemes": "${4|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "matureOrSuggestiveThemes": "${5|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "medicalOrTreatmentInformation": "${6|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "profanityOrCrudeHumor": "${7|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "sexualContentGraphicAndNudity": "${8|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "sexualContentOrNudity": "${9|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceCartoonOrFantasy": "${10|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceRealistic": "${11|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceRealisticProlongedGraphicOrSadistic": "${12|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "unrestrictedWebAccess": false,
-              "gambling": false,
-              "kidsAgeBand": null,
-              "seventeenPlus": false
-            }
-          }
-        ],
-        "properties": {
-          "alcoholTobaccoOrDrugUseOrReferences": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain alcohol, tobacco, or drug use or references?"
-          },
-          "contests": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain contests?"
-          },
-          "gamblingSimulated": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain simulated gambling?"
-          },
-          "medicalOrTreatmentInformation": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain medical or treatment information?"
-          },
-          "profanityOrCrudeHumor": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain profanity or crude humor?"
-          },
-          "sexualContentGraphicAndNudity": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain graphic sexual content and nudity?"
-          },
-          "sexualContentOrNudity": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain sexual content or nudity?"
-          },
-          "horrorOrFearThemes": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain horror or fear themes?"
-          },
-          "matureOrSuggestiveThemes": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain mature or suggestive themes?"
-          },
-          "violenceCartoonOrFantasy": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain cartoon or fantasy violence?"
-          },
-          "violenceRealisticProlongedGraphicOrSadistic": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain prolonged graphic or sadistic realistic violence?"
-          },
-          "violenceRealistic": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain realistic violence?"
-          },
-          "unrestrictedWebAccess": {
-            "type": "boolean",
-            "description": "Does your app contain unrestricted web access, such as with an embedded browser?"
-          },
-          "gambling": {
-            "type": "boolean",
-            "description": "Does your app contain gambling?"
-          },
-          "kidsAgeBand": {
-            "oneOf": [
-              {
-                "type": "null"
-              },
-              {
-                "$ref": "#/definitions/apple/AppleKidsAge"
-              }
-            ],
-            "description": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n@see https://developer.apple.com/news/?id=091202019a",
-            "markdownDescription": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n\n[Learn more](https://developer.apple.com/news/?id=091202019a)"
-          },
-          "seventeenPlus": {
-            "type": "boolean",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          }
-        }
-      },
-      "AppleRelease": {
-        "type": "object",
-        "description": "Configure how the app is released in the app store.",
-        "additionalProperties": false,
-        "properties": {
-          "automaticRelease": {
-            "description": "If and how the app should automatically be released when approved by App Store review.",
-            "markdownDescription": "If and how the app should automatically be released when approved by App Store review.\n- `false` - Manually release the app after store approval. (default behavior)\n- `true` - Automatically release after store approval.\n- `Date` - Automatically schedule release on this date, after store approval.\n\nApple does not guarantee that your app is available at the chosen scheduled release date.",
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "date-time"
-              },
-              {
-                "type": "boolean"
-              }
-            ],
-            "defaultSnippets": [
-              {
-                "label": "Manual release",
-                "description": "Manually release the app after store approval",
-                "body": false
-              },
-              {
-                "label": "Automatic release",
-                "description": "Automatically release the app after store approval",
-                "body": true
-              },
-              {
-                "label": "Scheduled release",
-                "description": "Automatically release the app on this date, and store approval",
-                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}T${3:$CURRENT_HOUR}:00:00+00:00"
-              }
-            ]
-          },
-          "phasedRelease": {
-            "type": "boolean",
-            "description": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time.\n@see https://help.apple.com/app-store-connect/#/dev3d65fcee1",
-            "markdownDescription": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates.\n\nKeep in mind that this version will still be available to all users as a manual update from the App Store.\n\nYou can pause the phased release for up to 30 days or release this update to all users at any time.\n\n[Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)"
-          }
-        }
-      },
-      "AppleReview": {
-        "type": "object",
-        "description": "Info provided to the App Store review team to help them understand how to use your app.",
-        "required": [
-          "firstName",
-          "lastName",
-          "email",
-          "phone"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Only define the contact details in case communcation is needed with the App Store review team.",
-            "body": {
-              "firstName": "$1",
-              "lastName": "$2",
-              "email": "$3",
-              "phone": "+$4"
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Define the demo account credentials, additional info, and contact details for the App Store review team.",
-            "body": {
-              "firstName": "$1",
-              "lastName": "$2",
-              "email": "$3",
-              "phone": "+$4",
-              "demoUsername": "$5",
-              "demoPassword": "$6",
-              "demoRequired": true,
-              "notes": "$7"
-            }
-          }
-        ],
-        "properties": {
-          "firstName": {
-            "type": "string",
-            "description": "First name of contact in case communication is needed with the App Store review team.",
-            "minLength": 1
-          },
-          "lastName": {
-            "type": "string",
-            "description": "Last name of contact in case communication is needed with the App Store review team.",
-            "minLength": 1
-          },
-          "email": {
-            "type": "string",
-            "description": "Email address of contact in case communication is needed with the App Store review team.",
-            "format": "email"
-          },
-          "phone": {
-            "type": "string",
-            "description": "Phone number of contact in case communication is needed with the App Store review team. Preface the phone number with ‘+’ followed by the country code (for example, +44 844 209 0611)"
-          },
-          "demoUsername": {
-            "type": "string",
-            "description": "The user name to sign in to your app to review its features."
-          },
-          "demoPassword": {
-            "type": "string",
-            "description": "The password to sign in to your app to review its features."
-          },
-          "demoRequired": {
-            "type": "boolean",
-            "description": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review. Credentials must be valid and active for duration of review.",
-            "markdownDescription": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review.\n\n**Credentials must be valid and active for duration of review.**"
-          },
-          "notes": {
-            "type": "string",
-            "description": "Additional information about your app that can help during the review process. Do not include demo account details.",
-            "markdownDescription": "Additional information about your app that can help during the review process.\n\n**Do not include demo account details.**",
-            "minLength": 2,
-            "maxLength": 4000
-          }
-        }
-      }
-    },
-    "AppleConfig": {
-      "type": "object",
-      "description": "Configuration that is specific to the Apple App Store.",
-      "additionalProperties": false,
-      "properties": {
-        "version": {
-          "type": "string",
-          "description": "The version string to edit, or create, if it doesn't exist. All the metadata will be stored on this app version.",
-          "minLength": 1,
-          "defaultSnippets": [
-            {
-              "body": "${1:1}.${2:0}"
-            }
-          ]
-        },
-        "copyright": {
-          "type": "string",
-          "description": "The updated company copyright. Example: 2021 Evan Bacon",
-          "defaultSnippets": [
-            {
-              "body": "$CURRENT_YEAR ${1:name}"
-            }
-          ],
-          "meta": {
-            "versioned": true,
-            "liveEdits": true,
-            "storeInfo": "The name of the person or entity that owns the exclusive rights to your app, preceded by the year the rights were obtained (for example, \"2008 Acme Inc.\"). Do not provide a URL."
-          }
-        },
-        "advisory": {
-          "$ref": "#/definitions/apple/AppleAdvisory"
-        },
-        "categories": {
-          "$ref": "#/definitions/apple/AppleCategory"
-        },
-        "info": {
-          "description": "Localized core app info",
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "ar-SA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Arabic"
-            },
-            "ca": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Catalan"
-            },
-            "zh-Hans": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Chinese (Simplified)"
-            },
-            "zh-Hant": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Chinese (Traditional)"
-            },
-            "hr": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Croatian"
-            },
-            "cs": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Czech"
-            },
-            "da": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Danish"
-            },
-            "nl-NL": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Dutch"
-            },
-            "en-AU": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (Australia)"
-            },
-            "en-CA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (Canada)"
-            },
-            "en-GB": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (U.K.)"
-            },
-            "en-US": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (U.S.)"
-            },
-            "fi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Finnish"
-            },
-            "fr-FR": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "French"
-            },
-            "fr-CA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "French (Canada)"
-            },
-            "de-DE": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "German"
-            },
-            "el": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Greek"
-            },
-            "he": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hebrew"
-            },
-            "hi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hindi"
-            },
-            "hu": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hungarian"
-            },
-            "id": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Indonesian"
-            },
-            "it": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Italian"
-            },
-            "ja": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Japanese"
-            },
-            "ko": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Korean"
-            },
-            "ms": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Malay"
-            },
-            "no": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Norwegian"
-            },
-            "pl": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Polish"
-            },
-            "pt-BR": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Portuguese (Brazil)"
-            },
-            "pt-PT": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Portuguese (Portugal)"
-            },
-            "ro": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Romanian"
-            },
-            "ru": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Russian"
-            },
-            "sk": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Slovak"
-            },
-            "es-MX": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Spanish (Mexico)"
-            },
-            "es-ES": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Spanish (Spain)"
-            },
-            "sv": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Swedish"
-            },
-            "th": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Thai"
-            },
-            "tr": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Turkish"
-            },
-            "uk": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Ukrainian"
-            },
-            "vi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Vietnamese"
-            }
-          }
-        },
-        "release": {
-          "$ref": "#/definitions/apple/AppleRelease",
-          "description": "Release strategy"
-        },
-        "review": {
-          "$ref": "#/definitions/apple/AppleReview",
-          "description": "Info for the App Store reviewer"
-        }
-      }
-    }
-  },
-  "properties": {
-    "configVersion": {
-      "const": 0,
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ]
-}
@@ -1,7 +0,0 @@
-const spawn = require('@expo/spawn-async');
-
-(async () => {
-  if (!process.env.CLI_SIZE_CHECK) {
-    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
-  }
-})();
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-EAS_CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-PACKAGE_JSON_PATH="$EAS_CLI_DIR/package.json"
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  sed -i '' "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-else
-  sed -i  "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-fi
@@ -0,0 +1,27 @@
+import { JSONValue } from '@expo/json-file';
+import { HTTPError, RequestError } from 'got/dist/source';
+
+export default class ApiV2Error extends RequestError {
+  readonly name = 'ApiV2Error';
+  readonly expoApiV2ErrorCode: string;
+  readonly expoApiV2ErrorDetails?: JSONValue;
+  readonly expoApiV2ErrorServerStack?: string;
+  readonly expoApiV2ErrorMetadata?: object;
+
+  constructor(
+    originalError: HTTPError,
+    response: {
+      message: string;
+      code: string;
+      stack?: string;
+      details?: JSONValue;
+      metadata?: object;
+    }
+  ) {
+    super(response.message, originalError, originalError.request);
+    this.expoApiV2ErrorCode = response.code;
+    this.expoApiV2ErrorDetails = response.details;
+    this.expoApiV2ErrorServerStack = response.stack;
+    this.expoApiV2ErrorMetadata = response.metadata;
+  }
+}
@@ -1,7 +1,9 @@
 import assert from 'assert';
+import { RequestError } from 'got/dist/source';
 import nock from 'nock';

-import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';
+import ApiV2Error from '../ApiV2Error';
+import { apiClient, getExpoApiBaseUrl } from '../api';

 describe('apiClient', () => {
  it('converts Expo APIv2 error to ApiV2Error', async () => {
@@ -21,7 +23,7 @@ describe('apiClient', () => {

    let error: Error | null = null;
    try {
-      await api.postAsync('test', { body: {} });
+      await apiClient.post('test');
    } catch (e: any) {
      error = e;
    }
@@ -41,11 +43,11 @@ describe('apiClient', () => {

    let error: Error | null = null;
    try {
-      await api.postAsync('test', { body: {} });
+      await apiClient.post('test');
    } catch (e: any) {
      error = e;
    }
-    expect(error).not.toBeNull();
+    expect(error).toBeInstanceOf(RequestError);
    expect(error).not.toBeInstanceOf(ApiV2Error);
  });
 });
@@ -1,17 +0,0 @@
-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);
-  });
-});
@@ -0,0 +1,3 @@
+export function asMock(fn: any): jest.Mock {
+  return fn as jest.Mock;
+}
@@ -1,5 +1,5 @@
 import { logEvent } from './rudderstackClient';
-export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
+export type Event = BuildEvent | SubmissionEvent;

 export enum SubmissionEvent {
  SUBMIT_COMMAND = 'submit cli submit command',
@@ -15,9 +15,6 @@ export enum SubmissionEvent {
  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
-  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
-  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
 }

 export enum BuildEvent {
@@ -48,11 +45,6 @@ export enum BuildEvent {
  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
 }

-export enum MetadataEvent {
-  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
-  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
-}
-
 export class Analytics {
  static logEvent(name: Event, properties: Record<string, any>): void {
    logEvent(name, properties);
@@ -1,94 +1,42 @@
-import { JSONValue } from '@expo/json-file';
+import got, { HTTPError, NormalizedOptions, RequestError } from 'got';

-import fetch, { RequestError, RequestInit } from './fetch';
+import ApiV2Error from './ApiV2Error';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';

-export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
-  readonly expoApiV2ErrorCode: string;
-  readonly expoApiV2ErrorDetails?: JSONValue;
-  readonly expoApiV2ErrorServerStack?: string;
-  readonly expoApiV2ErrorMetadata?: object;
-
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-  }) {
-    super(response.message);
-    this.expoApiV2ErrorCode = response.code;
-    this.expoApiV2ErrorDetails = response.details;
-    this.expoApiV2ErrorServerStack = response.stack;
-    this.expoApiV2ErrorMetadata = response.metadata;
-  }
-}
-
-interface RequestOptions {
-  body: JSONValue;
-}
-
-export const api = {
-  async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
-  },
-
-  async postAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
-  },
-
-  async deleteAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'DELETE' });
-  },
-
-  async getAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'GET' });
-  },
-};
-
-async function requestAsync(path: string, options: RequestInit): Promise<any> {
-  try {
-    const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
-      ...options,
-      headers: {
-        'Content-Type': 'application/json',
-        ...getAuthHeaders(),
+export const apiClient = got.extend({
+  prefixUrl: getExpoApiBaseUrl() + '/v2/',
+  hooks: {
+    beforeRequest: [
+      (options: NormalizedOptions) => {
+        const token = getAccessToken();
+        if (token) {
+          options.headers.authorization = `Bearer ${token}`;
+          return;
+        }
+        const sessionSecret = getSessionSecret();
+        if (sessionSecret) {
+          options.headers['expo-session'] = sessionSecret;
+        }
      },
-    });
-    return await response.json();
-  } catch (err) {
-    await handleApiErrorAsync(err);
-  }
-}
-
-async function handleApiErrorAsync(err: any): Promise<void> {
-  if (err instanceof RequestError) {
-    let result: { [key: string]: any };
-    try {
-      result = (await err.response.json()) as { [key: string]: any };
-    } catch {
-      throw new Error(`Malformed api response: ${await err.response.text()}`);
-    }
-    if (result.errors?.length) {
-      throw new ApiV2Error(result.errors[0]);
-    }
-  } else {
-    throw err;
-  }
-}
-
-function getAuthHeaders(): Record<string, string> {
-  const token = getAccessToken();
-  if (token) {
-    return { authorization: `Bearer ${token}` };
-  }
-  const sessionSecret = getSessionSecret();
-  if (sessionSecret) {
-    return { 'expo-session': sessionSecret };
-  }
-  return {};
-}
+    ],
+    beforeError: [
+      (error: RequestError): RequestError => {
+        if (error instanceof HTTPError) {
+          let result: { [key: string]: any };
+          try {
+            result = JSON.parse(error.response.body as string);
+          } catch (e2) {
+            return error;
+          }
+          if (result.errors?.length) {
+            return new ApiV2Error(error, result.errors[0]);
+          }
+        }
+        return error;
+      },
+    ],
+  },
+});

 export function getExpoApiBaseUrl(): string {
  if (process.env.EXPO_STAGING) {
@@ -109,13 +57,3 @@ export function getExpoWebsiteBaseUrl(): string {
    return `https://expo.dev`;
  }
 }
-
-export function getEASUpdateURL(projectId: string): string {
-  if (process.env.EXPO_STAGING) {
-    return new URL(projectId, `https://staging-u.expo.dev`).href;
-  } else if (process.env.EXPO_LOCAL) {
-    return new URL(`expo-updates/${projectId}`, `http://127.0.0.1:3000`).href;
-  } else {
-    return new URL(projectId, `https://u.expo.dev`).href;
-  }
-}
@@ -1,114 +0,0 @@
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-
-import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { UpdateBranchFragment } from '../graphql/generated';
-import { BranchQuery } from '../graphql/queries/BranchQuery';
-import Log from '../log';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../update/utils';
-import { printJsonOnlyOutput } from '../utils/json';
-import {
-  paginatedQueryWithConfirmPromptAsync,
-  paginatedQueryWithSelectPromptAsync,
-} from '../utils/queries';
-
-export const BRANCHES_LIMIT = 50;
-
-export async function selectBranchFromPaginatedQueryAsync(
-  projectId: string,
-  promptTitle: string,
-  options: PaginatedQueryOptions
-): Promise<UpdateBranchFragment> {
-  if (options.nonInteractive) {
-    throw new Error('Unable to select a branch in non-interactive mode.');
-  }
-
-  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
-    limit: options.limit ?? BRANCHES_LIMIT,
-    offset: options.offset,
-    queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
-    promptOptions: {
-      title: promptTitle,
-      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      createDisplayTextForSelectionPromptListItem: updateBranchFragment =>
-        updateBranchFragment.name,
-    },
-  });
-  if (!selectedBranch) {
-    throw new Error(`Could not find any branches for project "${projectId}"`);
-  }
-  return selectedBranch;
-}
-
-export async function listAndRenderPaginatedBranchesAsync(
-  projectId: string,
-  options: PaginatedQueryOptions
-): Promise<void> {
-  if (options.nonInteractive) {
-    const branches = await queryBranchesForProjectAsync(
-      options.limit ?? BRANCHES_LIMIT,
-      options.offset,
-      projectId
-    );
-    renderPageOfBranches(branches, options);
-  } else {
-    await paginatedQueryWithConfirmPromptAsync({
-      limit: options.limit ?? BRANCHES_LIMIT,
-      offset: options.offset,
-      queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
-      promptOptions: {
-        title: 'Load more branches?',
-        renderListItems: branches => renderPageOfBranches(branches, options),
-      },
-    });
-  }
-}
-
-async function queryBranchesForProjectAsync(
-  limit: number,
-  offset: number,
-  projectId: string
-): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesAsync({
-    appId: projectId,
-    limit,
-    offset,
-  });
-}
-
-function renderPageOfBranches(
-  currentPage: UpdateBranchFragment[],
-  { json }: PaginatedQueryOptions
-): void {
-  if (json) {
-    printJsonOnlyOutput(currentPage);
-  } else {
-    const table = new CliTable({
-      head: ['Branch', ...UPDATE_COLUMNS],
-      wordWrap: true,
-    });
-
-    table.push(
-      ...currentPage.map(branch => {
-        const update: UpdateBranchFragment['updates'][0] | undefined = branch.updates[0];
-        return [
-          branch.name,
-          formatUpdate(update),
-          update?.runtimeVersion ?? 'N/A',
-          update?.group ?? 'N/A',
-          update?.group
-            ? getPlatformsForGroup({
-                updates: branch.updates,
-                group: update.group,
-              })
-            : 'N/A',
-        ];
-      })
-    );
-
-    Log.addNewLineIfNone();
-    Log.log(chalk.bold('Branches:'));
-    Log.addNewLineIfNone();
-    Log.log(table.toString());
-  }
-}
@@ -1,14 +0,0 @@
-import { truncateGitCommitMessage } from '../metadata';
-
-describe(truncateGitCommitMessage, () => {
-  it('returns undefined if no message was passed', () => {
-    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
-  });
-  it('returns commit message', () => {
-    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
-  });
-
-  it('truncates long commit messages', () => {
-    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
-  });
-});
@@ -0,0 +1,97 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
+
+import Log from '../../log';
+import { getProjectAccountName } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { ensureValidVersions } from '../utils/updates';
+
+export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  const androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
+
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, result);
+  }
+}
+
+export async function syncUpdatesConfigurationAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  try {
+    await ensureUpdatesConfiguredAsync(projectDir);
+  } catch (error) {
+    Log.error(
+      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
+    );
+    throw error;
+  }
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  let androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
+    androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, androidManifest);
+  }
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    Log.warn(
+      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
+    );
+  }
+}
+
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
+  const androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
+    throw new Error('Missing values in AndroidManifest.xml');
+  }
+}
+
+export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    return AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      AndroidConfig.Updates.Config.RELEASE_CHANNEL
+    );
+  } catch (err) {
+    return null;
+  }
+}
+
+export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    const stringifiedRequestHeaders = AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
+    );
+    if (!stringifiedRequestHeaders) {
+      return null;
+    }
+    return JSON.parse(stringifiedRequestHeaders)['expo-channel-name'] ?? null;
+  } catch (err) {
+    return null;
+  }
+}
+
+async function getAndroidManifestAsync(projectDir: string): Promise<AndroidManifest> {
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  if (!androidManifestPath) {
+    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
+  }
+  return AndroidConfig.Manifest.readAndroidManifestAsync(androidManifestPath);
+}
@@ -73,39 +73,39 @@ describe(bumpVersionAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(124);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(124);

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

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

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('3.0.1');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.1');
    expect(appJSON.expo.android.versionCode).toBe(123);

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

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(123);

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

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(127);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -156,11 +156,11 @@ describe(bumpVersionInAppJsonAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('5.0.1');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.1');
@@ -172,11 +172,11 @@ describe(bumpVersionInAppJsonAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
    expect(fakeExp.version).toBe('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -189,7 +189,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from native code', async () => {
      const exp = initBareWorkflowProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -201,7 +201,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from expo config', async () => {
      const exp = initManagedProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -240,7 +240,7 @@ function initBareWorkflowProject({
 }`,
      './android/app/src/main/AndroidManifest.xml': 'fake',
    },
-    '/app'
+    '/repo'
  );

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

  return fakeExp;
@@ -1,12 +1,10 @@
 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 {
@@ -26,10 +24,9 @@ import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';

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

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

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

 export async function prepareAndroidBuildAsync(
@@ -84,14 +71,11 @@ export async function prepareAndroidBuildAsync(
    ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
      return await ensureAndroidCredentialsAsync(ctx);
    },
-    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+    ensureProjectConfiguredAsync: async () => {
+      await validateAndSyncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
+        buildProfile: ctx.buildProfile,
      });
    },
    prepareJobAsync: async (
@@ -103,8 +87,7 @@ export async function prepareAndroidBuildAsync(
    sendBuildRequestAsync: async (
      appId: string,
      job: Android.Job,
-      metadata: Metadata,
-      buildParams: BuildParamsInput
+      metadata: Metadata
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
@@ -112,7 +95,6 @@ export async function prepareAndroidBuildAsync(
        appId,
        job: graphqlJob,
        metadata: graphqlMetadata,
-        buildParams,
      });
    },
  });
@@ -0,0 +1,75 @@
+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 Log from '../../log';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
+} from '../../project/android/applicationId';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { getVcsClient } from '../../vcs';
+import { ConfigureContext } from '../context';
+import { isExpoUpdatesInstalled } from '../utils/updates';
+import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+
+export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
+  if (!ctx.hasAndroidNativeProject) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    return;
+  }
+
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
+
+  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
+
+  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
+  await getVcsClient().trackFileAsync(easGradlePath);
+
+  if (isExpoUpdatesInstalled(ctx.projectDir)) {
+    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
+  }
+  Log.withTick('Android project configured');
+}
+
+export async function validateAndSyncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  buildProfile,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
+      throw new Error(
+        'Project is not configured. Please run "eas build:configure" to configure the project.'
+      );
+    }
+    if (isExpoUpdatesInstalled(projectDir)) {
+      await syncUpdatesConfigurationAsync(projectDir, exp);
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  }
+}
+
+function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.VERSION_CODE;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'versionCode') {
+    return BumpStrategy.VERSION_CODE;
+  } else {
+    return BumpStrategy.APP_VERSION;
+  }
+}
@@ -13,14 +13,11 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    secrets: job.secrets,
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
-    version: job.version?.versionCode ? { versionCode: job.version.versionCode } : undefined,
    gradleCommand: job.gradleCommand,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
    username: job.username,
    buildType: job.buildType && transformBuildType(job.buildType),
    developmentClient: job.developmentClient,
-    experimental: job.experimental,
  };
 }

@@ -72,18 +72,9 @@ export async function prepareJobAsync(
    updates: { channel: ctx.buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
+    artifactPath: buildProfile.artifactPath,
    buildType,
    username,
-    ...(ctx.android.versionCodeOverride && {
-      version: {
-        versionCode: ctx.android.versionCodeOverride,
-      },
-    }),
-    experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
-    },
  };

  return sanitizeJob(job);
@@ -1,67 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement } from '@expo/eas-json';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import Log from '../../log';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  localAutoIncrement,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
-
-  if (workflow === Workflow.GENERIC) {
-    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
-    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.VERSION_CODE;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'versionCode') {
-    return BumpStrategy.VERSION_CODE;
-  } else {
-    return BumpStrategy.APP_VERSION;
-  }
-}
-
-// TODO: remove this after a few months
-export async function cleanUpOldEasBuildGradleScriptAsync(projectDir: string): Promise<void> {
-  const easBuildGradlePath = path.join(projectDir, 'android', 'app', 'eas-build.gradle');
-  if (await fs.pathExists(easBuildGradlePath)) {
-    Log.withTick(`Removing ${chalk.bold('eas-build.gradle')} as it's not longer necessary`);
-    await fs.remove(easBuildGradlePath);
-
-    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-    const buildGradleContents = await fs.readFile(buildGradlePath, 'utf-8');
-    const buildGradleContentsWithoutApply = buildGradleContents.replace(
-      /apply from: ["'].\/eas-build.gradle["']\n/,
-      ''
-    );
-    if (buildGradleContentsWithoutApply !== buildGradleContents) {
-      await fs.writeFile(buildGradlePath, buildGradleContentsWithoutApply);
-    }
-  }
-}
@@ -1,21 +1,16 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig, Updates } from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

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

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

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

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

 import { withAnalyticsAsync } from '../analytics/common';
 import { BuildEvent } from '../analytics/events';
-import { getExpoWebsiteBaseUrl } from '../api';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildParamsInput,
-  BuildPriority,
-  BuildStatus,
-  UploadSessionType,
-} from '../graphql/generated';
+import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log, { learnMore } from '../log';
-import { Ora, ora } from '../ora';
-import {
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  requestedPlatformDisplayNames,
-} from '../platform';
-import { uploadFileAtPathToS3Async } from '../uploads';
+import { ora } from '../ora';
+import { requestedPlatformDisplayNames } from '../platform';
+import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -52,24 +38,13 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
  ensureCredentialsAsync(
    ctx: BuildContext<TPlatform>
  ): Promise<CredentialsResult<Credentials> | undefined>;
-  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
-  sendBuildRequestAsync(
-    appId: string,
-    job: TJob,
-    metadata: Metadata,
-    buildParams: BuildParamsInput
-  ): Promise<BuildResult>;
+  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): 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,
@@ -85,13 +60,14 @@ export async function prepareBuildRequestForPlatformAsync<
      trackingCtx: ctx.trackingCtx,
    }
  );
-
-  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
-    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-    trackingCtx: ctx.trackingCtx,
-  });
+  if (!ctx.skipProjectConfiguration) {
+    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
+      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+      trackingCtx: ctx.trackingCtx,
+    });
+  }

  if (await getVcsClient().isCommitRequiredAsync()) {
    Log.addNewLineIfNone();
@@ -112,7 +88,6 @@ 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,
@@ -120,49 +95,49 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
+      await runLocalBuildAsync(job, ctx.localBuildOptions);
      return undefined;
    } else {
      try {
-        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
+        return await sendBuildRequestAsync(builder, job, metadata);
      } catch (error: any) {
-        handleBuildRequestError(error, job.platform);
+        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.');
+          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.'
+          );
+          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.'
+          );
+          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
+        ) {
+          Log.error(
+            `You have already reached the maximum number of pending ${
+              requestedPlatformDisplayNames[job.platform]
+            } builds for your account. Try again later.`
+          );
+          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.'
+          );
+        }
+        throw error;
      }
    }
  };
 }

-function handleBuildRequestError(error: any, platform: Platform): never {
-  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-    Log.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
-    throw new Error('Build request failed.');
-  } else if (
-    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
-  ) {
-    Log.error(
-      'EAS Build is down for maintenance. Try again later. Check https://status.expo.dev/ for updates.'
-    );
-    throw new Error('Build request failed.');
-  } else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
-    Log.error(
-      'EAS Build free tier is temporarily disabled. Try again later. Check https://status.expo.dev/ for updates.'
-    );
-    throw new Error('Build request failed.');
-  } else if (
-    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
-  ) {
-    Log.error(
-      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
-    );
-    throw new Error('Build request failed.');
-  } else if (error?.graphQLErrors) {
-    Log.error(
-      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
-    );
-  }
-  throw error;
-}
-
 async function uploadProjectAsync<TPlatform extends Platform>(
  ctx: BuildContext<TPlatform>
 ): Promise<string> {
@@ -170,16 +145,10 @@ async function uploadProjectAsync<TPlatform extends Platform>(
  try {
    return await withAnalyticsAsync(
      async () => {
-        Log.newLine();
-        Log.log(
-          `Compressing project files and uploading to EAS Build. ${learnMore(
-            'https://expo.fyi/eas-build-archive'
-          )}`
-        );
        const projectTarball = await makeProjectTarballAsync();
        projectTarballPath = projectTarball.path;

-        const { bucketKey } = await uploadFileAtPathToS3Async(
+        const { bucketKey } = await uploadAsync(
          UploadSessionType.EasBuildProjectSources,
          projectTarball.path,
          createProgressTracker({
@@ -188,7 +157,10 @@ async function uploadProjectAsync<TPlatform extends Platform>(
              `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
                projectTarball.size
              )})`,
-            completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
+            completedMessage: (duration: string) =>
+              `Uploaded to EAS ${chalk.dim(duration)} ${learnMore(
+                'https://expo.fyi/eas-build-archive'
+              )}`,
          })
        );
        return bucketKey;
@@ -210,8 +182,7 @@ 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,
-  buildParams: BuildParamsInput
+  metadata: Metadata
 ): Promise<BuildFragment> {
  const { ctx } = builder;
  return await withAnalyticsAsync(
@@ -223,8 +194,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
      const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
        ctx.projectId,
        job,
-        metadata,
-        buildParams
+        metadata
      );

      printDeprecationWarnings(deprecationInfo);
@@ -239,247 +209,104 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
  );
 }

-type MaybeBuildFragment = BuildFragment | null;
-
 export async function waitForBuildEndAsync(
-  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  { intervalSec = 10 } = {}
-): Promise<MaybeBuildFragment[]> {
-  let spinner;
-  let originalSpinnerText;
-  if (buildIds.length === 1) {
-    Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
-    originalSpinnerText = 'Waiting for build to complete.';
-    spinner = ora(originalSpinnerText).start();
-  } else {
-    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
-    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
-  }
-  while (true) {
-    const builds = await getBuildsSafelyAsync(buildIds);
-    const { refetch } =
-      builds.length === 1
-        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
-        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
-    if (!refetch) {
-      return builds;
+  buildIds: string[],
+  { timeoutSec = 3600, intervalSec = 30 } = {}
+): Promise<(BuildFragment | null)[]> {
+  Log.log(
+    `Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`
+  );
+  const spinner = ora().start();
+  let time = new Date().getTime();
+  const endTime = time + timeoutSec * 1000;
+  while (time <= endTime) {
+    const builds: (BuildFragment | null)[] = await Promise.all(
+      buildIds.map(async buildId => {
+        try {
+          return await BuildQuery.byIdAsync(buildId, { useCache: false });
+        } catch (err) {
+          Log.debug('Failed to fetch the build status', err);
+          return null;
+        }
+      })
+    );
+    if (builds.length === 1) {
+      const [build] = builds;
+      if (build !== null) {
+        switch (build.status) {
+          case BuildStatus.Finished:
+            spinner.succeed('Build finished');
+            return builds;
+          case BuildStatus.New:
+            spinner.text = 'Build created';
+            break;
+          case BuildStatus.InQueue:
+            spinner.text = 'Build queued...';
+            break;
+          case BuildStatus.Canceled:
+            spinner.text = 'Build canceled';
+            spinner.stopAndPersist();
+            return builds;
+          case BuildStatus.InProgress:
+            spinner.text = 'Build in progress...';
+            break;
+          case BuildStatus.Errored:
+            spinner.fail('Build failed');
+            if (build.error) {
+              return builds;
+            } else {
+              throw new Error(`Standalone build failed!`);
+            }
+          default:
+            spinner.warn('Unknown status');
+            throw new Error(`Unknown build status: ${build.status} - aborting!`);
+        }
+      } else {
+        if (!spinner.text) {
+          spinner.text = 'Could not fetch the build status. Check your network connection.';
+        }
+      }
+    } else {
+      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
+        spinner.succeed('All builds have finished');
+        return builds;
+      } else if (
+        builds.filter(build =>
+          build?.status
+            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
+                build.status
+              )
+            : false
+        ).length === builds.length
+      ) {
+        spinner.fail('Some of the builds were canceled or failed.');
+        return builds;
+      } else {
+        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
+        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
+        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
+        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
+        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
+        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
+        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
+        spinner.text = [
+          newBuilds && `Builds created: ${newBuilds}`,
+          inQueue && `Builds in queue: ${inQueue}`,
+          inProgress && `Builds in progress: ${inProgress}`,
+          canceled && `Builds canceled: ${canceled}`,
+          errored && chalk.red(`Builds failed: ${errored}`),
+          finished && chalk.green(`Builds finished: ${finished}`),
+          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
+        ]
+          .filter(i => i)
+          .join('\t');
+      }
    }
+    time = new Date().getTime();
    await sleepAsync(intervalSec * 1000);
  }
-}
-
-async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
-  const promises = buildIds.map(async buildId => {
-    try {
-      return await BuildQuery.byIdAsync(buildId, { useCache: false });
-    } catch (err) {
-      Log.debug('Failed to fetch the build status', err);
-      return null;
-    }
-  });
-  return await Promise.all(promises);
-}
-
-interface BuildProgressResult {
-  refetch: boolean;
-}
-
-let queueProgressBarStarted = false;
-const queueProgressBar = new cliProgress.SingleBar(
-  { format: '|{bar}| {estimatedWaitTime}' },
-  cliProgress.Presets.rect
-);
-
-async function handleSingleBuildProgressAsync(
-  { build, accountName }: { build: MaybeBuildFragment; accountName: string },
-  { spinner }: { spinner: Ora }
-): Promise<BuildProgressResult> {
-  if (build === null) {
-    spinner.text = 'Could not fetch the build status. Check your network connection.';
-    return { refetch: true };
-  }
-
-  if (queueProgressBarStarted && build?.status && build.status !== BuildStatus.InQueue) {
-    if (build.status === BuildStatus.InProgress) {
-      queueProgressBar.update(queueProgressBar.getTotal(), {
-        estimatedWaitTime: '',
-      });
-    }
-    queueProgressBar.stop();
-    Log.newLine();
-    queueProgressBarStarted = false;
-    spinner.start('Build is about to start');
-  }
-
-  switch (build.status) {
-    case BuildStatus.Finished:
-      spinner.succeed('Build finished');
-      return { refetch: false };
-    case BuildStatus.New:
-      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk.underline(
-        formatAccountSubscriptionsUrl(accountName)
-      )}.`;
-      break;
-    case BuildStatus.InQueue: {
-      spinner.text = 'Build queued...';
-      const progressBarPayload =
-        typeof build.estimatedWaitTimeLeftSeconds === 'number'
-          ? { estimatedWaitTime: formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds) }
-          : { estimatedWaitTime: '' };
-
-      if (
-        !queueProgressBarStarted &&
-        typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number'
-      ) {
-        spinner.stopAndPersist();
-        if (build.priority !== BuildPriority.High) {
-          Log.newLine();
-          Log.log('Start builds sooner in the priority queue.');
-          Log.log(
-            `Sign up for EAS Production or Enterprise at ${chalk.underline(
-              formatAccountSubscriptionsUrl(accountName)
-            )}`
-          );
-        }
-        Log.newLine();
-        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
-        queueProgressBar.start(
-          build.initialQueuePosition + 1,
-          build.initialQueuePosition - build.queuePosition + 1,
-          progressBarPayload
-        );
-        queueProgressBarStarted = true;
-      }
-      if (typeof build.queuePosition === 'number') {
-        queueProgressBar.update(build.queuePosition, progressBarPayload);
-      }
-      break;
-    }
-    case BuildStatus.Canceled:
-      spinner.fail('Build canceled');
-      return { refetch: false };
-    case BuildStatus.InProgress:
-      spinner.text = 'Build in progress...';
-      break;
-    case BuildStatus.Errored:
-      spinner.fail('Build failed');
-      if (build.error) {
-        return { refetch: false };
-      } else {
-        throw new Error('Standalone build failed!');
-      }
-    default:
-      spinner.warn('Unknown status');
-      throw new Error(`Unknown build status: ${build.status} - aborting!`);
-  }
-  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',
-  [BuildStatus.InProgress]: 'in progress',
-  [BuildStatus.Canceled]: 'canceled',
-  [BuildStatus.Finished]: 'finished',
-  [BuildStatus.Errored]: 'failed',
-};
-
-const platforms = [AppPlatform.Android, AppPlatform.Ios];
-
-async function handleMultipleBuildsProgressAsync(
-  { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
-  { spinner, originalSpinnerText }: { spinner: Ora; originalSpinnerText: string }
-): Promise<BuildProgressResult> {
-  const buildCount = maybeBuilds.length;
-  const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
-
-  const allFinished =
-    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
-  const allSettled =
-    builds.filter(build =>
-      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
-    ).length === buildCount;
-
-  if (allSettled) {
-    if (allFinished) {
-      spinner.succeed(formatSettledBuildsText(builds));
-    } else {
-      spinner.fail(formatSettledBuildsText(builds));
-    }
-    return { refetch: false };
-  } else {
-    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
-    return { refetch: true };
-  }
-}
-
-function formatSettledBuildsText(builds: BuildFragment[]): string {
-  return platforms
-    .map(platform => {
-      const build = nullthrows(
-        builds.find(build => build.platform === platform),
-        `Build for platform ${platform} must be defined in this context`
-      );
-      return `${appPlatformEmojis[platform]} ${
-        appPlatformDisplayNames[platform]
-      } build - status: ${chalk.bold(statusToDisplayName[build.status])}`;
-    })
-    .join('\n  ');
-}
-
-function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
-  return [
-    originalSpinnerText,
-    ...platforms.map(platform => {
-      const build = builds.find(build => build.platform === platform);
-      const status = build ? statusToDisplayName[build.status] : 'unknown';
-      let extraInfo = '';
-      if (
-        build?.status === BuildStatus.InQueue &&
-        typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number'
-      ) {
-        const percent = Math.floor(
-          ((build.initialQueuePosition - build.queuePosition + 1) /
-            (build.initialQueuePosition + 1)) *
-            100
-        );
-        const estimatedWaitTime =
-          typeof build.estimatedWaitTimeLeftSeconds === 'number'
-            ? ` - ${formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds)}`
-            : '';
-        extraInfo = ` - queue progress: ${chalk.bold(`${percent}%`)}${estimatedWaitTime}`;
-      }
-      return `${appPlatformEmojis[platform]} ${
-        appPlatformDisplayNames[platform]
-      } build - status: ${chalk.bold(status)}${extraInfo}`;
-    }),
-  ].join('\n  ');
-}
-
-function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {
-  return maybeBuild !== null;
-}
-
-function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
-  if (estimatedWaitTimeLeftSeconds < 5 * 60) {
-    return 'starting soon...';
-  } else {
-    const n = Math.floor(estimatedWaitTimeLeftSeconds / (10 * 60)) + 1;
-    return `starting in about ${n}0 minutes...`;
-  }
-}
-
-function formatAccountSubscriptionsUrl(accountName: string): string {
-  return new URL(
-    `/accounts/${accountName}/settings/subscriptions`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
+  spinner.warn('Timed out');
+  throw new Error(
+    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
+  );
 }
@@ -1,47 +1,97 @@
+import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import fs from 'fs-extra';

-import Log from '../log';
+import Log, { learnMore } from '../log';
+import { RequestedPlatform } from '../platform';
 import { resolveWorkflowAsync } from '../project/workflow';
+import { confirmAsync, promptAsync } from '../prompts';
+import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
+import { configureAndroidAsync } from './android/configure';
+import { ConfigureContext } from './context';
+import { configureIosAsync } from './ios/configure';
+import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';

-interface ConfigureParams {
-  projectDir: string;
-  nonInteractive: boolean;
-}
+const configureCommitMessage = {
+  [RequestedPlatform.Android]: 'Configure EAS Build for Android',
+  [RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
+  [RequestedPlatform.All]: 'Configure EAS Build',
+};

-/**
- * Creates eas.json if it does not exist.
- *
- * Returns:
- * - false - if eas.json already exists
- * - true - if eas.json was created by the function
- */
 export async function ensureProjectConfiguredAsync(
-  configureParams: ConfigureParams
-): Promise<boolean> {
-  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
-    return false;
+  projectDir: string,
+  requestedPlatform: RequestedPlatform
+): Promise<void> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
+    return;
  }

-  await configureAsync(configureParams);
-  return true;
+  const message = 'This project is not configured to build with EAS. Set it up now?';
+  const confirm = await confirmAsync({ message });
+  if (confirm) {
+    await configureAsync({
+      projectDir,
+      platform: requestedPlatform,
+    });
+    if (await getVcsClient().isCommitRequiredAsync()) {
+      error(
+        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
+        { exit: 1 }
+      );
+    }
+  } else {
+    error(
+      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
+        'https://docs.expo.dev/build/eas-json'
+      )})`,
+      { exit: 1 }
+    );
+  }
 }

-async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
+export async function configureAsync(options: {
+  platform: RequestedPlatform;
+  projectDir: string;
+}): Promise<void> {
  await maybeBailOnRepoStatusAsync();

-  await createEasJsonAsync(projectDir);
+  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
+
+  const ctx: ConfigureContext = {
+    user: await ensureLoggedInAsync(),
+    projectDir: options.projectDir,
+    exp,
+    requestedPlatform: options.platform,
+    shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
+      options.platform
+    ),
+    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
+    hasAndroidNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.ANDROID)) === Workflow.GENERIC,
+    hasIosNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.IOS)) === Workflow.GENERIC,
+  };
+
+  Log.newLine();
+  await ensureEasJsonExistsAsync(ctx);
+  if (ctx.shouldConfigureAndroid) {
+    await configureAndroidAsync(ctx);
+  }
+  if (ctx.shouldConfigureIos) {
+    await configureIosAsync(ctx);
+  }

  if (await getVcsClient().isCommitRequiredAsync()) {
    Log.newLine();
-    await reviewAndCommitChangesAsync('Configure EAS Build', {
-      nonInteractive,
-    });
+    await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
+  } else if (!(await getVcsClient().hasUncommittedChangesAsync())) {
+    Log.newLine();
+    Log.withTick('No changes were necessary, the project is already configured correctly.');
  }
 }

@@ -88,19 +138,58 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
  },
 };

-async function createEasJsonAsync(projectDir: string): Promise<void> {
-  const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
+export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
+
+  if (await fs.pathExists(easJsonPath)) {
+    const reader = new EasJsonReader(ctx.projectDir);
+    await reader.readAsync();
+
+    Log.withTick('Validated eas.json');
+    return;
+  }

-  const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
-  const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
  const easJson =
-    hasAndroidNativeProject || hasIosNativeProject
+    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
      ? EAS_JSON_BARE_DEFAULT
      : EAS_JSON_MANAGED_DEFAULT;

  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
  await getVcsClient().trackFileAsync(easJsonPath);
-  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
+  Log.withTick('Generated eas.json');
+}
+
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Skip,
+}
+
+async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  askedFirstTime: boolean = true
+): Promise<void> {
+  const { selected } = await promptAsync({
+    type: 'select',
+    name: 'selected',
+    message: 'Can we commit these changes to git for you?',
+    choices: [
+      { title: 'Yes', value: ShouldCommitChanges.Yes },
+      ...(askedFirstTime
+        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
+        : []),
+      {
+        title: 'Skip committing changes, I will do it later on my own',
+        value: ShouldCommitChanges.Skip,
+      },
+    ],
+  });
+
+  if (selected === ShouldCommitChanges.Yes) {
+    await commitPromptAsync({ initialCommitMessage });
+    Log.withTick('Committed changes');
+  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
+    await getVcsClient().showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, false);
+  }
 }
@@ -1,50 +1,57 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJson } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
-import { BuildResourceClass } from '../graphql/generated';
+import { RequestedPlatform } from '../platform';
 import { GradleBuildContext } from '../project/android/gradle';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { LocalBuildOptions } from './local';

+export interface ConfigureContext {
+  user: Actor;
+  projectDir: string;
+  exp: ExpoConfig;
+  requestedPlatform: RequestedPlatform;
+  shouldConfigureAndroid: boolean;
+  shouldConfigureIos: boolean;
+  hasAndroidNativeProject: boolean;
+  hasIosNativeProject: boolean;
+}
+
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;

 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;
+  skipProjectConfiguration: boolean;
  trackingCtx: TrackingContext;
  user: Actor;
  workflow: Workflow;
@@ -1,14 +1,12 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJson } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
-import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';

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

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

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

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

@@ -84,23 +72,19 @@ export async function createBuildContextAsync<T extends Platform>({
    accountName,
    buildProfile,
    buildProfileName,
-    resourceClass,
-    easJsonCliConfig,
    clearCache,
    credentialsCtx,
    exp,
    localBuildOptions,
    nonInteractive,
-    noWait,
    platform,
    projectDir,
    projectId,
    projectName,
+    skipProjectConfiguration,
    trackingCtx,
    user,
    workflow,
-    message,
-    runFromCI,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -0,0 +1,91 @@
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
+
+import Log from '../../log';
+import { getProjectAccountName } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
+import { getVcsClient } from '../../vcs';
+import { ensureValidVersions } from '../utils/updates';
+
+export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+
+  let expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
+    expoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
+    await writeExpoPlistAsync(projectDir, expoPlist);
+  }
+  // TODO: ensure ExpoPlist in pbxproj
+}
+
+export async function syncUpdatesConfigurationAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  try {
+    await ensureUpdatesConfiguredAsync(projectDir);
+  } catch (error) {
+    Log.error(
+      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
+    );
+    throw error;
+  }
+
+  let expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
+    expoPlist = IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
+    await writeExpoPlistAsync(projectDir, expoPlist);
+  }
+
+  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
+    Log.warn(
+      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
+    );
+  }
+}
+
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
+  const expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
+    throw new Error('Missing values in Expo.plist');
+  }
+}
+
+async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
+  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
+  return ((await readPlistAsync(expoPlistPath)) ?? {}) as IOSConfig.ExpoPlist;
+}
+
+async function writeExpoPlistAsync(
+  projectDir: string,
+  expoPlist: IOSConfig.ExpoPlist
+): Promise<void> {
+  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
+  await writePlistAsync(expoPlistPath, expoPlist);
+  await getVcsClient().trackFileAsync(expoPlistPath);
+}
+
+export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const expoPlist = await readExpoPlistAsync(projectDir);
+    return expoPlist[IOSConfig.Updates.Config.RELEASE_CHANNEL] ?? null;
+  } catch (err) {
+    return null;
+  }
+}
+
+export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const expoPlist: any = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
+    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+    return updatesRequestHeaders['expo-channel-name'] ?? null;
+  } catch (err) {
+    return null;
+  }
+}
@@ -3,7 +3,6 @@ import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
-import type { XCBuildConfiguration } from 'xcode';

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

 jest.mock('fs');

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

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

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

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

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

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

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

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

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

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

-import { IosCredentials } from '../../credentials/ios/types';
-import { BuildParamsInput } from '../../graphql/generated';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
@@ -11,11 +11,10 @@ import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from
 import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { validateAndSyncProjectConfigurationAsync } from './configure';
 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>
@@ -37,29 +36,22 @@ export async function createIosContextAsync(
    },
    buildProfile
  );
-  const targets = await resolveTargetsAsync({
-    projectDir: ctx.projectDir,
-    exp: ctx.exp,
-    xcodeBuildContext,
-    env: buildProfile.env,
-  });
+  const targets = await resolveTargetsAsync(
+    {
+      projectDir: ctx.projectDir,
+      exp: ctx.exp,
+    },
+    xcodeBuildContext
+  );
  const applicationTarget = findApplicationTarget(targets);
-  const buildNumberOverride =
-    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteBuildNumberAsync({
-          projectDir: ctx.projectDir,
-          projectId: ctx.projectId,
-          exp: ctx.exp,
-          applicationTarget,
-          buildProfile,
-        })
-      : undefined;
+  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
+
  return {
    bundleIdentifier: applicationTarget.bundleIdentifier,
    applicationTarget,
+    applicationTargetBuildSettings,
    targets,
    xcodeBuildContext,
-    buildNumberOverride,
  };
 }

@@ -71,15 +63,12 @@ export async function prepareIosBuildAsync(
    ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
    },
-    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+    ensureProjectConfiguredAsync: async () => {
+      await validateAndSyncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        targets: ctx.ios.targets,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
+        buildProfile: ctx.buildProfile,
+        buildSettings: ctx.ios.applicationTargetBuildSettings,
      });
    },
    prepareJobAsync: async (
@@ -94,8 +83,7 @@ export async function prepareIosBuildAsync(
    sendBuildRequestAsync: async (
      appId: string,
      job: Ios.Job,
-      metadata: Metadata,
-      buildParams: BuildParamsInput
+      metadata: Metadata
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
@@ -103,8 +91,22 @@ 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 ?? {};
+}
@@ -0,0 +1,66 @@
+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 Log from '../../log';
+import {
+  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject,
+} from '../../project/ios/bundleIdentifier';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { ConfigureContext } from '../context';
+import { isExpoUpdatesInstalled } from '../utils/updates';
+import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+
+export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
+  if (!ctx.hasIosNativeProject) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    return;
+  }
+
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
+
+  if (isExpoUpdatesInstalled(ctx.projectDir)) {
+    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
+  }
+  Log.withTick('iOS project configured');
+}
+
+export async function validateAndSyncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  buildProfile,
+  buildSettings,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  buildProfile: BuildProfile<Platform.IOS>;
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    if (isExpoUpdatesInstalled(projectDir)) {
+      await syncUpdatesConfigurationAsync(projectDir, exp);
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  }
+}
+
+function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.BUILD_NUMBER;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'buildNumber') {
+    return BumpStrategy.BUILD_NUMBER;
+  } else {
+    return BumpStrategy.APP_VERSION;
+  }
+}
@@ -2,6 +2,7 @@ import { Platform } from '@expo/eas-build-job';

 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
 import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
@@ -18,6 +19,13 @@ export async function ensureIosCredentialsAsync(
  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
    app: getAppFromContext(buildCtx.credentialsCtx),
    targets,
+    iosCapabilitiesOptions: {
+      entitlements: await resolveEntitlementsJsonAsync(
+        buildCtx.projectDir,
+        buildCtx.workflow,
+        buildCtx.buildProfile.env ?? {}
+      ),
+    },
    distribution: buildCtx.buildProfile.distribution ?? 'store',
    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
  });
@@ -1,4 +1,4 @@
-import { Ios } from '@expo/eas-build-job';
+import { Env, Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';

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

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

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

  return {
    buildCredentials,
+    environmentSecrets: secrets.env,
  };
 }
@@ -64,18 +64,8 @@ export async function prepareJobAsync(
    simulator: ctx.buildProfile.simulator,
    scheme: jobData.buildScheme,
    buildConfiguration: ctx.buildProfile.buildConfiguration,
-    applicationArchivePath:
-      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
-    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
+    artifactPath: ctx.buildProfile.artifactPath,
    username,
-    ...(ctx.ios.buildNumberOverride && {
-      version: {
-        buildNumber: ctx.ios.buildNumberOverride,
-      },
-    }),
-    experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
-    },
  };
  return sanitizeJob(job);
 }
@@ -1,45 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { Platform, Workflow } from '@expo/eas-build-job';
-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';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  targets,
-  localAutoIncrement,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  targets: Target[];
-  localAutoIncrement?: IosVersionAutoIncrement;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
-
-  if (workflow === Workflow.GENERIC) {
-    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
-    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.BUILD_NUMBER;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'buildNumber') {
-    return BumpStrategy.BUILD_NUMBER;
-  } else {
-    return BumpStrategy.APP_VERSION;
-  }
-}
@@ -1,25 +1,16 @@
-import { ExpoConfig } from '@expo/config';
-import { IOSConfig, Updates } from '@expo/config-plugins';
+import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';

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

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

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

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

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

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

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

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.99';
+const PLUGIN_PACKAGE_VERSION = '0.0.56';

 export interface LocalBuildOptions {
  enable: boolean;
  skipCleanup?: boolean;
  skipNativeBuild?: boolean;
  artifactsDir?: string;
-  artifactPath?: string;
  workingdir?: string;
  verbose?: boolean;
 }

-export async function runLocalBuildAsync(
-  job: Job,
-  metadata: Metadata,
-  options: LocalBuildOptions
-): Promise<void> {
-  const { command, args } = await getCommandAndArgsAsync(job, metadata);
+export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void> {
+  const { command, args } = await getCommandAndArgsAsync(job);
  let spinner;
  if (!options.verbose) {
    spinner = ora().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
@@ -46,7 +41,6 @@ export async function runLocalBuildAsync(
          : {}),
        ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
        ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
-        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
      },
    });
    childProcess = spawnPromise.child;
@@ -57,18 +51,15 @@ export async function runLocalBuildAsync(
  }
 }

-async function getCommandAndArgsAsync(
-  job: Job,
-  metadata: Metadata
-): Promise<{ command: string; args: string[] }> {
-  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
+async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
+  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
    return {
      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobAndMetadataBase64],
+      args: [jobBase64],
    };
  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
    if (await isAtLeastNpm7Async()) {
      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
      // prompting the user to install a package that is used for the first time
@@ -5,59 +5,65 @@ import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';

 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
-import {
-  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
-  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
-} from '../update/android/UpdatesModule';
-import {
-  readChannelSafelyAsync as readIosChannelSafelyAsync,
-  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from '../update/ios/UpdatesModule';
+import { getUsername } from '../project/projectUtils';
 import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
+import {
+  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
+} from './android/UpdatesModule';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
+import {
+  readChannelSafelyAsync as readIosChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
+} from './ios/UpdatesModule';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { isExpoUpdatesInstalled } from './utils/updates';
+
+// TODO(JJ): Replace this with the getRuntimeVersionNullable function in @expo/config-plugins
+function getRuntimeVersionNullable(
+  ...[config, platform]: Parameters<typeof Updates.getRuntimeVersion>
+): string | null {
+  try {
+    return Updates.getRuntimeVersion(config, platform);
+  } catch (e) {
+    Log.debug(e);
+    return null;
+  }
+}

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<Metadata> {
-  const vcsClient = getVcsClient();
  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
  const distribution =
    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
      ? 'simulator'
      : ctx.buildProfile.distribution) ?? 'store';
-  const metadata: Metadata = {
+  const metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    runtimeVersion: getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
    reactNativeVersion: await getReactNativeVersionAsync(ctx),
    ...channelOrReleaseChannel,
    distribution,
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcsClient.getCommitHashAsync(),
-    gitCommitMessage: truncateGitCommitMessage(
-      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
-    ),
-    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
+    gitCommitHash: await getVcsClient().getCommitHashAsync(),
+    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
-    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
        ctx as BuildContext<Platform.IOS>
      ),
    }),
-    runWithNoWaitFlag: ctx.noWait,
-    runFromCI: ctx.runFromCI,
  };
  return sanitizeMetadata(metadata);
 }
@@ -67,32 +73,14 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
    const iosContext = ctx as BuildContext<Platform.IOS>;
-    const resolvedVersion = await maybeResolveIosVersionsAsync(
+    return await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext.ios.targets
+      iosContext.ios.applicationTargetBuildSettings
    );
-    if (iosContext.ios.buildNumberOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: iosContext.ios.buildNumberOverride,
-      };
-    }
-    return resolvedVersion;
  } else if (ctx.platform === Platform.ANDROID) {
    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
-    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      androidCtx.buildProfile
-    );
-    if (androidCtx.android.versionCodeOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: androidCtx.android.versionCodeOverride,
-      };
-    }
-    return resolvedVersion;
+    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
  } else {
    throw new Error(`Unsupported platform ${ctx.platform}`);
  }
@@ -174,13 +162,3 @@ function resolveIosEnterpriseProvisioning(
 ): IosEnterpriseProvisioning | undefined {
  return ctx.buildProfile.enterpriseProvisioning;
 }
-
-export function truncateGitCommitMessage(
-  msg: string | undefined,
-  maxLength: number = 4096
-): string | undefined {
-  if (msg === undefined) {
-    return undefined;
-  }
-  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
-}
@@ -1,24 +1,9 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  AppVersionSource,
-  BuildProfile,
-  EasJson,
-  EasJsonAccessor,
-  EasJsonUtils,
-  SubmitProfile,
-} from '@expo/eas-json';
+import { BuildProfile, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

-import {
-  AppPlatform,
-  BuildFragment,
-  BuildResourceClass,
-  BuildStatus,
-  BuildWithSubmissionsFragment,
-  SubmissionFragment,
-} from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
+import { AppPlatform, BuildFragment, BuildStatus, SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -29,19 +14,12 @@ 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';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
 import { getVcsClient } from '../vcs';
 import { prepareAndroidBuildAsync } from './android/build';
@@ -51,7 +29,6 @@ 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';
@@ -61,6 +38,7 @@ let sdkVersionChecked = false;

 export interface BuildFlags {
  requestedPlatform: RequestedPlatform;
+  skipProjectConfiguration: boolean;
  profile?: string;
  nonInteractive: boolean;
  wait: boolean;
@@ -69,40 +47,18 @@ 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);

-  await ensureProjectConfiguredAsync({
-    projectDir,
-    nonInteractive: flags.nonInteractive,
-  });
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const easJsonCliConfig: EasJson['cli'] =
-    (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
+  await ensureProjectConfiguredAsync(projectDir, flags.requestedPlatform);

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

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

@@ -182,41 +128,20 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
  }

  if (!flags.wait) {
-    if (flags.json) {
-      printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
-    }
    return;
  }

-  const { accountName } = Object.values(buildCtxByPlatform)[0];
-  const builds = await waitForBuildEndAsync({
-    buildIds: startedBuilds.map(({ build }) => build.id),
-    accountName,
-  });
-  if (!flags.json) {
-    printBuildResults(builds);
-  }
+  const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
+  printBuildResults(builds, flags.json);

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

@@ -225,28 +150,21 @@ 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,
+    skipProjectConfiguration: flags.skipProjectConfiguration,
    localBuildOptions: flags.localBuildOptions,
-    easJsonCliConfig,
-    message: flags.message,
  });

  if (moreBuilds) {
@@ -258,10 +176,7 @@ async function prepareAndStartBuildAsync({
      )}`
    );
  }
-  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
-  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
-    validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
-  }
+
  if (buildCtx.workflow === Workflow.MANAGED) {
    if (!sdkVersionChecked) {
      await checkExpoSdkIsSupportedAsync(buildCtx);
@@ -12,8 +12,3 @@ export enum BuildDistributionType {
  INTERNAL = 'internal',
  SIMULATOR = 'simulator',
 }
-
-export enum UserInputResourceClass {
-  DEFAULT = 'default',
-  LARGE = 'large',
-}
@@ -1,5 +1,5 @@
 import { Workflow } from '@expo/eas-build-job';
-import { Errors } from '@oclif/core';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';

@@ -64,7 +64,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
    if (install) {
      await installExpoDevClientAsync(projectDir, { nonInteractive });
    } else {
-      Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
+      error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
        exit: 1,
      });
    }
@@ -83,7 +83,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
      initial: false,
    });
    if (!shouldContinue) {
-      Errors.error('Come back later', { exit: 1 });
+      error('Come back later', { exit: 1 });
    }
  }
 }
@@ -14,6 +14,7 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

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

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

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

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

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

@@ -0,0 +1,14 @@
+import { ExpoConfig, getPackageJson } from '@expo/config';
+
+export function isExpoUpdatesInstalled(projectDir: string): boolean {
+  const packageJson = getPackageJson(projectDir);
+  return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
+}
+
+export function ensureValidVersions(exp: ExpoConfig): void {
+  if (!exp.runtimeVersion && !exp.sdkVersion) {
+    throw new Error(
+      "Couldn't find either 'runtimeVersion' or 'sdkVersion' to configure 'expo-updates'. Please specify at least one of these properties under the 'expo' key in 'app.json'"
+    );
+  }
+}
@@ -4,24 +4,20 @@ import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
 import { AppPlatform, BuildFragment } from '../../graphql/generated';

 export function getProjectDashboardUrl(accountName: string, projectName: string): string {
-  return new URL(
-    `/accounts/${accountName}/projects/${projectName}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
+  return `${getExpoWebsiteBaseUrl()}/accounts/${accountName}/projects/${projectName}`;
 }

 export function getBuildLogsUrl(build: BuildFragment): string {
  const { project } = build;
-  const url =
-    project.__typename !== 'App'
-      ? `/builds/${build.id}`
-      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
-
-  return new URL(url, getExpoWebsiteBaseUrl()).toString();
+  if (project.__typename === 'App') {
+    return `${getExpoWebsiteBaseUrl()}/accounts/${project.ownerAccount.name}/builds/${build.id}`;
+  } else {
+    return `${getExpoWebsiteBaseUrl()}/builds/${build.id}`;
+  }
 }

 export function getArtifactUrl(artifactId: string): string {
-  return new URL(`/artifacts/${artifactId}`, getExpoWebsiteBaseUrl()).toString();
+  return `${getExpoWebsiteBaseUrl()}/artifacts/${artifactId}`;
 }

 export function getInternalDistributionInstallUrl(build: BuildFragment): string {
@@ -35,16 +31,3 @@ export function getInternalDistributionInstallUrl(build: BuildFragment): string

  return build.artifacts.buildUrl;
 }
-
-export function getUpdateGroupUrl(
-  accountName: string,
-  projectName: string,
-  updateGroupId: string
-): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/updates/${encodeURIComponent(updateGroupId)}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
@@ -1,11 +1,5 @@
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import * as PackageManagerUtils from '@expo/package-manager';
-import { Command, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-// eslint-disable-next-line no-restricted-imports
-import { Options, Ora } from 'ora';
-import path from 'path';
+import { EasJsonReader } from '@expo/eas-json';
+import { Command } from '@oclif/command';
 import semver from 'semver';

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

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

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

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

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

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

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

 jest.mock('../../user/User');
 jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
@@ -28,30 +32,17 @@ afterAll(() => {
 });

 beforeEach(() => {
-  jest
-    .mocked(getUserAsync)
+  asMock(getUserAsync)
    .mockReset()
-    .mockImplementation(async () => mockJester);
-  jest
-    .mocked(ensureLoggedInAsync)
+    .mockImplementation(() => mockJester);
+  asMock(ensureLoggedInAsync)
    .mockReset()
-    .mockImplementation(async () => mockJester);
-  jest.mocked(initAsync).mockReset();
-  jest.mocked(flushAsync).mockReset();
-  jest.mocked(logEvent).mockReset();
+    .mockImplementation(() => mockJester);
+  asMock(initAsync).mockReset();
+  asMock(flushAsync).mockReset();
+  asMock(logEvent).mockReset();
 });

-const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
-  class TestEasCommand extends EasCommand {
-    override requiresAuthentication = authValue;
-
-    async runAsync(): Promise<void> {}
-  }
-
-  TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
-  return TestEasCommand;
-};
-
 describe(EasCommand.name, () => {
  describe('without exceptions', () => {
    // The first test in this suite should have an increased timeout
@@ -62,36 +53,32 @@ describe(EasCommand.name, () => {
    // See https://github.com/oclif/command/blob/master/src/command.ts#L80
    // and look for "Config.load"
    it('ensures the user is logged in', async () => {
-      const TestEasCommand = createTestEasCommand(true);
      await TestEasCommand.run();

      expect(ensureLoggedInAsync).toHaveBeenCalled();
    }, 15_000);

    it('ensures the user data is read from cache', async () => {
-      const TestEasCommand = createTestEasCommand(false);
+      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
+
      await TestEasCommand.run();

-      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
-      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
+      expect(getUserAsync).toHaveReturnedWith(mockJester);
    });

    it('initializes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
      await TestEasCommand.run();

      expect(initAsync).toHaveBeenCalled();
    });

    it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
      await TestEasCommand.run();

      expect(flushAsync).toHaveBeenCalled();
    });

    it('logs events', async () => {
-      const TestEasCommand = createTestEasCommand(true);
      await TestEasCommand.run();

      expect(logEvent).toHaveBeenCalledWith('action', {
@@ -102,12 +89,11 @@ describe(EasCommand.name, () => {

  describe('after exceptions', () => {
    it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
      try {
        await TestEasCommand.run().then(() => {
          throw new Error('foo');
        });
-      } catch {}
+      } catch (error) {}

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

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

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

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

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

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

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

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

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

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

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

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

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

  async runAsync(): Promise<void> {
-    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
+    const { STATUS: status } = this.parse(AnalyticsView).args;
    if (status) {
      await UserSettings.setAsync('analyticsEnabled', status === 'on');
      Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

@@ -10,14 +11,12 @@ import {
  UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { getVcsClient } from '../../vcs';

 export async function createUpdateBranchOnAppAsync({
@@ -52,9 +51,10 @@ export async function createUpdateBranchOnAppAsync({
 }

 export default class BranchCreate extends EasCommand {
-  static override description = 'create a branch';
+  static hidden = true;
+  static description = 'Create a branch on the current project.';

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

-  static override flags = {
-    json: Flags.boolean({
+  static flags = {
+    json: flags.boolean({
      description: 'return a json with the new branch ID and name.',
      default: false,
    }),
@@ -73,13 +73,10 @@ export default class BranchCreate extends EasCommand {
    let {
      args: { name },
      flags,
-    } = await this.parse(BranchCreate);
-    if (flags.json) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchCreate);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);

@@ -91,7 +88,7 @@ export default class BranchCreate extends EasCommand {
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a branch name:',
+        message: 'Please name the branch:',
        initial:
          (await getVcsClient().getBranchNameAsync()) ||
          `branch-${Math.random().toString(36).substr(2, 4)}`,
@@ -102,11 +99,12 @@ export default class BranchCreate extends EasCommand {
    const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });

    if (flags.json) {
-      printJsonOnlyOutput(newBranch);
-    } else {
-      Log.withTick(
-        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
-      );
+      Log.log(newBranch);
+      return;
    }
+
+    Log.withTick(
+      `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
+    );
  }
 }
@@ -1,7 +1,9 @@
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

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

 async function getBranchInfoAsync({
  appId,
@@ -73,39 +76,43 @@ async function deleteBranchOnAppAsync({
 }

 export default class BranchDelete extends EasCommand {
-  static override description = 'delete a branch';
+  static hidden = true;
+  static description = 'Delete a branch on the current project';

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

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

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);

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

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

-    logger.withTick(
-      `Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
-    );
+    if (jsonFlag) {
+      Log.log(JSON.stringify(deletionResult));
+    }

-    return { jsonOutput: deletionResult };
+    Log.withTick(
+      `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+    );
  }
 }
@@ -1,28 +1,104 @@
-import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+import { print } from 'graphql';
+import gql from 'graphql-tag';
+
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { getExpoConfig } from '../../project/expoConfig';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+} from '../../graphql/generated';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
+import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { enableJsonOutput } from '../../utils/json';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+
+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 ?? [];
+}

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

-  static override flags = {
-    ...EasPaginatedQueryFlags,
+  static description = 'List all branches on this project.';
+
+  static flags = {
+    json: flags.boolean({
+      description: 'return output as JSON',
+      default: false,
+    }),
  };

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

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
-    await listAndRenderPaginatedBranchesAsync(projectId, options);
+    const branches = await listBranchesAsync({ projectId });
+    if (flags.json) {
+      Log.log(JSON.stringify(branches, null, 2));
+    } 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.`);
+      }
+    }
  }
 }
@@ -1,8 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';

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

  async runAsync(): Promise<void> {
    throw new Error(BranchPublish.description);
@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

@@ -11,14 +12,12 @@ import {
  UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function renameUpdateBranchOnAppAsync({
  appId,
@@ -52,18 +51,19 @@ async function renameUpdateBranchOnAppAsync({
 }

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

-  static override flags = {
-    from: Flags.string({
+  static flags = {
+    from: flags.string({
      description: 'current name of the branch.',
      required: false,
    }),
-    to: Flags.string({
+    to: flags.string({
      description: 'new name of the branch.',
      required: false,
    }),
-    json: Flags.boolean({
+    json: flags.boolean({
      description: `return a json with the edited branch's ID and name.`,
      default: false,
    }),
@@ -72,13 +72,10 @@ export default class BranchRename extends EasCommand {
  async runAsync(): Promise<void> {
    let {
      flags: { json: jsonFlag, from: currentName, to: newName },
-    } = await this.parse(BranchRename);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchRename);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);

@@ -90,7 +87,7 @@ export default class BranchRename extends EasCommand {
      ({ currentName } = await promptAsync({
        type: 'text',
        name: 'currentName',
-        message: "Provide the name of the branch you'd like to rename:",
+        message: 'Please enter the current name of the branch to rename:',
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -103,7 +100,7 @@ export default class BranchRename extends EasCommand {
      ({ newName } = await promptAsync({
        type: 'text',
        name: 'newName',
-        message: `Rename ${currentName}`,
+        message: `Please rename ${currentName}`,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -115,13 +112,14 @@ export default class BranchRename extends EasCommand {
    });

    if (jsonFlag) {
-      printJsonOnlyOutput(editedBranch);
-    } else {
-      Log.withTick(
-        `️Renamed branch from ${currentName} to ${chalk.bold(
-          editedBranch.name
-        )} on project ${chalk.bold(fullName)}.`
-      );
+      Log.log(JSON.stringify(editedBranch));
+      return;
    }
+
+    Log.withTick(
+      `️Renamed branch from ${currentName} to ${chalk.bold(
+        editedBranch.name
+      )} on project ${chalk.bold(fullName)}.`
+    );
  }
 }
@@ -1,15 +1,76 @@
-import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
+import chalk from 'chalk';
+import Table from 'cli-table3';
+import gql from 'graphql-tag';
+
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { getExpoConfig } from '../../project/expoConfig';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
+import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
-import { enableJsonOutput } from '../../utils/json';
+import { promptAsync } from '../../prompts';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import groupBy from '../../utils/expodash/groupBy';
+import formatFields from '../../utils/formatFields';
+
+const PAGE_LIMIT = 10_000;
+
+export async function viewUpdateBranchAsync({
+  appId,
+  name,
+}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<ViewBranchQuery> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<ViewBranchQuery, ViewBranchQueryVariables>(
+        gql`
+          query ViewBranch($appId: String!, $name: String!, $limit: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateBranchByName(name: $name) {
+                  id
+                  name
+                  updates(offset: 0, limit: $limit) {
+                    id
+                    group
+                    message
+                    createdAt
+                    runtimeVersion
+                    platform
+                    manifestFragment
+                    actor {
+                      id
+                      ... on User {
+                        username
+                      }
+                      ... on Robot {
+                        firstName
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        {
+          appId,
+          name,
+          limit: PAGE_LIMIT,
+        },
+        { additionalTypenames: ['UpdateBranch', 'Update'] }
+      )
+      .toPromise()
+  );
+  return data;
+}

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

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

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

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

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

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

-    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
+    const { app } = await viewUpdateBranchAsync({
+      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) {
+      Log.log(JSON.stringify({ ...UpdateBranch, updates }));
+      return;
+    }
+
+    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,
+        }),
+      ]);
+    }
+
+    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());
  }
 }
@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

@@ -13,7 +14,6 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { appPlatformEmojis } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
@@ -104,21 +104,21 @@ async function selectBuildToCancelAsync(
 async function ensureBuildExistsAsync(buildId: string): Promise<void> {
  try {
    await BuildQuery.byIdAsync(buildId);
-  } catch {
+  } catch (err) {
    throw new Error(`Couldn't find a build matching the id ${buildId}`);
  }
 }

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

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

  async runAsync(): Promise<void> {
-    const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
+    const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectFullName = await getProjectFullNameAsync(exp);

@@ -1,25 +1,19 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';

-import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
-import { ensureProjectConfiguredAsync } from '../../build/configure';
+import { configureAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { getVcsClient } from '../../vcs';

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

-  static override flags = {
-    platform: Flags.enum({
+  static flags = {
+    platform: flags.enum({
      description: 'Platform to configure',
      char: 'p',
      options: ['android', 'ios', 'all'],
@@ -27,65 +21,50 @@ export default class BuildConfigure extends EasCommand {
  };

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

    Log.log(
      '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
    );
+    Log.newLine();

    await getVcsClient().ensureRepoExistsAsync();

-    const projectDir = await findProjectRootAsync();
-    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
-
    const platform =
      (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());

-    // clean up old Android configuration
-    if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-      await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-    }
-
-    // ensure eas.json exists
-    Log.newLine();
-    await ensureProjectConfiguredAsync({
-      projectDir,
-      nonInteractive: false,
+    await configureAsync({
+      platform,
+      projectDir: await findProjectRootAsync(),
    });

-    // configure expo-updates
-    if (expoUpdatesIsInstalled) {
-      const exp = getExpoConfig(projectDir);
-
-      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
-        }
-      }
-
-      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp);
-        }
-      }
-    }
-
-    Log.addNewLineIfNone();
-
-    Log.log(`🎉 Your project is ready to build.
-
- Run ${chalk.bold('eas build')} when you are ready to create your first build.
- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to app stores.
- ${learnMore('https://docs.expo.dev/build/introduction', {
-      learnMoreMessage: 'Learn more about other capabilities of EAS Build',
-    })}`);
+    Log.newLine();
+    logSuccess(platform);
  }
 }

+function logSuccess(platform: RequestedPlatform): void {
+  let platformsText = 'iOS and Android projects are';
+  let storesText = 'the Apple App Store or Google Play Store';
+
+  if (platform === 'android') {
+    platformsText = 'Android project is';
+    storesText = 'the Google Play Store';
+  } else if (platform === 'ios') {
+    platformsText = 'iOS project is';
+    storesText = 'the Apple App Store Connect';
+  }
+
+  Log.log(`🎉 Your ${platformsText} ready to build.
+
+- Run ${chalk.bold('eas build')} when you are ready to create your first build.
+- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
+- ${learnMore('https://docs.expo.dev/build/introduction', {
+    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
+  })}`);
+}
+
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
-  Log.addNewLineIfNone();
  const { platform } = await promptAsync({
    type: 'select',
    message: 'Which platforms would you like to configure for EAS Build?',
@@ -1,21 +1,21 @@
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import { Errors, Flags } from '@oclif/core';
+import { EasJsonReader } from '@expo/eas-json';
+import { flags } from '@oclif/command';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import figures from 'figures';
-import path from 'path';
+import fs from 'fs-extra';

 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { UserInputResourceClass } from '../../build/types';
+import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { StatuspageServiceName } from '../../graphql/generated';
-import Log, { link } from '../../log';
+import Log, { learnMore, link } from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
-import uniq from '../../utils/expodash/uniq';
+import { easCliVersion } from '../../utils/easCli';
 import { enableJsonOutput } from '../../utils/json';
-import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
+import { getVcsClient, setVcsClient } from '../../vcs';
+import GitClient from '../../vcs/clients/git';

 interface RawBuildFlags {
  platform?: string;
@@ -24,128 +24,103 @@ interface RawBuildFlags {
  profile?: string;
  'non-interactive': boolean;
  local: boolean;
-  output?: string;
  wait: boolean;
  'clear-cache': boolean;
  json: boolean;
  'auto-submit': boolean;
  'auto-submit-with-profile'?: string;
-  'resource-class'?: UserInputResourceClass;
-  message?: string;
 }

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

-  static override flags = {
-    platform: Flags.enum({
+  static flags = {
+    platform: flags.enum({
      char: 'p',
      options: ['android', 'ios', 'all'],
    }),
-    'skip-credentials-check': Flags.boolean({
+    'skip-credentials-check': flags.boolean({
      default: false,
      hidden: true,
    }),
-    json: Flags.boolean({
+    json: flags.boolean({
      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
      default: false,
    }),
-    'skip-project-configuration': Flags.boolean({
+    'skip-project-configuration': flags.boolean({
      default: false,
-      hidden: true,
+      description: 'Skip project configuration',
    }),
-    profile: Flags.string({
-      char: 'e',
+    profile: flags.string({
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
-    'non-interactive': Flags.boolean({
+    'non-interactive': flags.boolean({
      default: false,
      description: 'Run command in non-interactive mode',
    }),
-    local: Flags.boolean({
+    local: flags.boolean({
      default: false,
      description: 'Run build locally [experimental]',
    }),
-    output: Flags.string({
-      description: 'Output path for local build',
-    }),
-    wait: Flags.boolean({
+    wait: flags.boolean({
      default: true,
      allowNo: true,
      description: 'Wait for build(s) to complete',
    }),
-    'clear-cache': Flags.boolean({
+    'clear-cache': flags.boolean({
      default: false,
      description: 'Clear cache before the build',
    }),
-    'auto-submit': Flags.boolean({
+    'auto-submit': flags.boolean({
      default: false,
      description:
        'Submit on build complete using the submit profile with the same name as the build profile',
      exclusive: ['auto-submit-with-profile'],
    }),
-    'auto-submit-with-profile': Flags.string({
+    'auto-submit-with-profile': flags.string({
      description: 'Submit on build complete using the submit profile with provided name',
      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);
-
+    const { flags: rawFlags } = this.parse(Build);
    if (rawFlags.json) {
      enableJsonOutput();
    }
-    const flags = this.sanitizeFlags(rawFlags);
+    const flags = await this.sanitizeFlagsAsync(rawFlags);

    const projectDir = await findProjectRootAsync();
-
    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);

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

-  private sanitizeFlags(
-    flags: RawBuildFlags
-  ): Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform } {
+  private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
    const nonInteractive = flags['non-interactive'];
-    if (!flags.local && flags.output) {
-      Errors.error('--output is allowed only for local builds', { exit: 1 });
-    }
    if (!flags.platform && nonInteractive) {
-      Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
+      error('--platform is required when building in non-interactive mode', { exit: 1 });
    }
    if (flags.json && !nonInteractive) {
-      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
+      error('--json is allowed only when building in non-interactive mode', { exit: 1 });
    }

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

    if (flags['skip-credentials-check']) {
      Log.warnDeprecatedFlag(
@@ -154,30 +129,15 @@ export default class Build extends EasCommand {
      );
      Log.newLine();
    }
-    if (flags['skip-project-configuration']) {
-      Log.warnDeprecatedFlag(
-        'skip-project-configuration',
-        'Automatic configuration of native code is no longer optional.'
-      );
-      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,
+      skipProjectConfiguration: flags['skip-project-configuration'],
      profile,
      nonInteractive,
      localBuildOptions: flags['local']
-        ? {
-            enable: true,
-            verbose: true,
-            artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
-          }
+        ? { enable: true, verbose: true }
        : {
            enable: false,
          },
@@ -186,109 +146,70 @@ 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,
    };
  }
 }

-async function handleDeprecatedEasJsonAsync(
+export async function handleDeprecatedEasJsonAsync(
  projectDir: string,
  nonInteractive: boolean
 ): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-  const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
-    [Platform.ANDROID, profileName],
-    [Platform.IOS, profileName],
-  ]);
-
-  const deprecatedProfiles: [Platform, string][] = [];
-
-  for (const [platform, profileName] of platformAndProfileNames) {
-    const buildProfile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      profileName
-    );
-    if (buildProfile.artifactPath) {
-      deprecatedProfiles.push([platform, profileName]);
-    }
-  }
-
-  if (deprecatedProfiles.length === 0) {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+  if (!(await fs.pathExists(easJsonPath))) {
    return;
  }
-
-  const deprecatedProfileNames = uniq(deprecatedProfiles.map(([, profileName]) => profileName));
-  Log.warn(`Some of your build profiles use deprecated field ${chalk.bold('artifactPath')}:`);
-  for (const profileName of deprecatedProfileNames) {
-    Log.warn(`- ${profileName}`);
+  const easJsonReader = new EasJsonReader(projectDir);
+  const rawEasJson = await easJsonReader.readAsync();
+  if (rawEasJson?.cli) {
+    return;
  }
-  Log.newLine();

  if (nonInteractive) {
    Log.warn(
-      `${figures.warning} Action required: rename ${chalk.bold('artifactPath')} to ${chalk.bold(
-        'applicationArchivePath'
-      )} in all of the build profiles listed above.`
+      `${
+        figures.warning
+      } Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
+        'https://expo.fyi/eas-vcs-workflow'
+      )} for more information.`
    );
    Log.warn(
-      `See ${link('https://docs.expo.dev/build-reference/eas-json/')} for more information.`
-    );
-    Log.warn(
-      `This warning will become an error in a future EAS CLI release. This build will continue to use the ${chalk.bold(
-        'artifactPath'
-      )} setting.`
+      'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
    );
+    setVcsClient(new GitClient());
    return;
  }
+  Log.log(
+    `${chalk.bold(
+      'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
+    )} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
+  );
+  Log.log(
+    `If you want to continue using the Git integration, you can opt in with ${chalk.bold(
+      'cli.requireCommit'
+    )} in ${chalk.bold('eas.json')} or with the following prompt.`
+  );
+  Log.newLine();

-  const rename = await selectAsync('Do you want us to handle renaming the field for you?', [
-    { title: 'Yes', value: true },
-    { title: 'No, I will edit eas.json manually (EAS CLI exits)', value: false },
+  const mode = await selectAsync('Select your preferred Git integration', [
+    { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
  ]);

-  if (!rename) {
-    Errors.exit(1);
+  if (mode === 'requireCommit') {
+    setVcsClient(new GitClient());
+    await ensureRepoIsCleanAsync(nonInteractive);
  }

-  await easJsonAccessor.readRawJsonAsync();
-  for (const [platform, profileName] of deprecatedProfiles) {
-    easJsonAccessor.patch(easJsonRawObject => {
-      easJsonRawObject.build[profileName][platform].applicationArchivePath =
-        easJsonRawObject.build[profileName][platform].artifactPath;
-      delete easJsonRawObject.build[profileName][platform].artifactPath;
-      return easJsonRawObject;
+  rawEasJson.cli =
+    mode === 'requireCommit'
+      ? { version: `>= ${easCliVersion}`, requireCommit: true }
+      : { version: `>= ${easCliVersion}` };
+  await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
+  Log.withTick('Updated eas.json');
+  if (mode === 'requireCommit') {
+    await getVcsClient().trackFileAsync(easJsonPath);
+    await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
+      nonInteractive,
    });
  }
-  await easJsonAccessor.writeAsync();
-
-  Log.withTick('Updated eas.json');
 }
@@ -1,4 +1,4 @@
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -25,65 +25,55 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
    post-build - builds the native project and leaves the output directory for inspection`;

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

-  static override flags = {
-    platform: Flags.enum({
+  static flags = {
+    platform: flags.enum({
      char: 'p',
      options: [RequestedPlatform.Android, RequestedPlatform.Ios],
      required: true,
    }),
-    profile: Flags.string({
-      char: 'e',
+    profile: flags.string({
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
-    stage: Flags.enum({
+    stage: flags.enum({
      char: 's',
      description: STAGE_DESCRIPTION,
      options: [InspectStage.ARCHIVE, InspectStage.PRE_BUILD, InspectStage.POST_BUILD],
      required: true,
    }),
-    output: Flags.string({
-      char: 'o',
+    output: flags.string({
      description: 'Output directory.',
      required: true,
      helpValue: 'OUTPUT_DIRECTORY',
    }),
-    force: Flags.boolean({
+    force: flags.boolean({
      description: 'Delete OUTPUT_DIRECTORY if it already exists.',
      default: false,
    }),
-    verbose: Flags.boolean({
-      char: 'v',
+    verbose: flags.boolean({
      default: false,
    }),
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildInspect);
+    const { flags } = this.parse(BuildInspect);
    const outputDirectory = path.resolve(process.cwd(), flags.output);
-    const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
-
-    if (flags.force && process.cwd().startsWith(outputDirectory)) {
-      throw new Error(
-        `This operation is not allowed, it would delete all files in ${outputDirectory} including the current project.`
-      );
-    }
-
    await this.prepareOutputDirAsync(outputDirectory, flags.force);
-
    if (flags.stage === InspectStage.ARCHIVE) {
      const vcs = getVcsClient();
      await vcs.ensureRepoExistsAsync();
-      await vcs.makeShallowCopyAsync(tmpWorkingdir);
-      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
+      await vcs.makeShallowCopyAsync(outputDirectory);
+      Log.withTick(`Project saved to ${outputDirectory}`);
    } else {
      const projectDir = await findProjectRootAsync();
+      const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
      try {
        await runBuildAndSubmitAsync(projectDir, {
+          skipProjectConfiguration: false,
          nonInteractive: false,
          wait: true,
          clearCache: false,
@@ -103,13 +93,24 @@ export default class BuildInspect extends EasCommand {
        if (!flags.verbose) {
          Log.log(chalk.green('Build successful'));
        }
-      } catch {
+      } catch (err) {
        if (!flags.verbose) {
          Log.error('Build failed');
          Log.error(`Re-run this command with ${chalk.bold('--verbose')} flag to see the logs`);
        }
      } finally {
-        await this.copyToOutputDirAsync(path.join(tmpWorkingdir, 'build'), outputDirectory);
+        const spinner = ora().start(`Copying project build directory to ${outputDirectory}`);
+        try {
+          const tmpBuildDirectory = path.join(tmpWorkingdir, 'build');
+          if (await fs.pathExists(tmpBuildDirectory)) {
+            await fs.copy(tmpBuildDirectory, outputDirectory);
+          }
+          await fs.remove(tmpWorkingdir);
+          spinner.succeed(`Project build directory saved to ${outputDirectory}`);
+        } catch (err) {
+          spinner.fail();
+          throw err;
+        }
      }
    }
  }
@@ -124,18 +125,4 @@ export default class BuildInspect extends EasCommand {
    }
    await fs.mkdirp(outputDir);
  }
-
-  private async copyToOutputDirAsync(src: string, dst: string): Promise<void> {
-    const spinner = ora().start(`Copying project directory to ${dst}`);
-    try {
-      if (await fs.pathExists(src)) {
-        await fs.copy(src, dst);
-      }
-      await fs.remove(src);
-      spinner.succeed(`Project directory saved to ${dst}`);
-    } catch (err) {
-      spinner.fail();
-      throw err;
-    }
-  }
 }
@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';

 import { BuildDistributionType, BuildStatus } from '../../build/types';
@@ -13,7 +14,6 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
@@ -22,16 +22,16 @@ import {
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

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

-  static override flags = {
-    platform: Flags.enum({
+  static flags = {
+    platform: flags.enum({
      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
    }),
-    json: Flags.boolean({
+    json: flags.boolean({
      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
    }),
-    status: Flags.enum({
+    status: flags.enum({
      options: [
        BuildStatus.NEW,
        BuildStatus.IN_QUEUE,
@@ -41,26 +41,26 @@ export default class BuildList extends EasCommand {
        BuildStatus.CANCELED,
      ],
    }),
-    distribution: Flags.enum({
+    distribution: flags.enum({
      options: [
        BuildDistributionType.STORE,
        BuildDistributionType.INTERNAL,
        BuildDistributionType.SIMULATOR,
      ],
    }),
-    channel: Flags.string(),
-    appVersion: Flags.string(),
-    appBuildVersion: Flags.string(),
-    sdkVersion: Flags.string(),
-    runtimeVersion: Flags.string(),
-    appIdentifier: Flags.string(),
-    buildProfile: Flags.string(),
-    gitCommitHash: Flags.string(),
-    limit: Flags.integer(),
+    channel: flags.string(),
+    appVersion: flags.string(),
+    appBuildVersion: flags.string(),
+    sdkVersion: flags.string(),
+    runtimeVersion: flags.string(),
+    appIdentifier: flags.string(),
+    buildProfile: flags.string(),
+    gitCommitHash: flags.string(),
+    limit: flags.integer(),
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildList);
+    const { flags } = this.parse(BuildList);
    const {
      json,
      platform: requestedPlatform,
@@ -77,7 +77,7 @@ export default class BuildList extends EasCommand {
    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectName = await getProjectFullNameAsync(exp);

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

 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -6,7 +7,6 @@ import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
@@ -15,12 +15,12 @@ import {
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

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

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

-  static override flags = {
-    json: Flags.boolean({
+  static flags = {
+    json: flags.boolean({
      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
    }),
  };
@@ -29,13 +29,13 @@ export default class BuildView extends EasCommand {
    const {
      args: { BUILD_ID: buildId },
      flags,
-    } = await this.parse(BuildView);
+    } = this.parse(BuildView);
    if (flags.json) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectName = await getProjectFullNameAsync(exp);

@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

@@ -8,17 +9,15 @@ import {
  CreateUpdateChannelOnAppMutation,
  CreateUpdateChannelOnAppMutationVariables,
 } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
+  getBranchByNameAsync,
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { createUpdateBranchOnAppAsync } from '../branch/create';

 export async function createUpdateChannelOnAppAsync({
@@ -60,9 +59,10 @@ export async function createUpdateChannelOnAppAsync({
 }

 export default class ChannelCreate extends EasCommand {
-  static override description = 'create a channel';
+  static hidden = true;
+  static description = 'Create a channel on the current project.';

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

-  static override flags = {
-    json: Flags.boolean({
+  static flags = {
+    json: flags.boolean({
      description:
        'print output as a JSON object with the new channel ID, name and branch mapping.',
      default: false,
@@ -82,13 +82,10 @@ export default class ChannelCreate extends EasCommand {
    let {
      args: { name: channelName },
      flags: { json: jsonFlag },
-    } = await this.parse(ChannelCreate);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(ChannelCreate);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

    if (!channelName) {
@@ -99,22 +96,21 @@ export default class ChannelCreate extends EasCommand {
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a channel name:',
+        message: 'Please name the channel:',
        validate: value => (value ? true : validationMessage),
      }));
    }

    let branchId: string;
    let branchMessage: string;
-    const existingBranch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: channelName,
-    });
-
-    if (existingBranch) {
+    try {
+      const existingBranch = await getBranchByNameAsync({
+        appId: projectId,
+        name: channelName,
+      });
      branchId = existingBranch.id;
      branchMessage = `We found a branch with the same name`;
-    } else {
+    } catch (e) {
      const newBranch = await createUpdateBranchOnAppAsync({
        appId: projectId,
        name: channelName,
@@ -138,29 +134,30 @@ export default class ChannelCreate extends EasCommand {
    }

    if (jsonFlag) {
-      printJsonOnlyOutput(newChannel);
-    } else {
-      Log.addNewLineIfNone();
-      Log.withTick(
-        `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
-      );
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: newChannel.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: branchId },
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('You can now update your app by publishing!'));
+      Log.log(JSON.stringify(newChannel));
+      return;
    }
+
+    Log.addNewLineIfNone();
+    Log.withTick(
+      `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
+    );
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: newChannel.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: branchId },
+      ])
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('You can now update your app by publishing!'));
  }
 }
@@ -1,163 +0,0 @@
-import { Flags } from '@oclif/core';
-import gql from 'graphql-tag';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  DeleteUpdateChannelMutation,
-  DeleteUpdateChannelMutationVariables,
-  DeleteUpdateChannelResult,
-  GetChannelInfoQuery,
-  GetChannelInfoQueryVariables,
-} from '../../graphql/generated';
-import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export default class ChannelDelete extends EasCommand {
-  static override hidden = true;
-  static override description = 'Delete a channel';
-
-  static override args = [
-    {
-      name: 'name',
-      required: false,
-      description: 'Name of the channel to delete',
-    },
-  ];
-  static override flags = {
-    json: Flags.boolean({
-      description: 'print output as a JSON object',
-      default: false,
-    }),
-    'non-interactive': Flags.boolean({
-      default: false,
-      description: 'Run command in non-interactive mode',
-    }),
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { name: nameArg },
-      flags: { json: jsonFlag, 'non-interactive': nonInteractiveFlag },
-    } = await this.parse(ChannelDelete);
-    if (jsonFlag && !nonInteractiveFlag) {
-      throw new Error('--json is allowed only in non-interactive mode');
-    }
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
-
-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
-
-    let name;
-    if (nameArg) {
-      name = nameArg;
-    } else {
-      if (nonInteractiveFlag) {
-        throw new Error('Channel name must be set when running in non-interactive mode');
-      }
-      name = (
-        await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'Provide the name of the channel to delete:',
-          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
-        })
-      ).name;
-    }
-
-    const data = await getChannelInfoAsync({ appId: projectId, name });
-    const channelId = data.app?.byId.updateChannelByName?.id;
-    if (!channelId) {
-      throw new Error(`Could not find channel ${name} on ${fullName}`);
-    }
-
-    if (!nonInteractiveFlag) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `You are about to permanently delete channel: "${name}".\nThis action is irreversible.`
-      );
-      Log.newLine();
-      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
-      if (!confirmed) {
-        Log.error(`Canceled deletion of channel: "${name}".`);
-        process.exit(1);
-      }
-    }
-
-    const deletionResult = await deleteChannelOnAppAsync({
-      channelId,
-    });
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(deletionResult);
-    } else {
-      Log.withTick(`️Deleted channel "${name}".`);
-    }
-  }
-}
-
-async function getChannelInfoAsync({
-  appId,
-  name,
-}: GetChannelInfoQueryVariables): Promise<GetChannelInfoQuery> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetChannelInfoQuery, GetChannelInfoQueryVariables>(
-        gql`
-          query GetChannelInfo($appId: String!, $name: String!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannelByName(name: $name) {
-                  id
-                  name
-                }
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-        },
-        { additionalTypenames: ['UpdateChannel'] }
-      )
-      .toPromise()
-  );
-  return data;
-}
-
-async function deleteChannelOnAppAsync({
-  channelId,
-}: DeleteUpdateChannelMutationVariables): Promise<DeleteUpdateChannelResult> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<DeleteUpdateChannelMutation, DeleteUpdateChannelMutationVariables>(
-        gql`
-          mutation DeleteUpdateChannel($channelId: ID!) {
-            updateChannel {
-              deleteUpdateChannel(channelId: $channelId) {
-                id
-              }
-            }
-          }
-        `,
-        {
-          channelId,
-        }
-      )
-      .toPromise()
-  );
-  return data.updateChannel.deleteUpdateChannel;
-}
@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

@@ -12,12 +13,13 @@ import {
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getBranchByNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function getChannelByNameForAppAsync({
  appId,
@@ -93,9 +95,10 @@ export async function updateChannelBranchMappingAsync({
 }

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

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

-  static override flags = {
-    branch: Flags.string({
+  static flags = {
+    branch: flags.string({
      description: 'Name of the branch to point to',
    }),
-    json: Flags.boolean({
-      description: 'Print output as a JSON object with the channel ID, name and branch mapping',
+    json: flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
      default: false,
    }),
  };

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

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

-    const channelName = args.name ?? (await promptForChannelAsync());
+    if (!channelName) {
+      const validationMessage = 'A channel name is required to edit a specific channel.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name: channelName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the channel to edit:',
+        validate: value => (value ? true : validationMessage),
+      }));
+    }

    const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
    if (existingChannel.updateBranches.length > 1) {
-      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
-    }
-
-    const branchName = flags.branch ?? (await promptForBranchAsync());
-
-    const branch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: branchName,
-    });
-    if (!branch) {
      throw new Error(
-        `Could not find a branch named "${branchName}". Check what branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
+        'There is a rollout in progress. Please manage it with "channel:rollout" instead.'
      );
    }
+
+    if (!branchName) {
+      const validationMessage = 'branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name: branchName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: chalk`What branch should it change to?`,
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
    const channel = await updateChannelBranchMappingAsync({
      channelId: existingChannel.id,
      // todo: move branch mapping logic to utility
@@ -152,38 +169,17 @@ export default class ChannelEdit extends EasCommand {
      }),
    });

-    if (flags.json) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.withTick(
-        chalk`Channel {bold ${channel.name}} is now set to branch {bold ${branch.name}}.\n`
-      );
-      Log.addNewLineIfNone();
-      Log.log(
-        chalk`Users with builds on channel {bold ${channel.name}} will now receive the active update on {bold ${branch.name}}.`
-      );
+    if (jsonFlag) {
+      Log.log(JSON.stringify(channel));
+      return;
    }
+
+    Log.withTick(
+      chalk`Channel {bold ${channel.name}} is now set to branch {bold ${branch.name}}.\n`
+    );
+    Log.addNewLineIfNone();
+    Log.log(
+      chalk`Users with builds on channel {bold ${channel.name}} will now receive the active update on {bold ${branch.name}}.`
+    );
  }
 }
-
-async function promptForChannelAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: 'Provide the name of the channel to edit:',
-    validate: value => (value ? true : 'The channel name may not be empty.'),
-  });
-  return name;
-}
-
-async function promptForBranchAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `To which branch should the channel link?`,
-    validate: value => (value ? true : 'The branch name may not be empty.'),
-  });
-  return name;
-}
@@ -1,4 +1,5 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
@@ -8,10 +9,8 @@ import {
  GetAllChannelsForAppQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { logChannelDetails } from './view';

 const CHANNEL_LIMIT = 10_000;
@@ -67,10 +66,11 @@ async function getAllUpdateChannelForAppAsync({
 }

 export default class ChannelList extends EasCommand {
-  static override description = 'list all channels';
+  static hidden = true;
+  static description = 'List all channels on the current project.';

-  static override flags = {
-    json: Flags.boolean({
+  static flags = {
+    json: flags.boolean({
      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
      default: false,
    }),
@@ -79,13 +79,10 @@ export default class ChannelList extends EasCommand {
  async runAsync(): Promise<void> {
    const {
      flags: { json: jsonFlag },
-    } = await this.parse(ChannelList);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(ChannelList);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

    const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
@@ -97,18 +94,19 @@ export default class ChannelList extends EasCommand {
    }

    if (jsonFlag) {
-      printJsonOnlyOutput(channels);
-    } else {
-      for (const channel of channels) {
-        Log.addNewLineIfNone();
-        Log.log(
-          formatFields([
-            { label: 'Name', value: channel.name },
-            { label: 'ID', value: channel.id },
-          ])
-        );
-        logChannelDetails(channel);
-      }
+      Log.log(JSON.stringify(channels));
+      return;
+    }
+
+    for (const channel of channels) {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      logChannelDetails(channel);
    }
  }
 }
@@ -1,21 +1,19 @@
-import { Flags } from '@oclif/core';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';

 import EasCommand from '../../commandUtils/EasCommand';
 import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
+  getBranchByNameAsync,
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { updateChannelBranchMappingAsync } from './edit';
-import { BranchMapping, getBranchMapping } from './view';
+import { BranchMapping, getBranchMapping, getUpdateChannelByNameForAppAsync } from './view';

 async function promptForRolloutPercentAsync({
  promptMessage,
@@ -40,20 +38,28 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

-function getRolloutInfo(
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>
-): {
+function getRolloutInfo(getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery): {
  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
  currentPercent: number;
 } {
-  const { branchMapping } = getBranchMapping(channel.branchMapping);
+  const { branchMapping } = getBranchMapping(
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
+  );
  const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-  const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+  const newBranch =
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+      branch => branch.id === newBranchId
+    )[0];
+  const oldBranch =
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+      branch => branch.id === oldBranchId
+    )[0];

  if (!newBranch || !oldBranch) {
-    throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
+    throw new Error(
+      `Branch mapping rollout is missing a branch for channel "${getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.name}".`
+    );
  }

  const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
@@ -68,16 +74,16 @@ async function startRolloutAsync({
  projectId,
  fullName,
  currentBranchMapping,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
  channelName?: string;
-  branchName: string;
+  branchName?: string;
  percent?: number;
  jsonFlag: boolean;
  projectId: string;
  fullName: string;
  currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -86,18 +92,19 @@ async function startRolloutAsync({
  };
  logMessage: string;
 }> {
-  const branch = await BranchQuery.getBranchByNameAsync({
-    appId: projectId,
-    name: branchName,
-  });
-  if (!branch) {
-    throw new Error(
-      `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
-        'eas branch:list'
-      )}.`
-    );
+  if (!branchName) {
+    const validationMessage = 'A branch must be specified.';
+    if (jsonFlag) {
+      throw new Error(validationMessage);
+    }
+    ({ name: branchName } = await promptAsync({
+      type: 'text',
+      name: 'name',
+      message: `Select a branch to rollout onto ${channelName}`,
+      validate: value => (value ? true : validationMessage),
+    }));
  }
-
+  const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
  const oldBranchId = currentBranchMapping.data[0].branchId;
  if (branch.id === oldBranchId) {
    throw new Error(
@@ -130,11 +137,14 @@ async function startRolloutAsync({
    ],
  };
  const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
    branchMapping: JSON.stringify(newBranchMapping),
  });

-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+  const oldBranch =
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+      branch => branch.id === oldBranchId
+    )[0];
  if (!oldBranch) {
    throw new Error(
      `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
@@ -157,13 +167,13 @@ async function editRolloutAsync({
  percent,
  jsonFlag,
  currentBranchMapping,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
  channelName?: string;
  percent?: number;
  jsonFlag: boolean;
  currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -172,7 +182,9 @@ async function editRolloutAsync({
  };
  logMessage: string;
 }> {
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );

  if (percent == null) {
    if (jsonFlag) {
@@ -192,7 +204,7 @@ async function editRolloutAsync({
  newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;

  const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
    branchMapping: JSON.stringify(newBranchMapping),
  });

@@ -212,13 +224,13 @@ async function endRolloutAsync({
  branchName,
  jsonFlag,
  projectId,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
  channelName?: string;
  branchName?: string;
  jsonFlag: boolean;
  projectId: string;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -228,22 +240,13 @@ async function endRolloutAsync({
  logMessage: string;
 }> {
  // end rollout
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );

  let endOnNewBranch;
  if (branchName) {
-    const branch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: branchName,
-    });
-    if (!branch) {
-      throw new Error(
-        `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
-      );
-    }
-
+    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
    switch (branch.id) {
      case newBranch.id:
        endOnNewBranch = true;
@@ -291,7 +294,7 @@ async function endRolloutAsync({
  };

  const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
    branchMapping: JSON.stringify(newBranchMapping),
  });
  const logMessage = `️Rollout on channel ${chalk.bold(
@@ -304,10 +307,10 @@ async function endRolloutAsync({
 }

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

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

-  static override flags = {
-    branch: Flags.string({
+  static flags = {
+    branch: flags.string({
      description: 'branch to rollout',
      required: false,
    }),
-    percent: Flags.integer({
+    percent: flags.integer({
      description: 'percent of traffic to redirect to the new branch',
      required: false,
    }),
-    end: Flags.boolean({
+    end: flags.boolean({
      description: 'end the rollout',
      default: false,
    }),
-    json: Flags.boolean({
+    json: flags.boolean({
      description: 'print output as a JSON object with the new channel ID, name and branch mapping',
      default: false,
    }),
@@ -337,31 +340,23 @@ export default class ChannelRollout extends EasCommand {
  async runAsync(): Promise<void> {
    const {
      args: { channel: channelName },
-      flags: { json: jsonFlag, end: endFlag, branch: branchName, percent },
-    } = await this.parse(ChannelRollout);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+      flags: { json: jsonFlag, end: endFlag },
+    } = this.parse(ChannelRollout);
+    const {
+      flags: { branch: branchName, percent },
+    } = this.parse(ChannelRollout);

    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);

-    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
+    const getUpdateChannelByNameForAppResult = await getUpdateChannelByNameForAppAsync({
      appId: projectId,
      channelName: channelName!,
    });
-    if (!channel) {
-      throw new Error(
-        `Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk.bold(
-          'eas channel:list'
-        )}.`
-      );
-    }
-
    const { branchMapping: currentBranchMapping, isRollout } = getBranchMapping(
-      channel.branchMapping
+      getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
    );

    if (currentBranchMapping.data.length === 0) {
@@ -395,13 +390,13 @@ export default class ChannelRollout extends EasCommand {
    if (!isRollout) {
      rolloutMutationResult = await startRolloutAsync({
        channelName,
-        branchName: branchName ?? (await promptForBranchNameAsync(channelName)),
+        branchName,
        percent,
        jsonFlag,
        projectId,
        fullName,
        currentBranchMapping,
-        channel,
+        getUpdateChannelByNameForAppResult,
      });
    } else if (endFlag) {
      rolloutMutationResult = await endRolloutAsync({
@@ -409,7 +404,7 @@ export default class ChannelRollout extends EasCommand {
        branchName,
        jsonFlag,
        projectId,
-        channel,
+        getUpdateChannelByNameForAppResult,
      });
    } else {
      rolloutMutationResult = await editRolloutAsync({
@@ -417,7 +412,7 @@ export default class ChannelRollout extends EasCommand {
        percent,
        jsonFlag,
        currentBranchMapping,
-        channel,
+        getUpdateChannelByNameForAppResult,
      });
    }
    if (!rolloutMutationResult) {
@@ -425,19 +420,9 @@ export default class ChannelRollout extends EasCommand {
    }
    const { newChannelInfo, logMessage } = rolloutMutationResult;
    if (jsonFlag) {
-      printJsonOnlyOutput(newChannelInfo);
-    } else {
-      Log.withTick(logMessage);
+      Log.log(JSON.stringify(newChannelInfo));
+      return;
    }
+    Log.withTick(logMessage);
  }
 }
-
-async function promptForBranchNameAsync(channelName: string): Promise<string> {
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `Select a branch to rollout onto ${channelName}`,
-    validate: value => (value ? true : 'A branch must be specified.'),
-  });
-  return name;
-}
Author	SHA1	Message	Date
Wojciech Kozyra	f71dfa5553	update oclif forks	2021-12-16 12:57:57 +01:00
Wojciech Kozyra	fc71d66193	update all oclif packages	2021-12-15 14:50:28 +01:00
Wojciech Kozyra	e2c24e88cc	use fork	2021-12-15 14:29:44 +01:00
Wojciech Kozyra	31bde5b9eb	update CHANGELOG.md	2021-12-15 13:04:17 +00:00
Wojciech Kozyra	3ed9cbeccc	[eas-cli] add support for autocompletion	2021-12-15 13:58:34 +01:00