v0.40.0

[eas-cli] change eas update:publish to eas update (#830 )
* [eas-cli] change eas update:publish to eas update * update CHANGELOG.md * grammar
2026-11-15 03:38:08 -10:00 · 2021-12-08 15:43:11 -05:00 · 2021-12-08 15:15:25 -05:00 · 2021-12-08 11:15:04 -08:00 · 2021-12-08 10:15:46 -08:00 · 2021-12-08 11:13:26 -05:00
113 changed files with 2533 additions and 1755 deletions
@@ -11,7 +11,6 @@ module.exports = {
        ignoreDeclarationSort: true,
      },
    ],
-    'flowtype/no-types-missing-file-annotation': 'off',
    curly: 'warn',
    'import/no-cycle': 'error',
    'import/no-extraneous-dependencies': [
@@ -21,6 +21,13 @@ 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: textarea
+    validations:
+      required: true
+    attributes:
+      label: Managed or bare?
+      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
@@ -10,7 +10,7 @@ jobs:
    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - name: Checkout Pull Request
@@ -25,7 +25,7 @@ jobs:
    needs: release
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
@@ -58,7 +58,7 @@ jobs:
    needs: release
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
@@ -81,7 +81,7 @@ jobs:
    needs: release
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
@@ -119,7 +119,7 @@ jobs:
    needs: [build-linux, build-mac, build-windows]
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          registry-url: 'https://registry.npmjs.org/'
          scope: 'expo'
@@ -138,7 +138,7 @@ jobs:
    needs: publish-to-npm
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - name: Install dependencies
@@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
        with:
          node-version: '16'
      - uses: preactjs/compressed-size-action@v2
@@ -18,7 +18,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
        with:
          node-version: ${{ matrix.node }}
      - run: yarn install --frozen-lockfile --check-files
@@ -1,14 +1,18 @@
+# Build directories
+packages/*/build
+packages/eas-cli/dist
+
+# Code editors
+.idea
+.history
+
+# macOS
+.DS_Store
+
+# Node
+node_modules
 *-debug.log
 *-error.log

-**/build/**
-!packages/eas-cli/src/commands/build/**
-!packages/eas-cli/src/build/**
-
-dist
-/package-lock.json
-tmp
-node_modules
+# Tests
 coverage
-.history
-.DS_Store
@@ -2,7 +2,7 @@
  "printWidth": 100,
  "tabWidth": 2,
  "singleQuote": true,
-  "jsxBracketSameLine": true,
+  "bracketSameLine": true,
  "trailingComma": "es5",
  "arrowParens": "avoid"
 }
@@ -6,11 +6,112 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

+- [eas-cli] change eas update:publish to eas update. ([#830](https://github.com/expo/eas-cli/pull/830) by [@jkhales](https://github.com/jkhales))
+
+### 🎉 New features
+
+### 🐛 Bug fixes
+
+- Pass build profile environment to credentials command. ([#828](https://github.com/expo/eas-cli/pull/828) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+## [0.39.0](https://github.com/expo/eas-cli/releases/tag/v0.39.0) - 2021-12-06
+
+### 🎉 New features
+
+- Set runtime version in `eas update:configure`. ([#811](https://github.com/expo/eas-cli/pull/811) by [@jkhales](https://github.com/jkhales))
+- Print project workflow in `eas diagnostics`. ([#822](https://github.com/expo/eas-cli/pull/822) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Improve error message for missing ascAppId. ([#813](https://github.com/expo/eas-cli/pull/813) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `react-native` version to metadata. ([#823](https://github.com/expo/eas-cli/pull/823) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.38.3](https://github.com/expo/eas-cli/releases/tag/v0.38.3) - 2021-11-29
+
+### 🐛 Bug fixes
+
+- Print warning about outdated version to stderr. ([#805](https://github.com/expo/eas-cli/pull/805) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix Apple sign in capabilities. ([#806](https://github.com/expo/eas-cli/pull/806) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.2](https://github.com/expo/eas-cli/releases/tag/v0.38.2) - 2021-11-26
+
+### 🎉 New features
+
+- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
+- Add command: `eas update:configure`. ([#800](https://github.com/expo/eas-cli/pull/800) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
+- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
+
+### 🐛 Bug fixes
+
+- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
+
+## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
+
+### 🎉 New features
+
+- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
+- Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Compute runtime version policies. ([#783](https://github.com/expo/eas-cli/pull/783), [#785](https://github.com/expo/eas-cli/pull/785) by [@jkhales](https://github.com/jkhales))
+- Fix local builds with npm < 7. ([#787](https://github.com/expo/eas-cli/pull/787) by [@dsokal](https://github.com/dsokal))
+- Override `applicationId`/`bundleIdentifier` when auto-submitting after build. ([#780](https://github.com/expo/eas-cli/pull/780) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Upgrade `typescript` to 4.5.2. Upgrade oclif dependencies. ([#781](https://github.com/expo/eas-cli/pull/781) by [@dsokal](https://github.com/dsokal))
+- Make missing `git` command error message more descriptive. ([#784](https://github.com/expo/eas-cli/pull/784) by [@dsokal](https://github.com/dsokal))
+
+## [0.37.0](https://github.com/expo/eas-cli/releases/tag/v0.37.0) - 2021-11-18
+
+### 🛠 Breaking changes
+
+- Require explicitly defined applicationId/bundleIdentifier for EAS Submit in case of bare projects consisting of multiple product flavors on Android or multiple schemes/targets on iOS. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- Auto create channel on publish. ([#766](https://github.com/expo/eas-cli/pull/766) by [@jkhales](https://github.com/jkhales))
+- Interactively configure Git `user.name` and `user.email`. ([#772](https://github.com/expo/eas-cli/pull/772) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Validate release channel in eas.json. ([#764](https://github.com/expo/eas-cli/pull/764) by [@dsokal](https://github.com/dsokal))
+- Make the missing profile error message more descriptive. ([#761](https://github.com/expo/eas-cli/pull/761) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Better error message when missing eas.json. ([#770](https://github.com/expo/eas-cli/pull/770) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.36.1](https://github.com/expo/eas-cli/releases/tag/v0.36.1) - 2021-11-15
+
+### 🐛 Bug fixes
+
+- Fix `dateformat` import issue when building with `--local` flag. ([a520d](https://github.com/expo/eas-cli/commit/a520d1750736d61d6489da6487879f35ed3deb23) by [@dsokal](https://github.com/dsokal))
+
+## [0.36.0](https://github.com/expo/eas-cli/releases/tag/v0.36.0) - 2021-11-15
+
+### 🛠 Breaking changes
+
 - Do not require manual `eas-cli-local-build-plugin` installation. An existing global installation (either with `yarn global add` or `npm install -g`) will not be used anymore. ([#753](https://github.com/expo/eas-cli/pull/753) by [@dsokal](https://github.com/dsokal))

 ### 🎉 New features

 - Use Keystore Service when `keytool` is not installed. ([#754](https://github.com/expo/eas-cli/pull/754) by [@dsokal](https://github.com/dsokal))
+- Add applicationId/bundleIdentifier fields to the submit profile. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))

 ### 🐛 Bug fixes

@@ -41,7 +142,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🧹 Chores

 - Clean up credentials prompt method. ([#728](https://github.com/expo/eas-cli/pull/728) by [@quinlanj](https://github.com/quinlanj))
- Bump @expo/apple-utils to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
+- Bump `@expo/apple-utils` to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
 - Grammar: replace setup with set up. ([#735](https://github.com/expo/eas-cli/pull/735) by [@quinlanj](https://github.com/quinlanj))
 - Improve VCS workflow migration experience. ([#732](https://github.com/expo/eas-cli/pull/732) by [@wkozyra95](https://github.com/wkozyra95))

@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.36.0"
+  "version": "0.40.0"
 }
@@ -1,6 +1,8 @@
 {
  "private": true,
-  "workspaces": ["packages/*"],
+  "workspaces": [
+    "packages/*"
+  ],
  "scripts": {
    "build": "lerna run build",
    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
@@ -8,7 +10,7 @@
    "start": "lerna run watch --parallel",
    "watch": "yarn start",
    "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint . --ext .ts --ext .js",
+    "lint": "eslint .",
    "release": "./scripts/bin/run update-local-plugin && lerna version",
    "test": "jest",
    "clean": "lerna run clean && rm -rf node_modules coverage"
@@ -24,9 +26,9 @@
    "jest": "27.1.0",
    "jest-watch-typeahead": "0.6.4",
    "lerna": "4.0.0",
-    "prettier": "2.3.2",
+    "prettier": "2.4.1",
    "ts-jest": "27.0.5",
-    "typescript": "4.4.2"
+    "typescript": "4.5.2"
  },
  "volta": {
    "node": "16.10.0",
@@ -7,9 +7,9 @@ EAS command line tool
 [![Downloads/week](https://img.shields.io/npm/dw/eas-cli.svg)](https://npmjs.org/package/eas-cli)
 [![License](https://img.shields.io/npm/l/eas-cli.svg)](https://github.com/expo/eas-cli/blob/main/package.json)

-* [Installation](#installation)
-* [Usage](#usage)
-* [Commands](#commands)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Commands](#commands)

 # Installation

@@ -73,7 +73,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

@@ -87,7 +87,7 @@ ALIASES
  $ eas logout
 ```

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

 ## `eas account:view`

@@ -101,7 +101,7 @@ ALIASES
  $ eas whoami
 ```

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

 ## `eas analytics [STATUS]`

@@ -112,11 +112,11 @@ USAGE
  $ eas analytics [STATUS]
 ```

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

 ## `eas build`

-start a build
+Start a build

 ```
 USAGE
@@ -146,7 +146,7 @@ OPTIONS
  --[no-]wait                              Wait for build(s) to complete
 ```

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

 ## `eas build:cancel [BUILD_ID]`

@@ -157,7 +157,7 @@ USAGE
  $ eas build:cancel [BUILD_ID]
 ```

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

 ## `eas build:configure`

@@ -171,7 +171,7 @@ OPTIONS
  -p, --platform=(android|ios|all)  Platform to configure
 ```

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

 ## `eas build:list`

@@ -204,7 +204,7 @@ OPTIONS
  --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```

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

 ## `eas build:view [BUILD_ID]`

@@ -218,7 +218,7 @@ OPTIONS
  --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```

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

 ## `eas config`

@@ -233,7 +233,7 @@ OPTIONS
  --profile=profile
 ```

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

 ## `eas credentials`

@@ -244,7 +244,7 @@ USAGE
  $ eas credentials
 ```

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

 ## `eas device:create`

@@ -255,7 +255,7 @@ USAGE
  $ eas device:create
 ```

-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.36.0/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:list`

@@ -269,7 +269,7 @@ OPTIONS
  --apple-team-id=apple-team-id
 ```

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

 ## `eas device:view [UDID]`

@@ -280,7 +280,7 @@ USAGE
  $ eas device:view [UDID]
 ```

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

 ## `eas diagnostics`

@@ -291,7 +291,7 @@ USAGE
  $ eas diagnostics
 ```

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

 ## `eas help [COMMAND]`

@@ -308,7 +308,7 @@ OPTIONS
  --all  see all commands in CLI
 ```

-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.3/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.5/src/commands/help.ts)_

 ## `eas project:info`

@@ -319,7 +319,7 @@ USAGE
  $ eas project:info
 ```

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

 ## `eas project:init`

@@ -333,7 +333,7 @@ ALIASES
  $ eas init
 ```

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

 ## `eas secret:create`

@@ -350,7 +350,7 @@ OPTIONS
  --value=value              Value of the secret
 ```

-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.36.0/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -367,7 +367,7 @@ DESCRIPTION
  Unsure where to find the secret's ID? Run eas secret:list
 ```

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

 ## `eas secret:list`

@@ -378,11 +378,11 @@ USAGE
  $ eas secret:list
 ```

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

 ## `eas submit`

-submit build archive to app store
+Submit build archive to App Store Connect

 ```
 USAGE
@@ -405,13 +405,14 @@ OPTIONS
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
-  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
+  See how to configure submits with eas.json: 
+  https://docs.expo.dev/submit/eas-json/

 ALIASES
  $ eas build:submit
 ```

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

 ## `eas webhook:create`

@@ -422,15 +423,15 @@ USAGE
  $ eas webhook:create

 OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook

-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
+  --secret=secret         Secret used to create a hash signature of the request payload, provided in the
+                          'Expo-Signature' header.

-  --url=url        Webhook URL
+  --url=url               Webhook URL
 ```

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

 ## `eas webhook:delete [ID]`

@@ -444,7 +445,7 @@ ARGUMENTS
  ID  ID of the webhook to delete
 ```

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

 ## `eas webhook:list`

@@ -455,10 +456,10 @@ USAGE
  $ eas webhook:list

 OPTIONS
-  --event=(BUILD)  Event type that triggers the webhook
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
 ```

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

 ## `eas webhook:update`

@@ -469,16 +470,16 @@ USAGE
  $ eas webhook:update

 OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
-  --id=id          (required) Webhook ID
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
+  --id=id                 (required) Webhook ID

-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
+  --secret=secret         Secret used to create a hash signature of the request payload, provided in the
+                          'Expo-Signature' header.

-  --url=url        Webhook URL
+  --url=url               Webhook URL
 ```

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

 ## `eas webhook:view ID`

@@ -492,5 +493,5 @@ ARGUMENTS
  ID  ID of the webhook to view
 ```

-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.36.0/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/view.ts)_
 <!-- commandsstop -->
@@ -10674,6 +10674,12 @@
            "description": "",
            "isDeprecated": false,
            "deprecationReason": null
+          },
+          {
+            "name": "SUBMIT",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
          }
        ],
        "possibleTypes": null
@@ -1,7 +1,7 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "0.36.0",
+  "version": "0.40.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
@@ -9,24 +9,23 @@
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
    "@expo/apple-utils": "0.0.0-alpha.26",
-    "@expo/config": "6.0.3",
-    "@expo/config-plugins": "4.0.3",
-    "@expo/eas-build-job": "0.2.57",
-    "@expo/eas-json": "^0.36.0",
-    "@expo/json-file": "8.2.33",
-    "@expo/pkcs12": "0.0.4",
-    "@expo/plist": "0.0.14",
-    "@expo/plugin-warn-if-update-available": "1.7.0",
-    "@expo/prebuild-config": "3.0.3",
+    "@expo/config": "6.0.11",
+    "@expo/config-plugins": "4.0.11",
+    "@expo/eas-build-job": "0.2.61",
+    "@expo/eas-json": "^0.40.0",
+    "@expo/json-file": "8.2.34",
+    "@expo/pkcs12": "0.0.6",
+    "@expo/plist": "0.0.16",
+    "@expo/plugin-warn-if-update-available": "1.7.1",
+    "@expo/prebuild-config": "3.0.11",
    "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.1.0",
-    "@expo/sdk-runtime-versions": "1.0.0",
+    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.5.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/command": "1.8.0",
-    "@oclif/config": "1.17.0",
+    "@oclif/command": "1.8.3",
+    "@oclif/config": "1.17.1",
    "@oclif/errors": "1.3.5",
-    "@oclif/plugin-help": "3.2.3",
+    "@oclif/plugin-help": "3.2.5",
    "@urql/core": "2.3.1",
    "@urql/exchange-retry": "0.3.0",
    "chalk": "4.1.2",
@@ -96,7 +95,8 @@
    "mockdate": "^3.0.2",
    "nock": "^13.0.5",
    "tempy": "0.7.0",
-    "ts-deepmerge": "1.0.8"
+    "ts-deepmerge": "1.0.8",
+    "typescript": "4.5.2"
  },
  "engines": {
    "node": ">=12.0.0"
@@ -11,7 +11,7 @@ import {
  ensureApplicationIdIsDefinedForManagedProjectAsync,
  getApplicationIdAsync,
 } from '../../project/android/applicationId';
-import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import {
@@ -20,7 +20,7 @@ import {
  JobData,
  prepareBuildRequestForPlatformAsync,
 } from '../build';
-import { BuildContext } from '../context';
+import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
@@ -28,9 +28,9 @@ import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';

-export async function prepareAndroidBuildAsync(
-  ctx: BuildContext<Platform.ANDROID>
-): Promise<BuildRequestSender> {
+export async function createAndroidContextAsync(
+  ctx: CommonContext<Platform.ANDROID>
+): Promise<AndroidBuildContext> {
  const { buildProfile } = ctx;

  if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
@@ -58,21 +58,26 @@ This means that it will most likely produce an AAB and you will not be able to i
    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
  }

+  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
+
+  return { applicationId, gradleContext };
+}
+
+export async function prepareAndroidBuildAsync(
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
  return await prepareBuildRequestForPlatformAsync({
    ctx,
    ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
-      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
+      return await ensureAndroidCredentialsAsync(ctx);
    },
    ensureProjectConfiguredAsync: async () => {
      await validateAndSyncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile,
+        buildProfile: ctx.buildProfile,
      });
    },
-    getMetadataContext: () => ({
-      gradleContext,
-    }),
    prepareJobAsync: async (
      ctx: BuildContext<Platform.ANDROID>,
      jobData: JobData<AndroidCredentials>
@@ -100,8 +105,7 @@ function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean
 }

 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>,
-  gradleContext?: GradleBuildContext
+  ctx: BuildContext<Platform.ANDROID>
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
  if (!shouldProvideCredentials(ctx)) {
    return;
@@ -109,7 +113,7 @@ async function ensureAndroidCredentialsAsync(
  const androidApplicationIdentifier = await getApplicationIdAsync(
    ctx.projectDir,
    ctx.exp,
-    gradleContext
+    ctx.android.gradleContext
  );
  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
    app: {
@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
+import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';

 import Log from '../../log';
 import {
@@ -41,7 +41,7 @@ export async function validateAndSyncProjectConfigurationAsync({
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  buildProfile: AndroidBuildProfile;
+  buildProfile: BuildProfile<Platform.ANDROID>;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
  const { autoIncrement } = buildProfile;
@@ -1,5 +1,5 @@
 import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
-import { AndroidBuildProfile } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';

@@ -25,7 +25,7 @@ export async function prepareJobAsync(
  jobData: JobData
 ): Promise<Job> {
  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
-  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
+  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
  const { credentials } = jobData;
@@ -18,7 +18,7 @@ import { sleepAsync } from '../utils/promise';
 import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { MetadataContext, collectMetadataAsync } from './metadata';
+import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';

@@ -39,7 +39,6 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
    ctx: BuildContext<TPlatform>
  ): Promise<CredentialsResult<Credentials> | undefined>;
  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  getMetadataContext: () => MetadataContext<TPlatform>;
  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
@@ -88,8 +87,7 @@ export async function prepareBuildRequestForPlatformAsync<
        bucketKey: await uploadProjectAsync(ctx),
      } as const);

-  const metadataContext = builder.getMetadataContext();
-  const metadata = await collectMetadataAsync(ctx, metadataContext);
+  const metadata = await collectMetadataAsync(ctx);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
    credentials: credentialsResult?.credentials,
@@ -58,7 +58,6 @@ export async function configureAsync(options: {
  platform: RequestedPlatform;
  projectDir: string;
 }): Promise<void> {
-  await getVcsClient().ensureRepoExistsAsync();
  await maybeBailOnRepoStatusAsync();

  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
@@ -144,7 +143,7 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v

  if (await fs.pathExists(easJsonPath)) {
    const reader = new EasJsonReader(ctx.projectDir);
-    await reader.readAndValidateAsync();
+    await reader.readAsync();

    Log.withTick('Validated eas.json');
    return;
@@ -1,20 +1,15 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
-import JsonFile from '@expo/json-file';
-import resolveFrom from 'resolve-from';
-import { v4 as uuidv4 } from 'uuid';
+import { BuildProfile } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

 import { TrackingContext } from '../analytics/common';
-import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
 import { RequestedPlatform } from '../platform';
-import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { ensureLoggedInAsync } from '../user/actions';

 export interface ConfigureContext {
  user: Actor;
@@ -27,6 +22,21 @@ export interface ConfigureContext {
  hasIosNativeProject: boolean;
 }

+export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
+
+export interface AndroidBuildContext {
+  applicationId: string;
+  gradleContext?: GradleBuildContext;
+}
+
+export interface IosBuildContext {
+  bundleIdentifier: string;
+  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
+  applicationTarget: Target;
+  targets: Target[];
+  xcodeBuildContext: XcodeBuildContext;
+}
+
 export interface BuildContext<T extends Platform> {
  accountName: string;
  buildProfile: BuildProfile<T>;
@@ -44,112 +54,6 @@ export interface BuildContext<T extends Platform> {
  trackingCtx: TrackingContext;
  user: Actor;
  workflow: Workflow;
-}
-
-export async function createBuildContextAsync<T extends Platform>({
-  buildProfileName,
-  buildProfile,
-  clearCache = false,
-  local,
-  nonInteractive = false,
-  platform,
-  projectDir,
-  skipProjectConfiguration = false,
-}: {
-  buildProfileName: string;
-  buildProfile: BuildProfile<T>;
-  clearCache: boolean;
-  local: boolean;
-  nonInteractive: boolean;
-  platform: T;
-  projectDir: string;
-  skipProjectConfiguration: boolean;
-}): Promise<BuildContext<T>> {
-  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
-
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
-  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
-
-  const credentialsCtx = new CredentialsContext({
-    exp,
-    nonInteractive,
-    projectDir,
-    user,
-  });
-
-  const devClientProperties = getDevClientEventProperties({
-    platform,
-    projectDir,
-    buildProfile,
-  });
-  const trackingCtx = {
-    tracking_id: uuidv4(),
-    platform,
-    ...(accountId && { account_id: accountId }),
-    account_name: accountName,
-    project_id: projectId,
-    project_type: workflow,
-    ...devClientProperties,
-  };
-  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
-
-  return {
-    accountName,
-    buildProfile,
-    buildProfileName,
-    clearCache,
-    credentialsCtx,
-    exp,
-    local,
-    nonInteractive,
-    platform,
-    projectDir,
-    projectId,
-    projectName,
-    skipProjectConfiguration,
-    trackingCtx,
-    user,
-    workflow,
-  };
-}
-
-function getDevClientEventProperties({
-  platform,
-  projectDir,
-  buildProfile,
-}: {
-  platform: Platform;
-  projectDir: string;
-  buildProfile: AndroidBuildProfile | IosBuildProfile;
-}): Partial<TrackingContext> {
-  let includesDevClient;
-  const version = tryGetDevClientVersion(projectDir);
-  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
-  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
-  } else if (buildProfile.developmentClient) {
-    includesDevClient = true;
-  } else {
-    includesDevClient = false;
-  }
-
-  if (version) {
-    return { dev_client: includesDevClient, dev_client_version: version };
-  } else {
-    return { dev_client: includesDevClient };
-  }
-}
-
-function tryGetDevClientVersion(projectDir: string): string | null {
-  try {
-    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
-    return pkg.version?.toString() ?? null;
-  } catch {
-    return null;
-  }
+  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
+  ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }
@@ -0,0 +1,138 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+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 { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { findAccountByName } from '../user/Account';
+import { ensureLoggedInAsync } from '../user/actions';
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
+  platform,
+  projectDir,
+  skipProjectConfiguration = false,
+}: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
+  platform: T;
+  projectDir: string;
+  skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
+  const user = await ensureLoggedInAsync();
+  const accountName = getProjectAccountName(exp, user);
+  const projectName = exp.slug;
+  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const accountId = findAccountByName(user.accounts, accountName)?.id;
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+    env: buildProfile.env,
+  });
+
+  const devClientProperties = getDevClientEventProperties({
+    platform,
+    projectDir,
+    buildProfile,
+  });
+  const trackingCtx = {
+    tracking_id: uuidv4(),
+    platform,
+    ...(accountId && { account_id: accountId }),
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
+  };
+  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
+
+  const commonContext: CommonContext<T> = {
+    accountName,
+    buildProfile,
+    buildProfileName,
+    clearCache,
+    credentialsCtx,
+    exp,
+    local,
+    nonInteractive,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    skipProjectConfiguration,
+    trackingCtx,
+    user,
+    workflow,
+  };
+  if (platform === Platform.ANDROID) {
+    const common = commonContext as CommonContext<Platform.ANDROID>;
+    return {
+      ...common,
+      android: await createAndroidContextAsync(common),
+    } as BuildContext<T>;
+  } else {
+    const common = commonContext as CommonContext<Platform.IOS>;
+    return {
+      ...common,
+      ios: await createIosContextAsync(common),
+    } as BuildContext<T>;
+  }
+}
+
+function getDevClientEventProperties({
+  platform,
+  projectDir,
+  buildProfile,
+}: {
+  platform: Platform;
+  projectDir: string;
+  buildProfile: BuildProfile;
+}): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(projectDir);
+  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
+  } else {
+    includesDevClient = false;
+  }
+
+  if (version) {
+    return { dev_client: includesDevClient, dev_client_version: version };
+  } else {
+    return { dev_client: includesDevClient };
+  }
+}
+
+function tryGetDevClientVersion(projectDir: string): string | null {
+  try {
+    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
+    return pkg.version?.toString() ?? null;
+  } catch {
+    return null;
+  }
+}
@@ -4,9 +4,9 @@ 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';
-import { readPlistAsync, writePlistAsync } from './plist';

 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
  ensureValidVersions(exp);
@@ -59,7 +59,7 @@ async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {

 async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  return (await readPlistAsync(expoPlistPath)) as IOSConfig.ExpoPlist;
+  return ((await readPlistAsync(expoPlistPath)) ?? {}) as IOSConfig.ExpoPlist;
 }

 async function writeExpoPlistAsync(
@@ -4,7 +4,7 @@ import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';

-import { readPlistAsync } from '../plist';
+import { readPlistAsync } from '../../../utils/plist';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -8,24 +8,17 @@ import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../pro
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext } from '../context';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { IosMetadataContext } from '../metadata';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';

-interface BuildConfiguration {
-  targetName?: string;
-  buildConfiguration?: string;
-  buildSettings: XCBuildConfiguration['buildSettings'];
-}
-
-export async function prepareIosBuildAsync(
-  ctx: BuildContext<Platform.IOS>
-): Promise<BuildRequestSender> {
+export async function createIosContextAsync(
+  ctx: CommonContext<Platform.IOS>
+): Promise<IosBuildContext> {
  const { buildProfile } = ctx;

  if (ctx.workflow === Workflow.MANAGED) {
@@ -50,29 +43,42 @@ export async function prepareIosBuildAsync(
    },
    xcodeBuildContext
  );
-  const buildConfiguration = resolveBuildConfiguration(ctx, targets);
+  const applicationTarget = findApplicationTarget(targets);
+  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);

+  return {
+    bundleIdentifier: applicationTarget.bundleIdentifier,
+    applicationTarget,
+    applicationTargetBuildSettings,
+    targets,
+    xcodeBuildContext,
+  };
+}
+
+export async function prepareIosBuildAsync(
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
  return await prepareBuildRequestForPlatformAsync({
    ctx,
    ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
-      return ensureIosCredentialsAsync(ctx, targets);
+      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
    },
    ensureProjectConfiguredAsync: async () => {
      await validateAndSyncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile,
-        buildSettings: buildConfiguration.buildSettings,
+        buildProfile: ctx.buildProfile,
+        buildSettings: ctx.ios.applicationTargetBuildSettings,
      });
    },
-    getMetadataContext: (): IosMetadataContext => {
-      return buildConfiguration;
-    },
    prepareJobAsync: async (
      ctx: BuildContext<Platform.IOS>,
      jobData: JobData<IosCredentials>
    ): Promise<Job> => {
-      return await prepareJobAsync(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
+      return await prepareJobAsync(ctx, {
+        ...jobData,
+        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
+      });
    },
    sendBuildRequestAsync: async (
      appId: string,
@@ -90,23 +96,17 @@ export async function prepareIosBuildAsync(
  });
 }

-function resolveBuildConfiguration(
-  ctx: BuildContext<Platform.IOS>,
-  targets: Target[]
-): BuildConfiguration {
+function resolveBuildSettings(
+  ctx: CommonContext<Platform.IOS>,
+  applicationTarget: Target
+): XCBuildConfiguration['buildSettings'] {
  if (ctx.workflow === Workflow.MANAGED) {
-    return { buildSettings: {} };
+    return {};
  }
-  const applicationTarget = findApplicationTarget(targets);
  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
    targetName: applicationTarget.targetName,
    buildConfiguration: applicationTarget.buildConfiguration,
  });
-  const buildSettings = xcBuildConfiguration?.buildSettings ?? {};
-  return {
-    buildSettings,
-    targetName: applicationTarget.targetName,
-    buildConfiguration: applicationTarget.buildConfiguration,
-  };
+  return xcBuildConfiguration?.buildSettings ?? {};
 }
@@ -1,6 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
+import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';

 import Log from '../../log';
@@ -36,7 +36,7 @@ export async function validateAndSyncProjectConfigurationAsync({
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  buildProfile: IosBuildProfile;
+  buildProfile: BuildProfile<Platform.IOS>;
  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
@@ -8,9 +8,9 @@ import type { XCBuildConfiguration } from 'xcode';
 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync } from '../utils/version';
-import { readPlistAsync, writePlistAsync } from './plist';

 export enum BumpStrategy {
  APP_VERSION,
@@ -128,7 +128,11 @@ export async function maybeResolveVersionsAsync(
      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
    };
-  } catch {
+  } catch (err: any) {
+    Log.warn('Failed to read app versions.');
+    Log.debug(err);
+    Log.warn(err.message);
+    Log.warn('Proceeding anyway...');
    return {};
  }
 }
@@ -174,7 +178,7 @@ async function readInfoPlistAsync(
  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<IOSConfig.InfoPlist> {
  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }

 async function writeInfoPlistAsync({
@@ -197,7 +201,12 @@ function ensureStaticConfigExists(projectDir: string): void {
  }
 }

-export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
+export function evaluateTemplateString(
+  s: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
+  const vars = { ...buildSettings };
  return s.replace(/\$\((\w+)\)/g, (match, key) => {
    if (vars.hasOwnProperty(key)) {
      const value = String(vars[key]);
@@ -1,17 +1,18 @@
 import { Job } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
+import semver from 'semver';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.47';
+const PLUGIN_PACKAGE_VERSION = '0.0.54';

 export async function runLocalBuildAsync(job: Job): Promise<void> {
-  const { command, args } = getCommandAndArgs(job);
+  const { command, args } = await getCommandAndArgsAsync(job);
  await spawnAsync(command, args, {
    stdio: 'inherit',
  });
 }

-function getCommandAndArgs(job: Job): { command: string; args: string[] } {
+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 {
@@ -19,9 +20,20 @@ function getCommandAndArgs(job: Job): { command: string; args: string[] } {
      args: [jobBase64],
    };
  } else {
+    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
+      args.unshift('-y');
+    }
    return {
      command: 'npx',
-      args: ['-y', `${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64],
+      args,
    };
  }
 }
+
+async function isAtLeastNpm7Async(): Promise<boolean> {
+  const version = (await spawnAsync('npm', ['--version'])).stdout.trim();
+  return semver.gte(version, '7.0.0');
+}
@@ -1,10 +1,10 @@
+import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import fs from 'fs-extra';
+import resolveFrom from 'resolve-from';

-import { getApplicationIdAsync } from '../project/android/applicationId';
-import { GradleBuildContext } from '../project/android/gradle';
-import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
+import Log from '../log';
 import { getUsername } from '../project/projectUtils';
 import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
@@ -22,22 +22,20 @@ import {
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { isExpoUpdatesInstalled } from './utils/updates';

-export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
-  ? AndroidMetadataContext
-  : IosMetadataContext;
-
-export interface AndroidMetadataContext {
-  gradleContext?: GradleBuildContext;
-}
-export interface IosMetadataContext {
-  buildSettings: XCBuildConfiguration['buildSettings'];
-  targetName?: string;
-  buildConfiguration?: string;
+// 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>,
-  platformContext: MetadataContext<T>
+  ctx: BuildContext<T>
 ): Promise<Metadata> {
  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
  const distribution =
@@ -46,16 +44,17 @@ export async function collectMetadataAsync<T extends Platform>(
      : ctx.buildProfile.distribution) ?? 'store';
  const metadata = {
    trackingContext: ctx.trackingCtx,
-    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
+    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: ctx.exp.runtimeVersion,
+    runtimeVersion: getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    reactNativeVersion: await getReactNativeVersionAsync(ctx),
    ...channelOrReleaseChannel,
    distribution,
    appName: ctx.exp.name,
-    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
+    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
    gitCommitHash: await getVcsClient().getCommitHashAsync(),
    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
@@ -70,15 +69,14 @@ export async function collectMetadataAsync<T extends Platform>(
 }

 async function maybeResolveVersionsAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext: MetadataContext<T>
+  ctx: BuildContext<T>
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext;
+    const iosContext = ctx as BuildContext<Platform.IOS>;
    return await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext?.buildSettings ?? {}
+      iosContext.ios.applicationTargetBuildSettings
    );
  } else if (ctx.platform === Platform.ANDROID) {
    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
@@ -88,19 +86,11 @@ async function maybeResolveVersionsAsync<T extends Platform>(
  }
 }

-async function resolveAppIdentifierAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext: MetadataContext<T>
-): Promise<string> {
+function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
  if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext;
-    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp, {
-      targetName: iosContext.targetName,
-      buildConfiguration: iosContext.buildConfiguration,
-    });
+    return (ctx as BuildContext<Platform.IOS>).ios.bundleIdentifier;
  } else {
-    const androidContext = platformContext as AndroidMetadataContext;
-    return await getApplicationIdAsync(ctx.projectDir, ctx.exp, androidContext.gradleContext);
+    return (ctx as BuildContext<Platform.ANDROID>).android.applicationId;
  }
 }

@@ -154,6 +144,19 @@ async function getNativeChannelAsync<T extends Platform>(
  return undefined;
 }

+async function getReactNativeVersionAsync(
+  ctx: BuildContext<Platform>
+): Promise<string | undefined> {
+  try {
+    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
+    return (await fs.readJson(reactNativePackageJsonPath)).version;
+  } catch (err) {
+    Log.debug('Failed to resolve react-native version:');
+    Log.debug(err);
+    return undefined;
+  }
+}
+
 function resolveIosEnterpriseProvisioning(
  ctx: BuildContext<Platform.IOS>
 ): IosEnterpriseProvisioning | undefined {
@@ -1,5 +1,4 @@
 import { Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
@@ -21,7 +20,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
 }: {
  projectDir: string;
  nonInteractive?: boolean;
-  buildProfiles?: ProfileData<BuildProfile>[];
+  buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
  if (await isExpoDevClientInstalledAsync(projectDir)) {
    return;
@@ -136,6 +136,7 @@ export async function reviewAndCommitChangesAsync(
    await getVcsClient().commitAsync({
      commitMessage: initialCommitMessage,
      commitAllFiles: false,
+      nonInteractive,
    });
    Log.withTick('Committed changes.');
    return;
@@ -4,9 +4,9 @@ import path from 'path';

 import Log, { learnMore } from '../log';
 import { getVcsClient } from '../vcs';
-import { BuildContext } from './context';
+import { CommonContext } from './context';

-export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
+export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
  if (ctx.buildProfile.env?.NODE_ENV === 'production') {
    Log.warn(
      'You set NODE_ENV=production in the build profile. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
@@ -16,7 +16,7 @@ export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
 }

 export async function checkGoogleServicesFileAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: CommonContext<T>
 ): Promise<void> {
  if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
    return;
@@ -8,7 +8,6 @@ import {
  initAsync as initAnalyticsAsync,
  logEvent,
 } from '../analytics/rudderstackClient';
-import Log from '../log';
 import { findProjectRootAsync } from '../project/projectUtils';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
@@ -27,8 +26,6 @@ export default abstract class EasCommand extends Command {

  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
-    EasJsonReader.setLog(Log);
-
    await initAnalyticsAsync();
    await this.applyCliConfigAsync();

@@ -1,443 +1,10 @@
-import { ExpoConfig, getConfig } from '@expo/config';
-import { Updates } from '@expo/config-plugins';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { flags } from '@oclif/command';
-import assert from 'assert';
-import chalk from 'chalk';
-import dateFormat from 'dateformat';
-import gql from 'graphql-tag';
-
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  GetUpdateGroupAsyncQuery,
-  Robot,
-  RootQueryUpdatesByGroupArgs,
-  Update,
-  UpdateInfoGroup,
-  User,
-  ViewBranchQuery,
-} from '../../graphql/generated';
-import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import {
-  PublishPlatform,
-  buildBundlesAsync,
-  buildUnsortedUpdateInfoGroupAsync,
-  collectAssetsAsync,
-  uploadAssetsAsync,
-} from '../../project/publish';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { promptAsync, selectAsync } from '../../prompts';
-import { formatUpdate } from '../../update/utils';
-import uniqBy from '../../utils/expodash/uniqBy';
-import formatFields from '../../utils/formatFields';
-import { getVcsClient } from '../../vcs';
-import { createUpdateBranchOnAppAsync } from './create';
-import { listBranchesAsync } from './list';
-import { viewUpdateBranchAsync } from './view';
-
-export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
-type PlatformFlag = PublishPlatform | 'all';
-
-async function getUpdateGroupAsync({
-  group,
-}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
-  const { updatesByGroup } = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
-        gql`
-          query getUpdateGroupAsync($group: ID!) {
-            updatesByGroup(group: $group) {
-              id
-              group
-              runtimeVersion
-              manifestFragment
-              platform
-              message
-            }
-          }
-        `,
-        {
-          group,
-        },
-        { additionalTypenames: ['Update'] }
-      )
-      .toPromise()
-  );
-  return updatesByGroup;
-}
-
-async function ensureBranchExistsAsync({
-  appId,
-  name: branchName,
-}: {
-  appId: string;
-  name: string;
-}): Promise<{
-  id: string;
-  updates: Exclude<
-    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'];
-}> {
-  const { app } = await viewUpdateBranchAsync({
-    appId,
-    name: branchName,
-  });
-  const updateBranch = app?.byId.updateBranchByName;
-  if (updateBranch) {
-    const { id, updates } = updateBranch;
-    return { id, updates };
-  }
-
-  const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
-  return { id: newUpdateBranch.id, updates: [] };
-}

 export default class BranchPublish extends EasCommand {
+  static description = 'deprecated, use "eas update"';
  static hidden = true;
-  static description = 'Publish an update group to a branch.';
-
-  static args = [
-    {
-      name: 'name',
-      description: 'Name of the branch to publish on',
-    },
-  ];
-
-  static flags = {
-    message: flags.string({
-      description: 'short message describing the updates.',
-      required: false,
-    }),
-    republish: flags.boolean({
-      description: 'republish an update group',
-      exclusive: ['input-dir', 'skip-bundler'],
-    }),
-    group: flags.string({
-      description: 'update group to republish',
-      exclusive: ['input-dir', 'skip-bundler'],
-    }),
-    'input-dir': flags.string({
-      description: 'location of the bundle',
-      default: 'dist',
-      required: false,
-    }),
-    'skip-bundler': flags.boolean({
-      description: `skip running Expo CLI to bundle the app before publishing`,
-      default: false,
-    }),
-    platform: flags.enum({
-      char: 'p',
-      description: `only publish to a single platform`,
-      options: [...defaultPublishPlatforms, 'all'],
-      default: 'all',
-      required: false,
-    }),
-    json: flags.boolean({
-      description: `return a json with the new update group.`,
-      default: false,
-    }),
-    auto: flags.boolean({
-      description:
-        'use the current git branch and commit message for the EAS branch and update message',
-      default: false,
-    }),
-  };

  async runAsync(): Promise<void> {
-    let {
-      args: { name: branchName },
-      flags: {
-        json: jsonFlag,
-        auto: autoFlag,
-        message,
-        republish,
-        group,
-        'input-dir': inputDir,
-        'skip-bundler': skipBundler,
-      },
-    } = this.parse(BranchPublish);
-    const platformFlag = this.parse(BranchPublish).flags.platform as PlatformFlag;
-    // If a group was specified, that means we are republishing it.
-    republish = group ? true : republish;
-
-    const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, {
-      skipSDKVersionRequirement: true,
-      isPublicConfig: true,
-    });
-
-    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
-
-    const projectId = await getProjectIdAsync(exp);
-
-    if (!branchName && autoFlag) {
-      branchName =
-        (await getVcsClient().getBranchNameAsync()) ||
-        `branch-${Math.random().toString(36).substr(2, 4)}`;
-    }
-
-    if (!branchName) {
-      const validationMessage = 'branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-
-      const branches = await listBranchesAsync({ projectId });
-      branchName = await selectAsync<string>(
-        'which branch would you like to publish on?',
-        branches.map(branch => {
-          return {
-            title: `${branch.name} ${chalk.grey(
-              `- current update: ${formatUpdate(branch.updates[0])}`
-            )}`,
-            value: branch.name,
-          };
-        })
-      );
-      assert(branchName, 'branch name must be specified.');
-    }
-
-    const { id: branchId, updates } = await ensureBranchExistsAsync({
-      appId: projectId,
-      name: branchName,
-    });
-
-    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
-    let oldMessage: string, oldRuntimeVersion: string;
-    if (republish) {
-      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
-      // Instead we get the `updateInfoGroup` from the update we wish to republish.
-      let updatesToRepublish: Pick<
-        Update,
-        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
-      >[];
-      if (group) {
-        updatesToRepublish = await getUpdateGroupAsync({ group });
-      } else {
-        // Drop into interactive mode if the user has not specified an update group to republish.
-        if (jsonFlag) {
-          throw new Error('You must specify the update group to republish.');
-        }
-
-        const updateGroups = uniqBy(updates, u => u.group)
-          .filter(update => {
-            // Only show groups that have updates on the specified platform(s).
-            return platformFlag === 'all' || update.platform === platformFlag;
-          })
-          .map(update => ({
-            title: formatUpdateTitle(update),
-            value: update.group,
-          }));
-        if (updateGroups.length === 0) {
-          throw new Error(
-            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
-          );
-        }
-
-        const selectedUpdateGroup = await selectAsync<string>(
-          'which update would you like to republish?',
-          updateGroups
-        );
-        updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
-      }
-      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
-        // Only republish to the specified platforms
-        update => platformFlag === 'all' || update.platform === platformFlag
-      );
-      if (updatesToRepublishFilteredByPlatform.length === 0) {
-        throw new Error(
-          `There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
-            group ? group : updatesToRepublish[0].group
-          }". Did you mean to publish a new update instead?`
-        );
-      }
-
-      let publicationPlatformMessage: string;
-      if (platformFlag === 'all') {
-        if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
-          Log.warn(`You are republishing an update that wasn't published for all platforms.`);
-        }
-        publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
-          .map(update => update.platform)
-          .join(',')}`;
-      } else {
-        publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
-      }
-      Log.withTick(publicationPlatformMessage);
-
-      for (const update of updatesToRepublishFilteredByPlatform) {
-        const { manifestFragment } = update;
-        const platform = update.platform as PublishPlatform;
-
-        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
-      }
-
-      // These are the same for each member of an update group
-      group = updatesToRepublishFilteredByPlatform[0].group;
-      oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
-      oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
-    } else {
-      // build bundle and upload assets for a new publish
-      if (!skipBundler) {
-        await buildBundlesAsync({ projectDir, inputDir });
-      }
-
-      const assetSpinner = ora('Uploading assets...').start();
-      try {
-        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
-        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
-        await uploadAssetsAsync(assets);
-        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
-        assetSpinner.succeed('Uploaded assets!');
-      } catch (e) {
-        assetSpinner.fail('Failed to upload assets');
-        throw e;
-      }
-    }
-
-    if (!message && autoFlag) {
-      message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
-    }
-
-    if (!message) {
-      const validationMessage = 'publish message may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ publishMessage: message } = await promptAsync({
-        type: 'text',
-        name: 'publishMessage',
-        message: `Please enter a publication message.`,
-        initial: republish
-          ? `Republish "${oldMessage!}" - group: ${group}`
-          : (await getVcsClient().getLastCommitMessageAsync())?.trim(),
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
-
-    const runtimeToPlatformMapping: Record<string, string[]> = {};
-    for (const runtime of new Set(Object.values(runtimeVersions))) {
-      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
-        .filter(pair => pair[1] === runtime)
-        .map(pair => pair[0]);
-    }
-
-    // Sort the updates into different groups based on their platform specific runtime versions
-    const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
-      const localUpdateInfoGroup = Object.fromEntries(
-        platforms.map(platform => [
-          platform,
-          unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
-        ])
-      );
-
-      if (republish && !oldRuntimeVersion) {
-        throw new Error(
-          'Can not find the runtime version of the update group that is being republished.'
-        );
-      }
-      return {
-        branchId,
-        updateInfoGroup: localUpdateInfoGroup,
-        runtimeVersion: republish ? oldRuntimeVersion : runtime,
-        message,
-      };
-    });
-    let newUpdates;
-    const publishSpinner = ora('Publishing...').start();
-    try {
-      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
-      publishSpinner.succeed('Published!');
-    } catch (e) {
-      publishSpinner.fail('Failed to published updates');
-      throw e;
-    }
-
-    if (jsonFlag) {
-      Log.log(JSON.stringify(newUpdates));
-    } else {
-      if (new Set(newUpdates.map(update => update.group)).size > 1) {
-        Log.addNewLineIfNone();
-        Log.log(
-          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
-        );
-      }
-
-      Log.addNewLineIfNone();
-      for (const runtime of new Set(Object.values(runtimeVersions))) {
-        const platforms = newUpdates
-          .filter(update => update.runtimeVersion === runtime)
-          .map(update => update.platform);
-        const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
-        if (!newUpdate) {
-          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
-        }
-        Log.log(
-          formatFields([
-            { label: 'branch', value: branchName },
-            { label: 'runtime version', value: runtime },
-            { label: 'platform', value: platforms.join(',') },
-            { label: 'update group ID', value: newUpdate.group },
-            { label: 'message', value: message },
-          ])
-        );
-        Log.addNewLineIfNone();
-      }
-    }
+    throw new Error(BranchPublish.description);
  }
 }
-
-async function getRuntimeVersionObjectAsync(
-  exp: ExpoConfig,
-  platformFlag: PlatformFlag,
-  projectDir: string
-): Promise<Record<string, string>> {
-  const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
-
-  for (const platform of platforms) {
-    const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
-    if (isPolicy) {
-      const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
-      if (!isManaged) {
-        throw new Error('Runtime version policies are only supported in the managed workflow.');
-      }
-    }
-  }
-
-  return Object.fromEntries(
-    platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
-  );
-}
-
-function formatUpdateTitle(
-  update: Exclude<
-    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'][number]
-): string {
-  const { message, createdAt, actor, runtimeVersion } = update;
-
-  let actorName: string;
-  switch (actor?.__typename) {
-    case 'User': {
-      actorName = (actor as Pick<User, 'username' | 'id'>).username;
-      break;
-    }
-    case 'Robot': {
-      const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
-      actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
-      break;
-    }
-    default:
-      actorName = 'unknown';
-  }
-  return `[${dateFormat(
-    createdAt,
-    'mmm dd HH:MM'
-  )} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
-}
@@ -7,6 +7,7 @@ import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
+import { getVcsClient } from '../../vcs';

 export default class BuildConfigure extends EasCommand {
  static description = 'Configure the project to support EAS Build.';
@@ -21,11 +22,14 @@ export default class BuildConfigure extends EasCommand {

  async runAsync(): Promise<void> {
    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 platform =
      (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());

@@ -48,7 +52,7 @@ function logSuccess(platform: RequestedPlatform): void {
    storesText = 'the Google Play Store';
  } else if (platform === 'ios') {
    platformsText = 'iOS project is';
-    storesText = 'the Apple App Store';
+    storesText = 'the Apple App Store Connect';
  }

  Log.log(`🎉 Your ${platformsText} ready to build.
@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonReader } from '@expo/eas-json';
+import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
@@ -10,13 +10,13 @@ import nullthrows from 'nullthrows';
 import { prepareAndroidBuildAsync } from '../../build/android/build';
 import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import { BuildContext, createBuildContextAsync } from '../../build/context';
+import { BuildContext } from '../../build/context';
+import { createBuildContextAsync } from '../../build/createContext';
 import { prepareIosBuildAsync } from '../../build/ios/build';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build/utils/devClient';
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
 import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { CredentialsContext } from '../../credentials/context';
 import {
  AppPlatform,
  BuildFragment,
@@ -32,10 +32,6 @@ import {
  selectRequestedPlatformAsync,
  toPlatforms,
 } from '../../platform';
-import {
-  EAS_UNAVAILABLE_MESSAGE,
-  isEasEnabledForProjectAsync,
-} from '../../project/isEasEnabledForProject';
 import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
@@ -68,7 +64,7 @@ interface RawBuildFlags {
 interface BuildFlags {
  requestedPlatform: RequestedPlatform;
  skipProjectConfiguration: boolean;
-  profile: string | null;
+  profile?: string;
  nonInteractive: boolean;
  local: boolean;
  wait: boolean;
@@ -79,7 +75,7 @@ interface BuildFlags {
 }

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

  static flags = {
    platform: flags.enum({
@@ -152,13 +148,11 @@ export default class Build extends EasCommand {
    await ensureProjectConfiguredAsync(projectDir, requestedPlatform);

    const platforms = toPlatforms(requestedPlatform);
-    const easJsonReader = new EasJsonReader(projectDir);
    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      projectDir,
      platforms,
-      profileName: flags.profile,
-      async readProfileAsync(platform, profileName) {
-        return await easJsonReader.readBuildProfileAsync(platform, profileName);
-      },
+      profileName: flags.profile ?? undefined,
    });

    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
@@ -169,7 +163,7 @@ export default class Build extends EasCommand {

    const startedBuilds: {
      build: BuildFragment;
-      buildProfile: ProfileData<BuildProfile>;
+      buildProfile: ProfileData<'build'>;
    }[] = [];
    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};

@@ -196,16 +190,26 @@ export default class Build extends EasCommand {

    const submissions: SubmissionFragment[] = [];
    if (flags.autoSubmit) {
+      const submitProfiles = await getProfilesAsync({
+        projectDir,
+        platforms,
+        profileName: flags.submitProfile,
+        type: 'submit',
+      });
      for (const startedBuild of startedBuilds) {
+        const submitProfile = nullthrows(
+          submitProfiles.find(
+            ({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
+          )
+        ).profile;
        const submission = await this.prepareAndStartSubmissionAsync({
          build: startedBuild.build,
-          credentialsCtx: nullthrows(
-            buildCtxByPlatform[startedBuild.build.platform]?.credentialsCtx
-          ),
-          flags,
+          buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
          moreBuilds: startedBuilds.length > 1,
          projectDir,
-          buildProfile: startedBuild.buildProfile,
+          buildProfile: startedBuild.buildProfile.profile,
+          submitProfile,
+          nonInteractive: flags.nonInteractive,
        });
        submissions.push(submission);
      }
@@ -268,7 +272,7 @@ export default class Build extends EasCommand {
    return {
      requestedPlatform,
      skipProjectConfiguration: flags['skip-project-configuration'],
-      profile: profile ?? null,
+      profile,
      nonInteractive,
      local: flags['local'],
      wait: flags['wait'],
@@ -288,7 +292,7 @@ export default class Build extends EasCommand {
    projectDir: string;
    flags: BuildFlags;
    moreBuilds: boolean;
-    buildProfile: ProfileData<BuildProfile>;
+    buildProfile: ProfileData<'build'>;
  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
    const buildCtx = await createBuildContextAsync({
      buildProfileName: buildProfile.profileName,
@@ -316,10 +320,6 @@ export default class Build extends EasCommand {
      this.metroConfigValidated = true;
    }

-    if (!buildCtx.local && !(await isEasEnabledForProjectAsync(buildCtx.projectId))) {
-      error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
-    }
-
    const build = await this.startBuildAsync(buildCtx);
    return {
      build,
@@ -339,31 +339,32 @@ export default class Build extends EasCommand {

  private async prepareAndStartSubmissionAsync({
    build,
-    credentialsCtx,
-    flags,
+    buildCtx,
    moreBuilds,
    projectDir,
    buildProfile,
+    submitProfile,
+    nonInteractive,
  }: {
    build: BuildFragment;
-    credentialsCtx: CredentialsContext;
-    flags: BuildFlags;
+    buildCtx: BuildContext<Platform>;
    moreBuilds: boolean;
    projectDir: string;
-    buildProfile: ProfileData<BuildProfile>;
+    buildProfile: BuildProfile;
+    submitProfile: SubmitProfile;
+    nonInteractive: boolean;
  }): Promise<SubmissionFragment> {
-    const easJsonReader = new EasJsonReader(projectDir);
    const platform = toPlatform(build.platform);
-    const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
    const submissionCtx = await createSubmissionContextAsync({
      platform,
      projectDir,
      projectId: build.project.id,
      profile: submitProfile,
      archiveFlags: { id: build.id },
-      nonInteractive: flags.nonInteractive,
-      env: buildProfile.profile.env,
-      credentialsCtx,
+      nonInteractive,
+      env: buildProfile.env,
+      credentialsCtx: buildCtx.credentialsCtx,
+      applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
    });

    if (moreBuilds) {
@@ -397,7 +398,7 @@ export async function handleDeprecatedEasJsonAsync(
    return;
  }
  const easJsonReader = new EasJsonReader(projectDir);
-  const rawEasJson = await easJsonReader.readRawAsync();
+  const rawEasJson = await easJsonReader.readAsync();
  if (rawEasJson?.cli) {
    return;
  }
@@ -20,7 +20,7 @@ import { promptAsync } from '../../prompts';
 import formatFields from '../../utils/formatFields';
 import { createUpdateBranchOnAppAsync } from '../branch/create';

-async function createUpdateChannelOnAppAsync({
+export async function createUpdateChannelOnAppAsync({
  appId,
  channelName,
  branchId,
@@ -89,7 +89,7 @@ export async function updateChannelBranchMappingAsync({
  );
  const channel = data.updateChannel.editUpdateChannel;
  if (!channel) {
-    throw new Error(`Could not fine channel with id ${channelId}`);
+    throw new Error(`Could not find a channel with id: ${channelId}`);
  }
  return data.updateChannel.editUpdateChannel!;
 }
@@ -181,7 +181,7 @@ export function logChannelDetails(channel: {
        : []),
      formatUpdate(update),
      update?.runtimeVersion ?? 'N/A',
-      update?.group ?? 'N/A,',
+      update?.group ?? 'N/A',
      getPlatformsForGroup({
        updates: branch.updates,
        group: branch.updates[0]?.group,
@@ -239,7 +239,7 @@ export default class ChannelView extends EasCommand {
    });
    const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
    if (!channel) {
-      throw new Error(`Could not fine channel with name ${channelName}`);
+      throw new Error(`Could not find a channel with name: ${channelName}`);
    }

    if (jsonFlag) {
@@ -256,9 +256,7 @@ export default class ChannelView extends EasCommand {
      ])
    );
    Log.addNewLineIfNone();
-    Log.log(
-      chalk`{bold Branches, pointed at by this channel, and their most recent update group:}`
-    );
+    Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
    logChannelDetails(channel);
  }
 }
@@ -55,7 +55,7 @@ export default class Config extends EasCommand {
        },
      ]));

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

    Log.log(getProjectConfigDescription(projectDir));
@@ -1,16 +1,10 @@
 import EasCommand from '../commandUtils/EasCommand';
-import { CredentialsContext } from '../credentials/context';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
-import { ensureLoggedInAsync } from '../user/actions';

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

  async runAsync(): Promise<void> {
-    const ctx = new CredentialsContext({
-      projectDir: process.cwd(),
-      user: await ensureLoggedInAsync(),
-    });
-    await new SelectPlatform().runAsync(ctx);
+    await new SelectPlatform().runAsync();
  }
 }
@@ -1,7 +1,10 @@
+import { Platform } from '@expo/eas-build-job';
 import envinfo from 'envinfo';

 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
+import { findProjectRootAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';

 export default class Diagnostics extends EasCommand {
@@ -32,6 +35,23 @@ export default class Diagnostics extends EasCommand {
        title: `EAS CLI ${easCliVersion} environment info`,
      }
    );
-    Log.log(info);
+
+    Log.log(info.trimEnd());
+    await this.printWorkflowAsync();
+    Log.newLine();
+  }
+
+  private async printWorkflowAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+
+    if (androidWorkflow === iosWorkflow) {
+      Log.log(`    Project workflow: ${androidWorkflow}`);
+    } else {
+      Log.log(`    Project Workflow:`);
+      Log.log(`      Android: ${androidWorkflow}`);
+      Log.log(`      iOS: ${iosWorkflow}`);
+    }
  }
 }
@@ -9,10 +9,6 @@ import {
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
  findProjectRootAsync,
  getProjectAccountNameAsync,
@@ -57,12 +53,6 @@ export default class EnvironmentSecretCreate extends EasCommand {
    const { slug } = exp;
    const projectId = await getProjectIdAsync(exp);

-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
    if (!scope) {
      const validationMessage = 'Secret scope may not be empty.';

@@ -10,10 +10,6 @@ import {
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
  findProjectRootAsync,
  getProjectAccountNameAsync,
@@ -37,12 +33,6 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secret:list')}`;
    const projectId = await getProjectIdAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);

-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
    let {
      flags: { id },
    } = this.parse(EnvironmentSecretDelete);
@@ -6,10 +6,6 @@ import dateFormat from 'dateformat';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
  findProjectRootAsync,
  getProjectAccountNameAsync,
@@ -25,12 +21,6 @@ export default class EnvironmentSecretList extends EasCommand {
    const projectId = await getProjectIdAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);

-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
    if (!projectDir) {
      throw new Error("Please run this command inside your project's directory");
    }
@@ -1,5 +1,4 @@
 import { getConfig } from '@expo/config';
-import { EasJsonReader } from '@expo/eas-json';
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
@@ -15,7 +14,6 @@ import {
  selectRequestedPlatformAsync,
  toPlatforms,
 } from '../platform';
-import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
 import { submitAsync, waitToCompleteAsync } from '../submit/submit';
@@ -44,7 +42,7 @@ interface Flags {
 }

 export default class Submit extends EasCommand {
-  static description = `submit build archive to app store
+  static description = `Submit build archive to App Store Connect
 See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
  static aliases = ['build:submit'];

@@ -96,20 +94,12 @@ See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
    const platforms = toPlatforms(flags.requestedPlatform);
-    const easJsonReader = new EasJsonReader(projectDir);
    const submissionProfiles = await getProfilesAsync({
+      type: 'submit',
+      projectDir,
      platforms,
      profileName: flags.profile,
-      async readProfileAsync(platform, profileName) {
-        return await easJsonReader.readSubmitProfileAsync(platform, profileName);
-      },
    });

    const submissions: SubmissionFragment[] = [];
@@ -0,0 +1,108 @@
+import { ExpoConfig, getConfig, modifyConfigAsync } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import Log, { learnMore } from '../../log';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+
+const EAS_UPDATE_URL = 'https://u.expo.dev';
+const DEFAULT_RUNTIME_VERSION = { policy: 'sdkVersion' } as const;
+
+export async function getEASUpdateURLAsync(exp: ExpoConfig): Promise<string> {
+  const projectId = await getProjectIdAsync(exp);
+  return new URL(projectId, EAS_UPDATE_URL).href;
+}
+
+async function configureProjectForEASUpdateAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  const easUpdateURL = await getEASUpdateURLAsync(exp);
+  const preexistingRuntimeVersion = exp.runtimeVersion;
+  const result = await modifyConfigAsync(projectDir, {
+    runtimeVersion: preexistingRuntimeVersion ?? DEFAULT_RUNTIME_VERSION,
+    updates: { ...exp.updates, url: easUpdateURL },
+  });
+
+  switch (result.type) {
+    case 'success':
+      if (exp.updates?.url) {
+        if (exp.updates.url !== easUpdateURL) {
+          Log.withTick(
+            `Overwrote "${exp.updates?.url}" with "${easUpdateURL}" for the updates.url value in app.json`
+          );
+        }
+      } else {
+        Log.withTick(`Set updates.url value, to "${easUpdateURL}" in app.json`);
+      }
+      if (!preexistingRuntimeVersion) {
+        Log.withTick(
+          `Set runtimeVersion to "${JSON.stringify(DEFAULT_RUNTIME_VERSION)}" in app.json`
+        );
+      }
+
+      break;
+    case 'warn': {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `It looks like you are using a dynamic configuration! ${learnMore(
+          'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs)'
+        )}`
+      );
+      Log.warn(
+        `In order to finish configuring your project for EAS Update, you are going to need manually add the following to your app.config.js:\n${learnMore(
+          'https://expo.fyi/eas-update-config.md'
+        )}\n`
+      );
+      Log.log(
+        chalk.bold(
+          `{\n  updates": {\n    "url": "${easUpdateURL}"\n  },\n  "runtimeVersion": {\n    "policy": "sdkVersion"\n  }\n}`
+        )
+      );
+      Log.addNewLineIfNone();
+      throw new Error(result.message);
+    }
+    case 'fail':
+      throw new Error(result.message);
+    default:
+      throw new Error('Unexpected result type from modifyConfigAsync');
+  }
+}
+
+export default class UpdateConfigure extends EasCommand {
+  static hidden = true;
+  static description = 'Configure the project to support EAS Update.';
+
+  async runAsync(): Promise<void> {
+    Log.log(
+      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
+    );
+
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+    });
+
+    await configureProjectForEASUpdateAsync(projectDir, exp);
+
+    const hasAndroidNativeProject =
+      (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
+    const hasIosNativeProject =
+      (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
+
+    Log.addNewLineIfNone();
+    if (hasAndroidNativeProject || hasIosNativeProject) {
+      Log.log(
+        `🧐 It seems you are on the bare workflow! Please also update your native files. You can do this by either running ${chalk.bold(
+          'eas build:configure'
+        )} or manually editing Expo.plist/AndroidManifest.xml. ${learnMore(
+          'https://expo.fyi/eas-update-config.md#native-configuration'
+        )}`
+      );
+    } else {
+      Log.log(`🎉 Your app is configured to run EAS Update!`);
+    }
+  }
+}
@@ -0,0 +1,483 @@
+import { ExpoConfig, getConfig } from '@expo/config';
+import { Updates } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { flags } from '@oclif/command';
+import assert from 'assert';
+import chalk from 'chalk';
+import dateFormat from 'dateformat';
+import gql from 'graphql-tag';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetUpdateGroupAsyncQuery,
+  Robot,
+  RootQueryUpdatesByGroupArgs,
+  Update,
+  UpdateInfoGroup,
+  User,
+  ViewBranchQuery,
+} from '../../graphql/generated';
+import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import {
+  PublishPlatform,
+  buildBundlesAsync,
+  buildUnsortedUpdateInfoGroupAsync,
+  collectAssetsAsync,
+  uploadAssetsAsync,
+} from '../../project/publish';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { promptAsync, selectAsync } from '../../prompts';
+import { formatUpdate } from '../../update/utils';
+import uniqBy from '../../utils/expodash/uniqBy';
+import formatFields from '../../utils/formatFields';
+import { getVcsClient } from '../../vcs';
+import { createUpdateBranchOnAppAsync } from '../branch/create';
+import { listBranchesAsync } from '../branch/list';
+import { viewUpdateBranchAsync } from '../branch/view';
+import { createUpdateChannelOnAppAsync } from '../channel/create';
+import { getEASUpdateURLAsync } from './configure';
+
+export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
+type PlatformFlag = PublishPlatform | 'all';
+
+async function getUpdateGroupAsync({
+  group,
+}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
+  const { updatesByGroup } = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
+        gql`
+          query getUpdateGroupAsync($group: ID!) {
+            updatesByGroup(group: $group) {
+              id
+              group
+              runtimeVersion
+              manifestFragment
+              platform
+              message
+            }
+          }
+        `,
+        {
+          group,
+        },
+        { additionalTypenames: ['Update'] }
+      )
+      .toPromise()
+  );
+  return updatesByGroup;
+}
+
+async function ensureChannelExistsAsync({
+  appId,
+  branchId,
+  channelName,
+}: {
+  appId: string;
+  branchId: string;
+  channelName: string;
+}): Promise<void> {
+  try {
+    await createUpdateChannelOnAppAsync({
+      appId,
+      channelName,
+      branchId,
+    });
+    Log.withTick(
+      `Created a channel: ${chalk.bold(channelName)} pointed at branch: ${chalk.bold(channelName)}.`
+    );
+  } catch (e: any) {
+    const isIgnorableError =
+      e.graphQLErrors?.length === 1 &&
+      e.graphQLErrors[0].extensions.errorCode === 'CHANNEL_ALREADY_EXISTS';
+    if (!isIgnorableError) {
+      throw e;
+    }
+  }
+}
+
+async function ensureBranchExistsAsync({
+  appId,
+  name: branchName,
+}: {
+  appId: string;
+  name: string;
+}): Promise<{
+  id: string;
+  updates: Exclude<
+    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'];
+}> {
+  const { app } = await viewUpdateBranchAsync({
+    appId,
+    name: branchName,
+  });
+  const updateBranch = app?.byId.updateBranchByName;
+  if (updateBranch) {
+    const { id, updates } = updateBranch;
+    await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
+    return { id, updates };
+  }
+
+  const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
+  Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
+  await ensureChannelExistsAsync({ appId, branchId: newUpdateBranch.id, channelName: branchName });
+  return { id: newUpdateBranch.id, updates: [] };
+}
+
+export default class UpdatePublish extends EasCommand {
+  static hidden = true;
+  static description = 'Publish an update group.';
+
+  static flags = {
+    branch: flags.string({
+      description: 'Branch to publish the update group on',
+      required: false,
+    }),
+    message: flags.string({
+      description: 'A short message describing the update',
+      required: false,
+    }),
+    republish: flags.boolean({
+      description: 'Republish an update group',
+      exclusive: ['input-dir', 'skip-bundler'],
+    }),
+    group: flags.string({
+      description: 'Update group to republish',
+      exclusive: ['input-dir', 'skip-bundler'],
+    }),
+    'input-dir': flags.string({
+      description: 'Location of the bundle',
+      default: 'dist',
+      required: false,
+    }),
+    'skip-bundler': flags.boolean({
+      description: `Skip running Expo CLI to bundle the app before publishing`,
+      default: false,
+    }),
+    platform: flags.enum({
+      char: 'p',
+      options: [...defaultPublishPlatforms, 'all'],
+      default: 'all',
+      required: false,
+    }),
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+      default: false,
+    }),
+    auto: flags.boolean({
+      description:
+        'Use the current git branch and commit message for the EAS branch and update message',
+      default: false,
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    let {
+      flags: {
+        branch: branchName,
+        json: jsonFlag,
+        auto: autoFlag,
+        message,
+        republish,
+        group,
+        'input-dir': inputDir,
+        'skip-bundler': skipBundler,
+      },
+    } = this.parse(UpdatePublish);
+    const platformFlag = this.parse(UpdatePublish).flags.platform as PlatformFlag;
+    // If a group was specified, that means we are republishing it.
+    republish = group ? true : republish;
+
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+      isPublicConfig: true,
+    });
+
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
+    const projectId = await getProjectIdAsync(exp);
+    await checkEASUpdateURLIsSetAsync(exp);
+
+    if (!branchName && autoFlag) {
+      branchName =
+        (await getVcsClient().getBranchNameAsync()) ||
+        `branch-${Math.random().toString(36).substr(2, 4)}`;
+    }
+
+    if (!branchName) {
+      const validationMessage = 'branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+
+      const branches = await listBranchesAsync({ projectId });
+      branchName = await selectAsync<string>(
+        'which branch would you like to publish on?',
+        branches.map(branch => {
+          return {
+            title: `${branch.name} ${chalk.grey(
+              `- current update: ${formatUpdate(branch.updates[0])}`
+            )}`,
+            value: branch.name,
+          };
+        })
+      );
+      assert(branchName, 'branch name must be specified.');
+    }
+
+    const { id: branchId, updates } = await ensureBranchExistsAsync({
+      appId: projectId,
+      name: branchName,
+    });
+
+    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
+    let oldMessage: string, oldRuntimeVersion: string;
+    if (republish) {
+      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
+      // Instead we get the `updateInfoGroup` from the update we wish to republish.
+      let updatesToRepublish: Pick<
+        Update,
+        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
+      >[];
+      if (group) {
+        updatesToRepublish = await getUpdateGroupAsync({ group });
+      } else {
+        // Drop into interactive mode if the user has not specified an update group to republish.
+        if (jsonFlag) {
+          throw new Error('You must specify the update group to republish.');
+        }
+
+        const updateGroups = uniqBy(updates, u => u.group)
+          .filter(update => {
+            // Only show groups that have updates on the specified platform(s).
+            return platformFlag === 'all' || update.platform === platformFlag;
+          })
+          .map(update => ({
+            title: formatUpdateTitle(update),
+            value: update.group,
+          }));
+        if (updateGroups.length === 0) {
+          throw new Error(
+            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+          );
+        }
+
+        const selectedUpdateGroup = await selectAsync<string>(
+          'which update would you like to republish?',
+          updateGroups
+        );
+        updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
+      }
+      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
+        // Only republish to the specified platforms
+        update => platformFlag === 'all' || update.platform === platformFlag
+      );
+      if (updatesToRepublishFilteredByPlatform.length === 0) {
+        throw new Error(
+          `There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
+            group ? group : updatesToRepublish[0].group
+          }". Did you mean to publish a new update instead?`
+        );
+      }
+
+      let publicationPlatformMessage: string;
+      if (platformFlag === 'all') {
+        if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
+          Log.warn(`You are republishing an update that wasn't published for all platforms.`);
+        }
+        publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
+          .map(update => update.platform)
+          .join(',')}`;
+      } else {
+        publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
+      }
+      Log.withTick(publicationPlatformMessage);
+
+      for (const update of updatesToRepublishFilteredByPlatform) {
+        const { manifestFragment } = update;
+        const platform = update.platform as PublishPlatform;
+
+        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
+      }
+
+      // These are the same for each member of an update group
+      group = updatesToRepublishFilteredByPlatform[0].group;
+      oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
+      oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
+    } else {
+      if (!message && autoFlag) {
+        message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
+      }
+
+      if (!message) {
+        const validationMessage = 'publish message may not be empty.';
+        if (jsonFlag) {
+          throw new Error(validationMessage);
+        }
+        ({ publishMessage: message } = await promptAsync({
+          type: 'text',
+          name: 'publishMessage',
+          message: `Please enter an update message.`,
+          initial: republish
+            ? `Republish "${oldMessage!}" - group: ${group}`
+            : (await getVcsClient().getLastCommitMessageAsync())?.trim(),
+          validate: (value: any) => (value ? true : validationMessage),
+        }));
+      }
+
+      // build bundle and upload assets for a new publish
+      if (!skipBundler) {
+        await buildBundlesAsync({ projectDir, inputDir });
+      }
+
+      const assetSpinner = ora('Uploading assets...').start();
+      try {
+        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
+        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
+        await uploadAssetsAsync(assets);
+        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
+        assetSpinner.succeed('Uploaded assets!');
+      } catch (e) {
+        assetSpinner.fail('Failed to upload assets');
+        throw e;
+      }
+    }
+
+    const runtimeToPlatformMapping: Record<string, string[]> = {};
+    for (const runtime of new Set(Object.values(runtimeVersions))) {
+      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
+        .filter(pair => pair[1] === runtime)
+        .map(pair => pair[0]);
+    }
+
+    // Sort the updates into different groups based on their platform specific runtime versions
+    const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
+      const localUpdateInfoGroup = Object.fromEntries(
+        platforms.map(platform => [
+          platform,
+          unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
+        ])
+      );
+
+      if (republish && !oldRuntimeVersion) {
+        throw new Error(
+          'Can not find the runtime version of the update group that is being republished.'
+        );
+      }
+      return {
+        branchId,
+        updateInfoGroup: localUpdateInfoGroup,
+        runtimeVersion: republish ? oldRuntimeVersion : runtime,
+        message,
+      };
+    });
+    let newUpdates;
+    const publishSpinner = ora('Publishing...').start();
+    try {
+      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
+      publishSpinner.succeed('Published!');
+    } catch (e) {
+      publishSpinner.fail('Failed to published updates');
+      throw e;
+    }
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(newUpdates));
+    } else {
+      if (new Set(newUpdates.map(update => update.group)).size > 1) {
+        Log.addNewLineIfNone();
+        Log.log(
+          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
+        );
+      }
+
+      Log.addNewLineIfNone();
+      for (const runtime of new Set(Object.values(runtimeVersions))) {
+        const platforms = newUpdates
+          .filter(update => update.runtimeVersion === runtime)
+          .map(update => update.platform);
+        const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
+        if (!newUpdate) {
+          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
+        }
+        Log.log(
+          formatFields([
+            { label: 'branch', value: branchName },
+            { label: 'runtime version', value: runtime },
+            { label: 'platform', value: platforms.join(', ') },
+            { label: 'update group ID', value: newUpdate.group },
+            { label: 'message', value: message! },
+          ])
+        );
+        Log.addNewLineIfNone();
+      }
+    }
+  }
+}
+
+async function getRuntimeVersionObjectAsync(
+  exp: ExpoConfig,
+  platformFlag: PlatformFlag,
+  projectDir: string
+): Promise<Record<string, string>> {
+  const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
+
+  for (const platform of platforms) {
+    const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
+    if (isPolicy) {
+      const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
+      if (!isManaged) {
+        throw new Error('Runtime version policies are only supported in the managed workflow.');
+      }
+    }
+  }
+
+  return Object.fromEntries(
+    platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
+  );
+}
+
+function formatUpdateTitle(
+  update: Exclude<
+    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'][number]
+): string {
+  const { message, createdAt, actor, runtimeVersion } = update;
+
+  let actorName: string;
+  switch (actor?.__typename) {
+    case 'User': {
+      actorName = (actor as Pick<User, 'username' | 'id'>).username;
+      break;
+    }
+    case 'Robot': {
+      const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
+      actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
+      break;
+    }
+    default:
+      actorName = 'unknown';
+  }
+  return `[${dateFormat(
+    createdAt,
+    'mmm dd HH:MM'
+  )} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
+}
+
+async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
+  const configuredURL = exp.updates?.url;
+  const expectedURL = await getEASUpdateURLAsync(exp);
+
+  if (configuredURL !== expectedURL) {
+    throw new Error(
+      `The update URL is incorrectly configured for EAS Update. Please set updates.url to ${expectedURL} in your app.json.`
+    );
+  }
+}
@@ -14,8 +14,7 @@ export default class WebhookCreate extends EasCommand {
  static flags = {
    event: flags.enum({
      description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
-      default: WebhookType.Build,
+      options: [WebhookType.Build, WebhookType.Submit],
    }),
    url: flags.string({
      description: 'Webhook URL',
@@ -20,7 +20,7 @@ export default class WebhookList extends EasCommand {
  static flags = {
    event: flags.enum({
      description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
+      options: [WebhookType.Build, WebhookType.Submit],
    }),
  };

@@ -18,8 +18,7 @@ export default class WebhookUpdate extends EasCommand {
    }),
    event: flags.enum({
      description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
-      default: WebhookType.Build,
+      options: [WebhookType.Build, WebhookType.Submit],
    }),
    url: flags.string({
      description: 'Webhook URL',
@@ -1,4 +1,5 @@
 import { ExpoConfig, getConfig } from '@expo/config';
+import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';

 import Log from '../log';
@@ -27,6 +28,7 @@ export class CredentialsContext {
      nonInteractive?: boolean;
      projectDir: string;
      user: Actor;
+      env?: Env;
    }
  ) {
    this.projectDir = options.projectDir;
@@ -35,11 +37,21 @@ export class CredentialsContext {

    this.resolvedExp = options.exp;
    if (!this.resolvedExp) {
-      try {
-        this.resolvedExp = getExpoConfig(options.projectDir);
-      } catch (error) {
-        // ignore error, context might be created outside of expo project
-      }
+      this.resolvedExp =
+        CredentialsContext.getExpoConfigInProject(this.projectDir, { env: options.env }) ??
+        undefined;
+    }
+  }
+
+  static getExpoConfigInProject(
+    projectDir: string,
+    { env }: { env?: Env } = {}
+  ): ExpoConfig | null {
+    try {
+      return getExpoConfig(projectDir, { env });
+    } catch (error) {
+      // ignore error, context might be created outside of expo project
+      return null;
    }
  }

@@ -119,7 +119,9 @@ async function promptForAscApiKeyAsync(ctx: CredentialsContext): Promise<Minimal

 async function promptForKeyP8AndIdAsync(): Promise<Pick<AscApiKeyPath, 'keyP8Path' | 'keyId'>> {
  Log.log(
-    chalk.bold('An App Store Connect Api key is required to upload your app to the Apple App Store')
+    chalk.bold(
+      'An App Store Connect Api key is required to upload your app to the Apple App Store Connect'
+    )
  );
  Log.log(
    `If you're not sure what this is or how to create one, ${learnMore(
@@ -150,6 +150,30 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
    expect(results.disabled).toStrictEqual([]);
  });

+  // It's unclear what is happening in this issue, so for now we can provide a more
+  // helpful error message until we can get a reproducible example.
+  // https://github.com/expo/eas-cli/issues/740
+  it('throw useful error message on unexpected error', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => []),
+      updateBundleIdCapabilityAsync: jest.fn(() => {
+        throw new Error(`bundle 'XXX333' cannot be deleted. Delete all the Apps`);
+      }),
+      attributes: {
+        identifier: 'dev.expo.app',
+      },
+      id: 'XXX333',
+    } as any;
+
+    await expect(
+      syncCapabilitiesForEntitlementsAsync(bundleId, {
+        'com.apple.developer.healthkit': true,
+      })
+    ).rejects.toThrowError(
+      `https://developer.apple.com/account/resources/identifiers/bundleId/edit/XXX333`
+    );
+  });
+
  it('cannot skip complex duplicates', async () => {
    const bundleId = {
      getBundleIdCapabilitiesAsync: jest.fn(() => [
@@ -11,6 +11,7 @@ import {
 } from '@expo/apple-utils';
 import { JSONObject, JSONValue } from '@expo/json-file';
 import getenv from 'getenv';
+import { inspect } from 'util';

 import Log from '../../../log';

@@ -100,7 +101,20 @@ export async function syncCapabilitiesForEntitlementsAsync(
  );

  if (modifiedRequest.length) {
-    await bundleId.updateBundleIdCapabilityAsync(modifiedRequest);
+    Log.debug(`Patch Request:`, inspect(modifiedRequest, { depth: null, colors: true }));
+    try {
+      await bundleId.updateBundleIdCapabilityAsync(modifiedRequest);
+    } catch (error: any) {
+      if (error.message.match(/bundle '[\w\d]+' cannot be deleted. Delete all the Apps/)) {
+        Log.error(
+          'Failed to patch capabilities:',
+          inspect(modifiedRequest, { depth: null, colors: true })
+        );
+        throw new Error(
+          `Unexpected error occurred while attempting to update capabilities for app "${bundleId.attributes.identifier}".\nCapabilities can be modified manually in the Apple developer console at https://developer.apple.com/account/resources/identifiers/bundleId/edit/${bundleId.id}.\nAuto capability syncing can be disabled with the environment variable \`EXPO_NO_CAPABILITY_SYNC=1\`.\n${error.message}`
+        );
+      }
+    }
  }

  return { enabled: enabledCapabilityNames, disabled: disabledCapabilityNames };
@@ -162,11 +162,13 @@ export async function ensureAppExistsAsync(
  }
 ): Promise<App> {
  const context = getRequestContext(authCtx);
-  const spinner = ora(`Linking to App Store ${chalk.dim(bundleIdentifier)}`).start();
+  const spinner = ora(`Linking to App Store Connect ${chalk.dim(bundleIdentifier)}`).start();

  let app = await App.findAsync(context, { bundleId: bundleIdentifier });
  if (!app) {
-    spinner.text = `Creating App Store app ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`;
+    spinner.text = `Creating App Store Connect app ${chalk.bold(name)} ${chalk.dim(
+      bundleIdentifier
+    )}`;
    try {
      // Assert contract errors when the user needs to create an app.
      await assertContractMessagesAsync(context, spinner);
@@ -194,6 +196,8 @@ export async function ensureAppExistsAsync(
  } else {
    // TODO: Update app name when API gives us that possibility
  }
-  spinner.succeed(`Prepared App Store for ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`);
+  spinner.succeed(
+    `Prepared App Store Connect for ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`
+  );
  return app;
 }
@@ -1,9 +1,9 @@
 import { IOSConfig, compileModsAsync } from '@expo/config-plugins';
 import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
-import plist from '@expo/plist';
-import { getPrebuildConfig } from '@expo/prebuild-config';
-import fs from 'fs-extra';
+import { getPrebuildConfigAsync } from '@expo/prebuild-config';
+
+import { readPlistAsync } from '../../../utils/plist';

 export async function getManagedEntitlementsJsonAsync(
  projectDir: string,
@@ -15,7 +15,7 @@ export async function getManagedEntitlementsJsonAsync(
      ...process.env,
      ...env,
    };
-    const { exp } = getPrebuildConfig(projectDir, { platforms: ['ios'] });
+    const { exp } = await getPrebuildConfigAsync(projectDir, { platforms: ['ios'] });

    const expWithMods = await compileModsAsync(exp, {
      projectRoot: projectDir,
@@ -43,12 +43,11 @@ export async function resolveEntitlementsJsonAsync(
 }

 async function getEntitlementsJsonAsync(projectDir: string): Promise<JSONObject | null> {
-  try {
-    const entitlementsPath = IOSConfig.Paths.getEntitlementsPath(projectDir);
-    if (entitlementsPath) {
-      const entitlementsContents = await fs.readFile(entitlementsPath, 'utf8');
-      return plist.parse(entitlementsContents);
-    }
-  } catch {}
-  return null;
+  const entitlementsPath = IOSConfig.Paths.getEntitlementsPath(projectDir);
+  if (entitlementsPath) {
+    const plist = await readPlistAsync(entitlementsPath);
+    return plist ? (plist as unknown as JSONObject) : null;
+  } else {
+    return null;
+  }
 }
@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { AndroidBuildProfile } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import assert from 'assert';

 import Log, { learnMore } from '../../log';
@@ -10,7 +10,7 @@ import {
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
-import { ensureActorHasUsername } from '../../user/actions';
+import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
 import { AssignFcm } from '../android/actions/AssignFcm';
 import { AssignGoogleServiceAccountKey } from '../android/actions/AssignGoogleServiceAccountKey';
 import {
@@ -51,12 +51,18 @@ import {
 import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';

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

-  async runAsync(
-    ctx: CredentialsContext,
-    currentActions: ActionInfo[] = highLevelActions
-  ): Promise<void> {
+  async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
+    const hasProjectContext = !!CredentialsContext.getExpoConfigInProject(this.projectDir);
+    const buildProfile = hasProjectContext
+      ? await new SelectBuildProfileFromEasJson(this.projectDir, Platform.ANDROID).runAsync()
+      : null;
+    const ctx = new CredentialsContext({
+      projectDir: process.cwd(),
+      user: await ensureLoggedInAsync(),
+      env: buildProfile?.env,
+    });
    const accountName = ctx.hasProjectContext
      ? getProjectAccountName(ctx.exp, ctx.user)
      : ensureActorHasUsername(ctx.user);
@@ -64,7 +70,12 @@ export class ManageAndroid {
    if (!account) {
      throw new Error(`You do not have access to account: ${accountName}`);
    }
-    const { gradleContext } = await this.createProjectContextAsync(ctx);
+
+    let gradleContext;
+    if (ctx.hasProjectContext) {
+      assert(buildProfile, 'buildProfile must be defined in a project context');
+      gradleContext = await this.createProjectContextAsync(ctx, buildProfile);
+    }

    while (true) {
      try {
@@ -140,30 +151,18 @@ export class ManageAndroid {
    }
  }

-  private async createProjectContextAsync(ctx: CredentialsContext): Promise<{
-    gradleContext?: GradleBuildContext;
-    buildProfile?: AndroidBuildProfile;
-  }> {
-    if (!ctx.hasProjectContext) {
-      return {};
-    }
-
+  private async createProjectContextAsync(
+    ctx: CredentialsContext,
+    buildProfile: BuildProfile<Platform.ANDROID>
+  ): Promise<GradleBuildContext | undefined> {
+    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
    const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
    if (!maybeProjectId) {
      throw new Error(
        'Your project must be registered with EAS in order to use the credentials manager.'
      );
    }
-
-    const buildProfile = await new SelectBuildProfileFromEasJson(
-      ctx.projectDir,
-      Platform.ANDROID
-    ).runAsync(ctx);
-    const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
-    return {
-      gradleContext,
-      buildProfile,
-    };
+    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
  }

  private async runProjectSpecificActionAsync(
@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { IosBuildProfile } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import assert from 'assert';
 import nullthrows from 'nullthrows';

@@ -17,7 +17,7 @@ import {
 } from '../../project/projectUtils';
 import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
 import { Account, findAccountByName } from '../../user/Account';
-import { ensureActorHasUsername } from '../../user/actions';
+import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
 import { CredentialsContext } from '../context';
 import {
  AppStoreApiKeyPurpose,
@@ -59,12 +59,18 @@ import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
 import { SelectIosDistributionTypeGraphqlFromBuildProfile } from './SelectIosDistributionTypeGraphqlFromBuildProfile';

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

-  async runAsync(
-    ctx: CredentialsContext,
-    currentActions: ActionInfo[] = highLevelActions
-  ): Promise<void> {
+  async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
+    const hasProjectContext = !!CredentialsContext.getExpoConfigInProject(this.projectDir);
+    const buildProfile = hasProjectContext
+      ? await new SelectBuildProfileFromEasJson(this.projectDir, Platform.IOS).runAsync()
+      : null;
+    const ctx = new CredentialsContext({
+      projectDir: process.cwd(),
+      user: await ensureLoggedInAsync(),
+      env: buildProfile?.env,
+    });
    const buildCredentialsActions = getBuildCredentialsActions(ctx);
    const pushKeyActions = getPushKeyActions(ctx);
    const ascApiKeyActions = getAscApiKeyActions(ctx);
@@ -78,7 +84,16 @@ export class ManageIos {
    if (!account) {
      throw new Error(`You do not have access to account: ${accountName}`);
    }
-    const { app, targets, buildProfile } = await this.createProjectContextAsync(ctx, account);
+
+    let app = null;
+    let targets = null;
+    if (ctx.hasProjectContext) {
+      assert(buildProfile, 'buildProfile must be defined in project context');
+      const projectContext = await this.createProjectContextAsync(ctx, account, buildProfile);
+      app = projectContext.app;
+      targets = projectContext.targets;
+    }
+
    while (true) {
      try {
        if (ctx.hasProjectContext) {
@@ -154,16 +169,13 @@ export class ManageIos {

  private async createProjectContextAsync(
    ctx: CredentialsContext,
-    account: Account
-  ): Promise<{ app: App | null; targets: Target[] | null; buildProfile: IosBuildProfile | null }> {
-    if (!ctx.hasProjectContext) {
-      return {
-        app: null,
-        targets: null,
-        buildProfile: null,
-      };
-    }
-
+    account: Account,
+    buildProfile: BuildProfile<Platform.IOS>
+  ): Promise<{
+    app: App;
+    targets: Target[];
+  }> {
+    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
    const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
    if (!maybeProjectId) {
      throw new Error(
@@ -172,10 +184,6 @@ export class ManageIos {
    }

    const app = { account, projectName: ctx.exp.slug };
-    const buildProfile = await new SelectBuildProfileFromEasJson(
-      ctx.projectDir,
-      Platform.IOS
-    ).runAsync(ctx);
    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
      {
        projectDir: ctx.projectDir,
@@ -191,7 +199,6 @@ export class ManageIos {
    return {
      app,
      targets,
-      buildProfile,
    };
  }

@@ -219,7 +226,7 @@ export class ManageIos {
    ctx: CredentialsContext,
    app: App,
    targets: Target[],
-    buildProfile: IosBuildProfile,
+    buildProfile: BuildProfile<Platform.IOS>,
    action: IosActionType
  ): Promise<void> {
    if (action === IosActionType.SetUpBuildCredentials) {
@@ -3,7 +3,6 @@ import { BuildProfile, EasJsonReader } from '@expo/eas-json';

 import Log from '../../log';
 import { promptAsync } from '../../prompts';
-import { CredentialsContext } from '../context';

 export class SelectBuildProfileFromEasJson<T extends Platform> {
  private easJsonReader: EasJsonReader;
@@ -12,14 +11,14 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
    this.easJsonReader = new EasJsonReader(projectDir);
  }

-  async runAsync(ctx: CredentialsContext): Promise<BuildProfile<T>> {
-    const profileName = await this.getProfileNameFromEasConfigAsync(ctx);
-    const easConfig = await this.easJsonReader.readBuildProfileAsync<T>(this.platform, profileName);
+  async runAsync(): Promise<BuildProfile<T>> {
+    const profileName = await this.getProfileNameFromEasConfigAsync();
+    const easConfig = await this.easJsonReader.getBuildProfileAsync<T>(this.platform, profileName);
    Log.succeed(`Using build profile: ${profileName}`);
    return easConfig;
  }

-  async getProfileNameFromEasConfigAsync(ctx: CredentialsContext): Promise<string> {
+  async getProfileNameFromEasConfigAsync(): Promise<string> {
    const buildProfileNames = await this.easJsonReader.getBuildProfileNamesAsync();
    if (buildProfileNames.length === 0) {
      throw new Error(
@@ -28,11 +27,6 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
    } else if (buildProfileNames.length === 1) {
      return buildProfileNames[0];
    }
-    if (ctx.nonInteractive) {
-      throw new Error(
-        'You have multiple build profiles. Please run this command in interactive mode.'
-      );
-    }
    const { profileName } = await promptAsync({
      type: 'select',
      name: 'profileName',
@@ -1,11 +1,12 @@
-import { IosBuildProfile } from '@expo/eas-json';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';

 import { IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
 import { promptAsync } from '../../prompts';
 import { CredentialsContext } from '../context';

 export class SelectIosDistributionTypeGraphqlFromBuildProfile {
-  constructor(private buildProfile: IosBuildProfile) {}
+  constructor(private buildProfile: BuildProfile<Platform.IOS>) {}

  async runAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql> {
    const { distribution, simulator } = this.buildProfile;
@@ -1,10 +1,9 @@
 import { promptAsync } from '../../prompts';
-import { CredentialsContext } from '../context';
 import { ManageAndroid } from './ManageAndroid';
 import { ManageIos } from './ManageIos';

 export class SelectPlatform {
-  async runAsync(ctx: CredentialsContext): Promise<void> {
+  async runAsync(): Promise<void> {
    const { platform } = await promptAsync({
      type: 'select',
      name: 'platform',
@@ -16,8 +15,8 @@ export class SelectPlatform {
    });

    if (platform === 'ios') {
-      return await new ManageIos(new SelectPlatform()).runAsync(ctx);
+      return await new ManageIos(new SelectPlatform(), process.cwd()).runAsync();
    }
-    return await new ManageAndroid(new SelectPlatform()).runAsync(ctx);
+    return await new ManageAndroid(new SelectPlatform(), process.cwd()).runAsync();
  }
 }
@@ -1,4 +1,5 @@
-import { IosBuildProfile } from '@expo/eas-json';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';

 import { IosDistributionType as IosDistributionTypeGraphql } from '../../../graphql/generated';
 import { createCtxMock } from '../../__tests__/fixtures-context';
@@ -8,7 +9,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
  it('errors with a simulator distribution', async () => {
    const buildProfile = {
      simulator: true,
-    } as IosBuildProfile;
+    } as BuildProfile<Platform.IOS>;

    const ctx = createCtxMock({
      nonInteractive: false,
@@ -22,7 +23,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
  it('returns APP_STORE type with a store distribution', async () => {
    const buildProfile = {
      distribution: 'store',
-    } as IosBuildProfile;
+    } as BuildProfile<Platform.IOS>;

    const ctx = createCtxMock({
      nonInteractive: false,
@@ -37,7 +38,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
    const buildProfile = {
      distribution: 'internal',
      enterpriseProvisioning: 'universal',
-    } as IosBuildProfile;
+    } as BuildProfile<Platform.IOS>;

    const ctx = createCtxMock({
      nonInteractive: false,
@@ -52,7 +53,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
    const buildProfile = {
      distribution: 'internal',
      enterpriseProvisioning: 'adhoc',
-    } as IosBuildProfile;
+    } as BuildProfile<Platform.IOS>;

    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1411,7 +1411,8 @@ export type WebhookFilter = {
 };

 export enum WebhookType {
-  Build = 'BUILD'
+  Build = 'BUILD',
+  Submit = 'SUBMIT'
 }

 export type Webhook = {
@@ -3,7 +3,7 @@ import mockdate from 'mockdate';
 import path from 'path';
 import { v4 as uuidv4 } from 'uuid';

-import { defaultPublishPlatforms } from '../../commands/branch/publish';
+import { defaultPublishPlatforms } from '../../commands/update';
 import { AssetMetadataStatus } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { PublishQuery } from '../../graphql/queries/PublishQuery';
@@ -54,7 +54,7 @@ describe(getApplicationIdAsync, () => {
        '/app'
      );
      await expect(getApplicationIdAsync('/app', {} as any, undefined)).rejects.toThrowError(
-        /Could not read application id/
+        /Failed to find 'build.gradle' /
      );
    });

@@ -69,7 +69,7 @@ describe(getApplicationIdAsync, () => {

      await expect(
        getApplicationIdAsync('/app', {} as any, { moduleName: 'app' })
-      ).rejects.toThrowError(/Could not read application id/);
+      ).rejects.toThrowError(/Could not read applicationId/);
    });
  });

@@ -112,7 +112,7 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
      );
      await expect(
        ensureApplicationIdIsDefinedForManagedProjectAsync('/app', {} as any)
-      ).rejects.toThrowError(/we can't update this file programatically/);
+      ).rejects.toThrowError(/we can't update this file programmatically/);
    });
    it('prompts for the Android package if using app.json', async () => {
      vol.fromJSON(
@@ -15,7 +15,7 @@ import { resolveWorkflowAsync } from '../workflow';
 import { GradleBuildContext } from './gradle';
 import * as gradleUtils from './gradleUtils';

-const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
+export const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;

 export async function ensureApplicationIdIsDefinedForManagedProjectAsync(
  projectDir: string,
@@ -33,6 +33,51 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync(
  }
 }

+export class AmbiguousApplicationIdError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Could not resolve applicationId.');
+  }
+}
+
+export async function getApplicationIdFromBareAsync(
+  projectDir: string,
+  gradleContext?: GradleBuildContext
+): Promise<string> {
+  const errorMessage = 'Could not read applicationId from Android project.';
+
+  if (gradleContext) {
+    const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
+    const applicationIdSuffix = gradleUtils.resolveConfigValue(
+      buildGradle,
+      'applicationIdSuffix',
+      gradleContext.flavor
+    );
+    if (applicationIdSuffix) {
+      throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+    }
+    const applicationId = gradleUtils.resolveConfigValue(
+      buildGradle,
+      'applicationId',
+      gradleContext.flavor
+    );
+    return nullthrows(applicationId, errorMessage);
+  } else {
+    // should return value only if productFlavors are not used
+    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+    const buildGradle = await fs.readFile(buildGradlePath, 'utf8');
+    const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
+    if (buildGradle.match(/applicationIdSuffix/)) {
+      throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+    }
+    if (buildGradle.match(/productFlavors/)) {
+      throw new AmbiguousApplicationIdError(
+        'Failed to autodetect applicationId in multi-flavor project.'
+      );
+    }
+    return nullthrows(matchResult?.[1], errorMessage);
+  }
+}
+
 export async function getApplicationIdAsync(
  projectDir: string,
  exp: ExpoConfig,
@@ -42,33 +87,7 @@ export async function getApplicationIdAsync(
  if (workflow === Workflow.GENERIC) {
    warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);

-    const errorMessage = 'Could not read application id from Android project.';
-    if (gradleContext) {
-      const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
-      const applicationId = gradleUtils.resolveConfigValue(
-        buildGradle,
-        'applicationId',
-        gradleContext.flavor
-      );
-      return nullthrows(applicationId, errorMessage);
-    } else {
-      // fallback to best effort approach, this logic can be dropped when we start supporting
-      // modules different than 'app' and 'flavorDimensions'
-      let buildGradlePath = null;
-      try {
-        buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-      } catch {}
-      if (!buildGradlePath || !(await fs.pathExists(buildGradlePath))) {
-        throw new Error(errorMessage);
-      }
-      const buildGradle = await fs.readFile(buildGradlePath, 'utf8');
-      const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
-      const applicationId = nullthrows(matchResult?.[1], errorMessage);
-
-      Log.warn(`Unable to detect applicationId`);
-      Log.warn(`Falling back to best effort approach, using applicationId ${applicationId}`);
-      return applicationId;
-    }
+    return getApplicationIdFromBareAsync(projectDir, gradleContext);
  } else {
    const applicationId = AndroidConfig.Package.getPackage(exp);
    if (!applicationId || !isApplicationIdValid(applicationId)) {
@@ -91,7 +110,7 @@ async function configureApplicationIdAsync(projectDir: string, exp: ExpoConfig):
  // we can't automatically update app.config.js
  if (paths.dynamicConfigPath) {
    throw new Error(
-      `"android.package" is not defined in your app.config.js and we can't update this file programatically. Add the value on your own and run this command again.`
+      `"android.package" is not defined in your app.config.js and we can't update this file programmatically. Add the value on your own and run this command again.`
    );
  }

@@ -125,7 +144,7 @@ async function configureApplicationIdAsync(projectDir: string, exp: ExpoConfig):
  return packageName;
 }

-function isApplicationIdValid(applicationId: string): boolean {
+export function isApplicationIdValid(applicationId: string): boolean {
  return /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(applicationId);
 }

@@ -27,7 +27,7 @@ export async function resolveGradleBuildContextAsync(
          parsedGradleCommand.moduleName !== gradleUtils.DEFAULT_MODULE_NAME
        ) {
          Log.warn(
-            `Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior`
+            `Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior.`
          );
        }
        return {
@@ -38,7 +38,8 @@ export async function resolveGradleBuildContextAsync(
        return { moduleName: gradleUtils.DEFAULT_MODULE_NAME };
      }
    } catch (err: any) {
-      Log.warn(`Unable to read project config from app/build.gradle: ${err.message}`);
+      Log.warn(`Unable to read gradle project config: ${err.message}.`);
+      Log.warn('Values from app/build.gradle might be resolved incorrectly.');
      return undefined;
    }
  } else {
@@ -12,6 +12,7 @@ interface GradleCommand {

 interface Config {
  applicationId?: string;
+  applicationIdSuffix?: string; // unsupported value
  versionCode?: string;
  versionName?: string;
 }
@@ -95,7 +95,7 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
      );
      await expect(
        ensureBundleIdentifierIsDefinedForManagedProjectAsync('/app', {} as any)
-      ).rejects.toThrowError(/we can't update this file programatically/);
+      ).rejects.toThrowError(/we can't update this file programmatically/);
    });
    it('prompts for the bundle identifier if using app.json', async () => {
      vol.fromJSON(
@@ -12,7 +12,7 @@ import { ensureLoggedInAsync } from '../../user/actions';
 import { getProjectConfigDescription, getUsername } from '../projectUtils';
 import { resolveWorkflowAsync } from '../workflow';

-const INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
+export const INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;

 export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(
  projectDir: string,
@@ -28,22 +28,39 @@ export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(
  }
 }

+export class AmbiguousBundleIdentifierError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Could not resolve bundle identifier.');
+  }
+}
+
 export async function getBundleIdentifierAsync(
  projectDir: string,
  exp: ExpoConfig,
-  { targetName, buildConfiguration }: { targetName?: string; buildConfiguration?: string } = {}
+  xcodeContext?: { targetName?: string; buildConfiguration?: string }
 ): Promise<string> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
    warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);

-    const bundleIdentifier = IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, {
-      targetName,
-      buildConfiguration,
-    });
+    const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+    const isMultiScheme = IOSConfig.BuildScheme.getSchemesFromXcodeproj(projectDir).length > 1;
+    const isMultiTarget =
+      IOSConfig.Target.getNativeTargets(xcodeProject).filter(([, target]) =>
+        IOSConfig.Target.isTargetOfType(target, IOSConfig.Target.TargetType.APPLICATION)
+      ).length > 1;
+    if (!xcodeContext && isMultiScheme && isMultiTarget) {
+      throw new AmbiguousBundleIdentifierError(
+        "Multiple schemes and targets found in Xcode project, bundle identifier couldn't be resolved."
+      );
+    }
+    const bundleIdentifier = IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(
+      projectDir,
+      xcodeContext ?? {}
+    );
    const buildConfigurationDesc =
-      targetName && buildConfiguration
-        ? ` (target = ${targetName}, build configuration = ${buildConfiguration})`
+      xcodeContext?.targetName && xcodeContext?.buildConfiguration
+        ? ` (target = ${xcodeContext.targetName}, build configuration = ${xcodeContext.buildConfiguration})`
        : '';
    assert(
      bundleIdentifier,
@@ -58,13 +75,17 @@ export async function getBundleIdentifierAsync(
  } else {
    // TODO: the following asserts are only temporary until we support app extensions in managed projects
    assert(
-      !targetName || targetName === IOSConfig.XcodeUtils.sanitizedName(exp.name),
-      'targetName cannot be set to an arbitrary value for managed projects'
+      !xcodeContext?.targetName ||
+        xcodeContext?.targetName === IOSConfig.XcodeUtils.sanitizedName(exp.name),
+      'targetName cannot be set to an arbitrary value for managed projects.'
    );
-    assert(!buildConfiguration, 'buildConfiguration cannot be passed for managed projects');
-    const bundleIdentifer = IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
-    if (!bundleIdentifer || !isBundleIdentifierValid(bundleIdentifer)) {
-      if (bundleIdentifer) {
+    assert(
+      !xcodeContext?.buildConfiguration,
+      'buildConfiguration cannot be passed for managed projects.'
+    );
+    const bundleIdentifier = IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
+    if (!bundleIdentifier || !isBundleIdentifierValid(bundleIdentifier)) {
+      if (bundleIdentifier) {
        Log.warn(INVALID_BUNDLE_IDENTIFIER_MESSAGE);
      }
      throw new Error(
@@ -73,7 +94,7 @@ export async function getBundleIdentifierAsync(
        )} and run this command again.`
      );
    } else {
-      return bundleIdentifer;
+      return bundleIdentifier;
    }
  }
 }
@@ -86,7 +107,7 @@ async function configureBundleIdentifierAsync(
  // we can't automatically update app.config.js
  if (paths.dynamicConfigPath) {
    throw new Error(
-      `"ios.bundleIdentifier" is not defined in your app.config.js and we can't update this file programatically. Add the value on your own and run this command again.`
+      `"ios.bundleIdentifier" is not defined in your app.config.js and we can't update this file programmatically. Add the value on your own and run this command again.`
    );
  }

@@ -120,7 +141,7 @@ async function configureBundleIdentifierAsync(
  return bundleIdentifier;
 }

-function isBundleIdentifierValid(bundleIdentifier: string): boolean {
+export function isBundleIdentifierValid(bundleIdentifier: string): boolean {
  return /^[a-zA-Z0-9-.]+$/.test(bundleIdentifier);
 }

@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';

 import Log from '../../log';
@@ -20,7 +20,7 @@ export async function resolveXcodeBuildContextAsync(
    projectDir,
    nonInteractive,
  }: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean },
-  buildProfile: IosBuildProfile
+  buildProfile: BuildProfile<Platform.IOS>
 ): Promise<XcodeBuildContext> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
@@ -24,17 +24,57 @@ export async function resolveTargetsAsync(
    buildConfiguration,
  });

-  if (applicationTarget.dependencies && applicationTarget.dependencies.length > 0) {
-    for (const dependency of applicationTarget.dependencies) {
+  const dependencies = await resolveDependenciesAsync({
+    exp,
+    projectDir,
+    buildConfiguration,
+    target: applicationTarget,
+    bundleIdentifier,
+  });
+  if (dependencies.length > 0) {
+    result.push(...dependencies);
+  }
+
+  return result;
+}
+
+async function resolveDependenciesAsync({
+  exp,
+  projectDir,
+  buildConfiguration,
+  target,
+  bundleIdentifier,
+}: {
+  exp: ExpoConfig;
+  projectDir: string;
+  buildConfiguration?: string;
+  target: IOSConfig.Target.Target;
+  bundleIdentifier: string;
+}): Promise<Target[]> {
+  const result: Target[] = [];
+
+  if (target.dependencies && target.dependencies.length > 0) {
+    for (const dependency of target.dependencies) {
+      const dependencyBundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, {
+        targetName: dependency.name,
+        buildConfiguration,
+      });
      result.push({
        targetName: dependency.name,
        buildConfiguration,
-        bundleIdentifier: await getBundleIdentifierAsync(projectDir, exp, {
-          targetName: dependency.name,
-          buildConfiguration,
-        }),
+        bundleIdentifier: dependencyBundleIdentifier,
        parentBundleIdentifier: bundleIdentifier,
      });
+      const dependencyDependencies = await resolveDependenciesAsync({
+        exp,
+        projectDir,
+        buildConfiguration,
+        target: dependency,
+        bundleIdentifier: dependencyBundleIdentifier,
+      });
+      if (dependencyDependencies.length > 0) {
+        result.push(...dependencyDependencies);
+      }
    }
  }

@@ -1,32 +0,0 @@
-import chalk from 'chalk';
-
-import { apiClient } from '../api';
-import Log from '../log';
-
-/**
- * Checks if the project is allowed for using EAS services.
- * THIS IS A TEMPORARY STEP NEEDED FOR OPEN PREVIEW
- * @returns boolean
- */
-export async function isEasEnabledForProjectAsync(projectId: string): Promise<boolean> {
-  try {
-    const {
-      data: { enabled },
-    } = await apiClient.get(`projects/${projectId}/eas-enabled`).json();
-    return enabled;
-  } catch (error: any) {
-    if (error.response?.statusCode === 404) {
-      return true;
-    } else {
-      throw error;
-    }
-  }
-}
-
-export const EAS_UNAVAILABLE_MESSAGE = `Your account doesn't have access to Expo Application Services (EAS) features. Enroll in EAS to give it a try: ${chalk.underline(
-  'https://expo.dev/eas'
-)}`;
-
-export function warnEasUnavailable(): void {
-  Log.warn(EAS_UNAVAILABLE_MESSAGE);
-}
@@ -1,37 +0,0 @@
-import { promptAsync } from '../../prompts';
-
-export enum AndroidPackageSourceType {
-  userDefined,
-  prompt,
-}
-
-interface AndroidPackageSourceBase {
-  sourceType: AndroidPackageSourceType;
-}
-
-interface AndroidPackageUserDefinedSource extends AndroidPackageSourceBase {
-  sourceType: AndroidPackageSourceType.userDefined;
-  androidPackage: string;
-}
-
-interface AndroidPackagePromptSource extends AndroidPackageSourceBase {
-  sourceType: AndroidPackageSourceType.prompt;
-}
-
-export type AndroidPackageSource = AndroidPackageUserDefinedSource | AndroidPackagePromptSource;
-
-export async function getAndroidPackageAsync(source: AndroidPackageSource): Promise<string> {
-  if (source.sourceType === AndroidPackageSourceType.userDefined) {
-    return source.androidPackage;
-  } else if (source.sourceType === AndroidPackageSourceType.prompt) {
-    const { androidPackage } = await promptAsync({
-      name: 'androidPackage',
-      message: 'Android package name:',
-      type: 'text',
-      validate: (val: string) => val !== '' || 'Package name cannot be empty!',
-    });
-    return androidPackage;
-  } else {
-    throw new Error('This should never happen');
-  }
-}
@@ -8,13 +8,14 @@ import {
  SubmissionFragment,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getApplicationIdAsync } from '../../project/android/applicationId';
-import * as gradleUtils from '../../project/android/gradleUtils';
+import {
+  AmbiguousApplicationIdError,
+  getApplicationIdAsync,
+} from '../../project/android/applicationId';
 import capitalize from '../../utils/expodash/capitalize';
 import { ArchiveSource } from '../ArchiveSource';
 import { resolveArchiveSource } from '../commons';
 import { SubmissionContext } from '../context';
-import { AndroidPackageSource, AndroidPackageSourceType } from './AndroidPackageSource';
 import AndroidSubmitter, { AndroidSubmissionOptions } from './AndroidSubmitter';
 import { ServiceAccountSource, ServiceAccountSourceType } from './ServiceAccountSource';

@@ -29,19 +30,12 @@ export default class AndroidSubmitCommand {
  }

  private async getAndroidSubmissionOptionsAsync(): Promise<AndroidSubmissionOptions> {
-    const androidPackageSource = await this.resolveAndroidPackageSourceAsync();
    const track = this.resolveTrack();
    const releaseStatus = this.resolveReleaseStatus();
    const archiveSource = this.resolveArchiveSource();
-    const serviceAccountSource = this.resolveServiceAccountSource();
+    const serviceAccountSource = await this.resolveServiceAccountSourceAsync();

-    const errored = [
-      androidPackageSource,
-      track,
-      releaseStatus,
-      archiveSource,
-      serviceAccountSource,
-    ].filter(r => !r.ok);
+    const errored = [track, releaseStatus, archiveSource, serviceAccountSource].filter(r => !r.ok);
    if (errored.length > 0) {
      const message = errored.map(err => err.reason?.message).join('\n');
      Log.error(message);
@@ -50,7 +44,6 @@ export default class AndroidSubmitCommand {

    return {
      projectId: this.ctx.projectId,
-      androidPackageSource: androidPackageSource.enforceValue(),
      track: track.enforceValue(),
      releaseStatus: releaseStatus.enforceValue(),
      archiveSource: archiveSource.enforceValue(),
@@ -59,29 +52,19 @@ export default class AndroidSubmitCommand {
    };
  }

-  private async maybeGetAndroidPackageFromCurrentProjectAsync(): Promise<string | undefined> {
+  private async maybeGetAndroidPackageFromCurrentProjectAsync(): Promise<Result<string | null>> {
    try {
-      return await getApplicationIdAsync(this.ctx.projectDir, this.ctx.exp, {
-        moduleName: gradleUtils.DEFAULT_MODULE_NAME,
-      });
-    } catch {
-      return undefined;
-    }
-  }
-
-  private async resolveAndroidPackageSourceAsync(): Promise<Result<AndroidPackageSource>> {
-    const androidPackage = await this.maybeGetAndroidPackageFromCurrentProjectAsync();
-    if (androidPackage) {
-      return result({
-        sourceType: AndroidPackageSourceType.userDefined,
-        androidPackage,
-      });
-    } else if (this.ctx.nonInteractive) {
-      return result(new Error("Couldn't resolve the Android package."));
-    } else {
-      return result({
-        sourceType: AndroidPackageSourceType.prompt,
-      });
+      return result(await getApplicationIdAsync(this.ctx.projectDir, this.ctx.exp));
+    } catch (error: any) {
+      if (error instanceof AmbiguousApplicationIdError) {
+        Log.warn(
+          '"applicationId" is ambiguous, specify it via "applicationId" field in the submit profile in the eas.json.'
+        );
+        return result(null);
+      }
+      return result(
+        new Error(`Failed to resolve applicationId in Android project: ${error.message}.`)
+      );
    }
  }

@@ -137,7 +120,7 @@ export default class AndroidSubmitCommand {
    }
  }

-  private resolveServiceAccountSource(): Result<ServiceAccountSource> {
+  private async resolveServiceAccountSourceAsync(): Promise<Result<ServiceAccountSource>> {
    const { serviceAccountKeyPath } = this.ctx.profile;
    if (serviceAccountKeyPath) {
      return result({
@@ -145,8 +128,22 @@ export default class AndroidSubmitCommand {
        path: serviceAccountKeyPath,
      });
    }
+    let androidApplicationIdentifier: string | undefined =
+      this.ctx.applicationIdentifierOverride ?? this.ctx.profile.applicationId;
+    if (!androidApplicationIdentifier) {
+      const androidApplicationIdentifierResult =
+        await this.maybeGetAndroidPackageFromCurrentProjectAsync();
+      if (!androidApplicationIdentifierResult.ok) {
+        return result(androidApplicationIdentifierResult.reason);
+      }
+      const androidApplicationIdentifierValue = androidApplicationIdentifierResult.enforceValue();
+      if (androidApplicationIdentifierValue) {
+        androidApplicationIdentifier = androidApplicationIdentifierValue;
+      }
+    }
    return result({
      sourceType: ServiceAccountSourceType.credentialsService,
+      androidApplicationIdentifier,
    });
  }
 }
@@ -18,19 +18,18 @@ import {
  formatArchiveSourceSummary,
  printSummary,
 } from '../utils/summary';
-import { AndroidPackageSource, getAndroidPackageAsync } from './AndroidPackageSource';
 import {
  ServiceAccountKeyResult,
  ServiceAccountSource,
  getServiceAccountKeyResultAsync,
 } from './ServiceAccountSource';
+
 export interface AndroidSubmissionOptions
  extends Pick<
    AndroidSubmissionConfigInput,
    'track' | 'releaseStatus' | 'changesNotSentForReview'
  > {
  projectId: string;
-  androidPackageSource: AndroidPackageSource;
  archiveSource: ArchiveSource;
  serviceAccountSource: ServiceAccountSource;
 }
@@ -51,12 +50,7 @@ export default class AndroidSubmitter extends BaseSubmitter<
      archive: async () => await getArchiveAsync(this.options.archiveSource),
      // eslint-disable-next-line async-protect/async-suffix
      serviceAccountKeyResult: async () => {
-        const androidPackage = await getAndroidPackageAsync(this.options.androidPackageSource);
-        return await getServiceAccountKeyResultAsync(
-          this.ctx,
-          this.options.serviceAccountSource,
-          androidPackage
-        );
+        return await getServiceAccountKeyResultAsync(this.ctx, this.options.serviceAccountSource);
      },
    };
    const sourceOptionsAnalytics = {
@@ -6,6 +6,10 @@ import nullthrows from 'nullthrows';
 import { SetUpGoogleServiceAccountKey } from '../../credentials/android/actions/SetUpGoogleServiceAccountKey';
 import { readAndValidateServiceAccountKey } from '../../credentials/android/utils/googleServiceAccountKey';
 import Log, { learnMore } from '../../log';
+import {
+  INVALID_APPLICATION_ID_MESSAGE,
+  isApplicationIdValid,
+} from '../../project/android/applicationId';
 import { promptAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import { SubmissionContext } from '../context';
@@ -32,6 +36,7 @@ interface ServiceAccountPromptSource extends ServiceAccountSourceBase {

 export interface ServiceAccountCredentialsServiceSource extends ServiceAccountSourceBase {
  sourceType: ServiceAccountSourceType.credentialsService;
+  androidApplicationIdentifier?: string;
 }

 export type ServiceAccountKeyResult = {
@@ -60,11 +65,10 @@ export type ServiceAccountSource =

 export async function getServiceAccountKeyResultAsync(
  ctx: SubmissionContext<Platform.ANDROID>,
-  source: ServiceAccountSource,
-  androidApplicationIdentifier: string
+  source: ServiceAccountSource
 ): Promise<ServiceAccountKeyResult> {
  if (source.sourceType === ServiceAccountSourceType.credentialsService) {
-    return await getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier);
+    return await getServiceAccountFromCredentialsServiceAsync(ctx, source);
  } else {
    return await getServiceAccountLocallyAsync(source);
  }
@@ -97,9 +101,19 @@ export async function getServiceAccountKeyPathAsync(source: ServiceAccountSource
  }
 }

+async function promptForApplicationIdAsync(): Promise<string> {
+  const { androidPackage } = await promptAsync({
+    name: 'androidPackage',
+    message: 'Android package name:',
+    type: 'text',
+    validate: value => (isApplicationIdValid(value) ? true : INVALID_APPLICATION_ID_MESSAGE),
+  });
+  return androidPackage;
+}
+
 export async function getServiceAccountFromCredentialsServiceAsync(
  ctx: SubmissionContext<Platform.ANDROID>,
-  androidApplicationIdentifier: string
+  source: ServiceAccountCredentialsServiceSource
 ): Promise<ServiceAccountKeyResult> {
  const appLookupParams = {
    account: nullthrows(
@@ -107,8 +121,12 @@ export async function getServiceAccountFromCredentialsServiceAsync(
      `You do not have access to account: ${ctx.accountName}`
    ),
    projectName: ctx.projectName,
-    androidApplicationIdentifier,
+    androidApplicationIdentifier:
+      source.androidApplicationIdentifier ?? (await promptForApplicationIdAsync()),
  };
+  Log.log(
+    `Looking up credentials configuration for ${appLookupParams.androidApplicationIdentifier}...`
+  );
  const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
  const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(
    ctx.credentialsCtx
@@ -152,7 +152,7 @@ describe(getServiceAccountKeyResultAsync, () => {
      sourceType: ServiceAccountSourceType.path,
      path: '/project_dir/subdir/service-account.json',
    };
-    const serviceAccountResult = await getServiceAccountKeyResultAsync(ctx, source, 'test.sdf');
+    const serviceAccountResult = await getServiceAccountKeyResultAsync(ctx, source);
    expect(serviceAccountResult).toMatchObject({
      result: {
        googleServiceAccountKeyJson: mockDetectableServiceAccountJson,
@@ -186,7 +186,7 @@ describe(getServiceAccountKeyResultAsync, () => {
    const source: ServiceAccountSource = {
      sourceType: ServiceAccountSourceType.prompt,
    };
-    const serviceAccountResult = await getServiceAccountKeyResultAsync(ctx, source, 'test.sdf');
+    const serviceAccountResult = await getServiceAccountKeyResultAsync(ctx, source);
    expect(serviceAccountResult).toMatchObject({
      result: {
        googleServiceAccountKeyJson: mockDetectableServiceAccountJson,
@@ -214,13 +214,10 @@ describe(getServiceAccountKeyResultAsync, () => {
      },
      nonInteractive: true,
    });
-    const serviceAccountResult = await getServiceAccountKeyResultAsync(
-      ctx,
-      {
-        sourceType: ServiceAccountSourceType.credentialsService,
-      },
-      'test.application.identiifer'
-    );
+    const serviceAccountResult = await getServiceAccountKeyResultAsync(ctx, {
+      sourceType: ServiceAccountSourceType.credentialsService,
+      androidApplicationIdentifier: 'test.application.identiifer',
+    });
    expect(serviceAccountResult).toMatchObject({
      result: { googleServiceAccountKeyId: 'test-id' },
      summary: { source: 'EAS servers', email: '[email protected]' },
@@ -25,6 +25,7 @@ export interface SubmissionContext<T extends Platform> {
  projectId: string;
  projectName: string;
  user: Actor;
+  applicationIdentifierOverride?: string;
 }

 export interface SubmitArchiveFlags {
@@ -43,8 +44,9 @@ export async function createSubmissionContextAsync<T extends Platform>(params: {
  profile: SubmitProfile<T>;
  projectDir: string;
  projectId: string;
+  applicationIdentifier?: string;
 }): Promise<SubmissionContext<T>> {
-  const { projectDir, nonInteractive } = params;
+  const { applicationIdentifier, projectDir, nonInteractive } = params;
  const exp = getExpoConfig(projectDir, { env: params.env });
  const { env, ...rest } = params;
  const user = await ensureLoggedInAsync();
@@ -60,7 +62,6 @@ export async function createSubmissionContextAsync<T extends Platform>(params: {
    tracking_id: uuidv4(),
    platform: params.platform,
    ...(accountId && { account_id: accountId }),
-    account_name: accountName,
    project_id: params.projectId,
  };

@@ -74,5 +75,6 @@ export async function createSubmissionContextAsync<T extends Platform>(params: {
    projectName,
    user,
    trackingCtx,
+    applicationIdentifierOverride: applicationIdentifier,
  };
 }
@@ -35,7 +35,10 @@ export async function ensureAppStoreConnectAppExistsAsync(
  const { appName, language } = ctx.profile;
  const options = {
    ...ctx.profile,
-    bundleIdentifier: await getBundleIdentifierAsync(ctx.projectDir, exp),
+    bundleIdentifier:
+      ctx.applicationIdentifierOverride ??
+      ctx.profile.bundleIdentifier ??
+      (await getBundleIdentifierAsync(ctx.projectDir, exp)),
    appName: appName ?? exp.name ?? (await promptForAppNameAsync()),
    language: sanitizeLanguage(language),
  };
@@ -3,7 +3,11 @@ import nullthrows from 'nullthrows';

 import { SetUpSubmissionCredentials } from '../../credentials/ios/actions/SetUpSubmissionCredentials';
 import Log from '../../log';
-import { getBundleIdentifierAsync } from '../../project/ios/bundleIdentifier';
+import {
+  INVALID_BUNDLE_IDENTIFIER_MESSAGE,
+  isBundleIdentifierValid,
+} from '../../project/ios/bundleIdentifier';
+import { promptAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import { SubmissionContext } from '../context';
 import {
@@ -16,15 +20,29 @@ import { AscApiKeyResult } from './AscApiKeySource';
 * The Credentials Service will either return an ASC API Key or an App Specific Password
 * When we no longer support the App Specific Password user prompt, refactor this into the AscApiKeySource
 */
-export const CREDENTIALS_SERVICE_SOURCE = 'CREDENTIALS_SERVICE_SOURCE';
-export type CredentialsServiceSource = typeof CREDENTIALS_SERVICE_SOURCE;
+export const CREDENTIALS_SERVICE_SOURCE = 'CREDENTIALS_SERVICE_SOURCE' as const;
+export interface CredentialsServiceSource {
+  sourceType: typeof CREDENTIALS_SERVICE_SOURCE;
+  bundleIdentifier?: string;
+}
+
+async function promptForBundleIdentifierAsync(): Promise<string> {
+  const { bundleIdentifier } = await promptAsync({
+    name: 'bundleIdentifier',
+    message: 'Bundle identifier:',
+    type: 'text',
+    validate: value => (isBundleIdentifierValid(value) ? true : INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+  });
+  return bundleIdentifier;
+}

 export async function getFromCredentialsServiceAsync(
-  ctx: SubmissionContext<Platform.IOS>
+  ctx: SubmissionContext<Platform.IOS>,
+  source: CredentialsServiceSource
 ): Promise<
  { appSpecificPassword: AppSpecificPasswordCredentials } | { ascApiKeyResult: AscApiKeyResult }
 > {
-  const bundleIdentifier = await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
+  const bundleIdentifier = source.bundleIdentifier ?? (await promptForBundleIdentifierAsync());
  Log.log(`Looking up credentials configuration for ${bundleIdentifier}...`);

  const appLookupParams = {
@@ -7,6 +7,10 @@ import wrapAnsi from 'wrap-ansi';
 import { MissingCredentialsError } from '../../credentials/errors';
 import { SubmissionFragment } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
+import {
+  AmbiguousBundleIdentifierError,
+  getBundleIdentifierAsync,
+} from '../../project/ios/bundleIdentifier';
 import { ArchiveSource } from '../ArchiveSource';
 import { resolveArchiveSource } from '../commons';
 import { SubmissionContext } from '../context';
@@ -29,33 +33,9 @@ export default class IosSubmitCommand {
    return await submitter.submitAsync();
  }

-  private resolveCredentialSubmissionOptions():
-    | { appSpecificPasswordSource: Result<AppSpecificPasswordSource> }
-    | { ascApiKeySource: Result<AscApiKeySource> }
-    | { credentialsServiceSource: Result<CredentialsServiceSource> } {
-    const ascApiKeySource = this.resolveAscApiKeySource();
-    const shouldSkipAscApiKeySource =
-      !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof MissingCredentialsError;
-    if (!shouldSkipAscApiKeySource) {
-      return { ascApiKeySource };
-    }
-
-    const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
-    const shouldSkipAppSpecificPasswordSource =
-      !appSpecificPasswordSource.ok &&
-      appSpecificPasswordSource.enforceError() instanceof MissingCredentialsError;
-    if (!shouldSkipAppSpecificPasswordSource) {
-      return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
-    }
-
-    return {
-      credentialsServiceSource: result(CREDENTIALS_SERVICE_SOURCE),
-    };
-  }
-
  private async resolveSubmissionOptionsAsync(): Promise<IosSubmissionOptions> {
    const archiveSource = this.resolveArchiveSource();
-    const credentialsSource = this.resolveCredentialSubmissionOptions();
+    const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();
    const maybeAppSpecificPasswordSource =
      'appSpecificPasswordSource' in credentialsSource
        ? credentialsSource.appSpecificPasswordSource
@@ -103,6 +83,64 @@ export default class IosSubmitCommand {
    };
  }

+  private async maybeGetIosBundleIdentifierAsync(): Promise<Result<string | null>> {
+    try {
+      return result(await getBundleIdentifierAsync(this.ctx.projectDir, this.ctx.exp));
+    } catch (error: any) {
+      if (error instanceof AmbiguousBundleIdentifierError) {
+        Log.warn(
+          'bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.'
+        );
+        return result(null);
+      }
+      return result(
+        new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`)
+      );
+    }
+  }
+
+  private async resolveCredentialSubmissionOptionsAsync(): Promise<
+    | { appSpecificPasswordSource: Result<AppSpecificPasswordSource> }
+    | { ascApiKeySource: Result<AscApiKeySource> }
+    | { credentialsServiceSource: Result<CredentialsServiceSource> }
+  > {
+    const ascApiKeySource = this.resolveAscApiKeySource();
+    const shouldSkipAscApiKeySource =
+      !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof MissingCredentialsError;
+    if (!shouldSkipAscApiKeySource) {
+      return { ascApiKeySource };
+    }
+
+    const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
+    const shouldSkipAppSpecificPasswordSource =
+      !appSpecificPasswordSource.ok &&
+      appSpecificPasswordSource.enforceError() instanceof MissingCredentialsError;
+    if (!shouldSkipAppSpecificPasswordSource) {
+      return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
+    }
+
+    let bundleIdentifier =
+      this.ctx.applicationIdentifierOverride ?? this.ctx.profile.bundleIdentifier;
+    if (!bundleIdentifier) {
+      const bundleIdentifierResult = await this.maybeGetIosBundleIdentifierAsync();
+      if (!bundleIdentifierResult.ok) {
+        return {
+          credentialsServiceSource: result(bundleIdentifierResult.reason),
+        };
+      }
+      const bundleIdentifierValue = bundleIdentifierResult.enforceValue();
+      if (bundleIdentifierValue) {
+        bundleIdentifier = bundleIdentifierValue;
+      }
+    }
+    return {
+      credentialsServiceSource: result({
+        sourceType: CREDENTIALS_SERVICE_SOURCE,
+        bundleIdentifier,
+      }),
+    };
+  }
+
  private resolveAppSpecificPasswordSource(): Result<AppSpecificPasswordSource> {
    const envAppSpecificPassword = getenv.string('EXPO_APPLE_APP_SPECIFIC_PASSWORD', '');

@@ -162,7 +200,11 @@ export default class IosSubmitCommand {
    if (ascAppId) {
      return result(ascAppId);
    } else if (this.ctx.nonInteractive) {
-      return result(new Error('Set ascAppId in the submit profile (eas.json).'));
+      return result(
+        new Error(
+          'Set ascAppId in the submit profile (eas.json) or re-run this command in interactive mode.'
+        )
+      );
    } else {
      Log.log(
        wrapAnsi(
@@ -68,7 +68,7 @@ export default class IosSubmitter extends BaseSubmitter<
          ? await getAscApiKeyLocallyAsync(this.ctx, this.options.ascApiKeySource)
          : null;
        const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
-          ? await getFromCredentialsServiceAsync(this.ctx)
+          ? await getFromCredentialsServiceAsync(this.ctx, this.options.credentialsServiceSource)
          : null;
        return {
          ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
@@ -9,7 +9,10 @@ import { createTestProject } from '../../../project/__tests__/project-utils';
 import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
 import { promptAsync } from '../../../prompts';
 import { createSubmissionContextAsync } from '../../context';
-import { getFromCredentialsServiceAsync } from '../CredentialsServiceSource';
+import {
+  CREDENTIALS_SERVICE_SOURCE,
+  getFromCredentialsServiceAsync,
+} from '../CredentialsServiceSource';

 jest.mock('fs');
 jest.mock('../../../prompts');
@@ -57,7 +60,10 @@ describe(getFromCredentialsServiceAsync, () => {
    asMock(getBundleIdentifierAsync).mockImplementation(() => 'com.hello.world');
    asMock(promptAsync).mockImplementationOnce(() => ({ appleId: '[email protected]' }));

-    const result = await getFromCredentialsServiceAsync(ctx);
+    const result = await getFromCredentialsServiceAsync(ctx, {
+      sourceType: CREDENTIALS_SERVICE_SOURCE,
+      bundleIdentifier: 'com.expo.test.project',
+    });
    expect(result).toEqual({
      appSpecificPassword: { password: 'super secret', appleIdUsername: '[email protected]' },
    });
@@ -80,7 +86,10 @@ describe(getFromCredentialsServiceAsync, () => {
      .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
    asMock(getBundleIdentifierAsync).mockImplementation(() => 'com.hello.world');

-    const result = await getFromCredentialsServiceAsync(ctx);
+    const result = await getFromCredentialsServiceAsync(ctx, {
+      sourceType: CREDENTIALS_SERVICE_SOURCE,
+      bundleIdentifier: 'com.expo.test.project',
+    });
    expect(result).toEqual({
      ascApiKeyResult: {
        result: {
@@ -8,7 +8,7 @@ import { sleepAsync } from '../../utils/promise';

 const APP_STORE_NAMES: Record<AppPlatform, string> = {
  [AppPlatform.Android]: 'Google Play Store',
-  [AppPlatform.Ios]: 'Apple App Store',
+  [AppPlatform.Ios]: 'Apple App Store Connect',
 };

 const CHECK_TIMEOUT_MS = 3600_000;
@@ -29,7 +29,7 @@ export function getPlatformsForGroup({
  return groupedUpdates[group]
    .map(update => update.platform)
    .sort()
-    .join(',');
+    .join(', ');
 }

 export function formatUpdate(update: FormatUpdateParameter): string {
@@ -1,90 +1,107 @@
 import { Platform } from '@expo/eas-build-job';
-import { errors } from '@expo/eas-json';
+import { EasJsonReader, errors } from '@expo/eas-json';

 import { getProfilesAsync } from '../profiles';

+jest.mock('@expo/eas-json', () => {
+  const actual = jest.requireActual('@expo/eas-json');
+
+  const EasJsonReaderMock = jest.fn();
+  EasJsonReaderMock.prototype = {
+    getBuildProfileAsync: jest.fn(),
+    getSubmitProfileAsync: jest.fn(),
+  };
+  return {
+    ...actual,
+    EasJsonReader: EasJsonReaderMock,
+  };
+});
+
+const getBuildProfileAsync = jest.spyOn(EasJsonReader.prototype, 'getBuildProfileAsync');
+
 describe(getProfilesAsync, () => {
+  afterEach(() => {
+    getBuildProfileAsync.mockReset();
+  });
+
  it('defaults to production profile', async () => {
-    const readProfileAsync = jest.fn();
    const result = await getProfilesAsync({
+      projectDir: '/fake',
      platforms: [Platform.ANDROID, Platform.IOS],
      profileName: undefined,
-      readProfileAsync,
+      type: 'build',
    });

    expect(result[0].profileName).toBe('production');
    expect(result[1].profileName).toBe('production');
-    expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
-    expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'production');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
  });

  it('defaults to release profile when production profile is non-existent', async () => {
-    const readProfileAsync = jest
-      .fn()
-      .mockRejectedValueOnce(() => {
-        throw new Error();
+    getBuildProfileAsync
+      .mockImplementationOnce(() => {
+        throw new errors.MissingProfileError();
      })
-      .mockRejectedValueOnce(() => {
-        throw new Error();
+      .mockImplementationOnce(() => {
+        throw new errors.MissingProfileError();
      });

    const result = await getProfilesAsync({
+      projectDir: '/fake',
      platforms: [Platform.ANDROID, Platform.IOS],
      profileName: undefined,
-      readProfileAsync,
+      type: 'build',
    });

    expect(result[0].profileName).toBe('release');
    expect(result[1].profileName).toBe('release');
-    expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
-    expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'production');
-    expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
-    expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'release');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'release');
  });

  it('fails when neither production or release profiles are present', async () => {
-    const readProfileAsync = jest
-      .fn()
-      .mockRejectedValueOnce(() => {
-        throw new Error();
-      })
-      .mockRejectedValueOnce(() => {
-        throw new Error();
-      });
+    getBuildProfileAsync.mockImplementation(() => {
+      throw new errors.MissingProfileError();
+    });

    await expect(
      getProfilesAsync({
+        projectDir: '/fake',
        platforms: [Platform.ANDROID],
        profileName: undefined,
-        readProfileAsync,
+        type: 'build',
      })
-    ).rejects.toThrowError(/There is no profile named "production" in eas.json/);
+    ).rejects.toThrowError(errors.MissingProfileError);
  });

  it('gets a specific profile', async () => {
-    const readProfileAsync = jest.fn();
    const result = await getProfilesAsync({
+      projectDir: '/fake',
      platforms: [Platform.ANDROID, Platform.IOS],
      profileName: 'custom-profile',
-      readProfileAsync,
+      type: 'build',
    });

    expect(result[0].profileName).toBe('custom-profile');
    expect(result[1].profileName).toBe('custom-profile');
-    expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
-    expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
+    expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
  });

  it('throws validation error if eas.json is invalid', async () => {
-    const readProfileAsync = jest.fn().mockImplementation(() => {
+    getBuildProfileAsync.mockImplementation(() => {
      throw new errors.InvalidEasJsonError('eas.json is not valid');
    });

    await expect(
      getProfilesAsync({
+        projectDir: '/fake',
        platforms: [Platform.ANDROID, Platform.IOS],
        profileName: undefined,
-        readProfileAsync,
+        type: 'build',
      })
    ).rejects.toThrowError(/eas.json is not valid/);
  });
@@ -3,12 +3,17 @@ import plist from '@expo/plist';
 import fs from 'fs-extra';
 import path from 'path';

-export async function readPlistAsync(plistPath: string): Promise<object> {
+export async function readPlistAsync(plistPath: string): Promise<object | null> {
  if (await fs.pathExists(plistPath)) {
    const expoPlistContent = await fs.readFile(plistPath, 'utf8');
-    return plist.parse(expoPlistContent);
+    try {
+      return plist.parse(expoPlistContent);
+    } catch (err: any) {
+      err.message = `Failed to parse ${plistPath}. ${err.message}`;
+      throw err;
+    }
  } else {
-    return {};
+    return null;
  }
 }

@@ -1,51 +1,68 @@
 import { Platform } from '@expo/eas-build-job';
-import { errors } from '@expo/eas-json';
+import {
+  BuildProfile,
+  EasJsonReader,
+  ProfileType,
+  SubmitProfile,
+  errors,
+  getDefaultSubmitProfile,
+} from '@expo/eas-json';

 import Log from '../log';

-export type ProfileData<T> = {
-  profile: T;
+type EasProfile<T extends ProfileType> = T extends 'build'
+  ? BuildProfile<Platform>
+  : SubmitProfile<Platform>;
+
+export type ProfileData<T extends ProfileType> = {
+  profile: EasProfile<T>;
  platform: Platform;
  profileName: string;
 };

-export async function getProfilesAsync<T>({
+export async function getProfilesAsync<T extends ProfileType>({
+  projectDir,
  platforms,
  profileName: profileNameArg,
-  // eslint-disable-next-line async-protect/async-suffix
-  readProfileAsync,
+  type,
 }: {
+  projectDir: string;
  platforms: Platform[];
-  profileName?: string | null;
-  readProfileAsync: (platform: Platform, profileName: string) => Promise<T>;
+  profileName?: string;
+  type: T;
 }): Promise<ProfileData<T>[]> {
  const results = platforms.map(async function (platform) {
-    let profile;
+    let profile: EasProfile<T>;
    let profileName = profileNameArg;

    if (!profileName) {
      try {
-        profile = await readProfileAsync(platform, 'production');
        profileName = 'production';
+        profile = await readProfileAsync({ projectDir, platform, type, profileName });
      } catch (errorOuter) {
-        if (errorOuter instanceof errors.InvalidEasJsonError) {
+        if (!(errorOuter instanceof errors.MissingProfileError)) {
          throw errorOuter;
        }
        try {
-          profile = await readProfileAsync(platform, 'release');
          profileName = 'release';
+          profile = await readProfileAsync({ projectDir, platform, type, profileName });
          Log.warn(
            'The default profile changed from "release" to "production". We detected that you still have a "release" build profile, so we are using it. Update eas.json to have a profile named "production" under the `build` key, or specify which profile you\'d like to use with the --profile flag. This fallback behavior will be removed in the next major version of EAS CLI.'
          );
        } catch (errorInner) {
-          if (errorInner instanceof errors.InvalidEasJsonError) {
+          if (!(errorInner instanceof errors.MissingProfileError)) {
            throw errorInner;
          }
-          throw new Error('There is no profile named "production" in eas.json');
+          const defaultProfile = getDefaultProfile({ platform, type });
+          if (!defaultProfile) {
+            throw errorInner;
+          }
+          profileName = '__default__';
+          profile = defaultProfile;
        }
      }
    } else {
-      profile = await readProfileAsync(platform, profileName);
+      profile = await readProfileAsync({ projectDir, platform, type, profileName });
    }

    return {
@@ -57,3 +74,36 @@ export async function getProfilesAsync<T>({

  return await Promise.all(results);
 }
+
+async function readProfileAsync<T extends ProfileType>({
+  projectDir,
+  platform,
+  type,
+  profileName,
+}: {
+  projectDir: string;
+  platform: Platform;
+  type: T;
+  profileName: string;
+}): Promise<EasProfile<T>> {
+  const easJsonReader = new EasJsonReader(projectDir);
+  if (type === 'build') {
+    return (await easJsonReader.getBuildProfileAsync(platform, profileName)) as EasProfile<T>;
+  } else {
+    return (await easJsonReader.getSubmitProfileAsync(platform, profileName)) as EasProfile<T>;
+  }
+}
+
+function getDefaultProfile<T extends ProfileType>({
+  platform,
+  type,
+}: {
+  platform: Platform;
+  type: T;
+}): EasProfile<T> | null {
+  if (type === 'build') {
+    return null;
+  } else {
+    return getDefaultSubmitProfile(platform) as EasProfile<T>;
+  }
+}
@@ -1,6 +1,9 @@
 import spawnAsync from '@expo/spawn-async';
+import { exit } from '@oclif/errors';
+import chalk from 'chalk';

 import Log, { learnMore } from '../../log';
+import { ora } from '../../ora';
 import { confirmAsync, promptAsync } from '../../prompts';
 import {
  doesGitRepoExistAsync,
@@ -14,7 +17,13 @@ import { Client } from '../vcs';
 export default class GitClient extends Client {
  public async ensureRepoExistsAsync(): Promise<void> {
    if (!(await isGitInstalledAsync())) {
-      throw new Error('git command not found, install it before proceeding');
+      Log.error(
+        `${chalk.bold('git')} command not found. Install it before proceeding or set ${chalk.bold(
+          'EAS_NO_VCS=1'
+        )} to use EAS CLI without Git (or any other version control system).`
+      );
+      Log.error(learnMore('https://expo.fyi/eas-vcs-workflow'));
+      exit(1);
    }

    if (await doesGitRepoExistAsync()) {
@@ -49,16 +58,29 @@ export default class GitClient extends Client {
  public async commitAsync({
    commitMessage,
    commitAllFiles,
+    nonInteractive = false,
  }: {
    commitMessage: string;
    commitAllFiles?: boolean;
+    nonInteractive?: boolean;
  }): Promise<void> {
-    if (commitAllFiles) {
-      await spawnAsync('git', ['add', '-A']);
-    }
+    await ensureGitConfiguredAsync({ nonInteractive });

-    await spawnAsync('git', ['add', '-u']);
-    await spawnAsync('git', ['commit', '-m', commitMessage]);
+    try {
+      if (commitAllFiles) {
+        await spawnAsync('git', ['add', '-A']);
+      }
+      await spawnAsync('git', ['add', '-u']);
+      await spawnAsync('git', ['commit', '-m', commitMessage]);
+    } catch (err: any) {
+      if (err?.stdout) {
+        Log.error(err.stdout);
+      }
+      if (err?.stderr) {
+        Log.error(err.stderr);
+      }
+      throw err;
+    }
  }

  public async isCommitRequiredAsync(): Promise<boolean> {
@@ -171,6 +193,76 @@ export default class GitClient extends Client {
  }
 }

+async function ensureGitConfiguredAsync({
+  nonInteractive,
+}: {
+  nonInteractive: boolean;
+}): Promise<void> {
+  let usernameConfigured = true;
+  let emailConfigured = true;
+  try {
+    await spawnAsync('git', ['config', '--get', 'user.name']);
+  } catch (err: any) {
+    Log.debug(err);
+    usernameConfigured = false;
+  }
+  try {
+    await spawnAsync('git', ['config', '--get', 'user.email']);
+  } catch (err: any) {
+    Log.debug(err);
+    emailConfigured = false;
+  }
+  if (usernameConfigured && emailConfigured) {
+    return;
+  }
+
+  Log.warn(
+    `You need to configure Git with your ${[
+      !usernameConfigured && 'username (user.name)',
+      !emailConfigured && 'email address (user.email)',
+    ]
+      .filter(i => i)
+      .join(' and ')}`
+  );
+  if (nonInteractive) {
+    throw new Error('Git cannot be configured automatically in non-interactive mode');
+  }
+  if (!usernameConfigured) {
+    const { username } = await promptAsync({
+      type: 'text',
+      name: 'username',
+      message: 'Username:',
+      validate: (input: string) => input !== '',
+    });
+    const spinner = ora(
+      `Running ${chalk.bold(`git config --local user.name ${username}`)}`
+    ).start();
+    try {
+      await spawnAsync('git', ['config', '--local', 'user.name', username]);
+      spinner.succeed();
+    } catch (err: any) {
+      spinner.fail();
+      throw err;
+    }
+  }
+  if (!emailConfigured) {
+    const { email } = await promptAsync({
+      type: 'text',
+      name: 'email',
+      message: 'Email address:',
+      validate: (input: string) => input !== '',
+    });
+    const spinner = ora(`Running ${chalk.bold(`git config --local user.email ${email}`)}`).start();
+    try {
+      await spawnAsync('git', ['config', '--local', 'user.email', email]);
+      spinner.succeed();
+    } catch (err: any) {
+      spinner.fail();
+      throw err;
+    }
+  }
+}
+
 /**
 * Checks if git is configured to be case sensitive
 * @returns {boolean | undefined}
@@ -34,9 +34,10 @@ export abstract class Client {
  // - Should be implemented if hasUncommittedChangesAsync is implemented
  // - If it's not implemented method `makeShallowCopyAsync` needs to be able to include uncommitted changes
  // in project copy
-  public async commitAsync(arg: {
+  public async commitAsync(_arg: {
    commitMessage: string;
    commitAllFiles?: boolean;
+    nonInteractive?: boolean;
  }): Promise<void> {
    // it should not be called unless hasUncommittedChangesAsync is implemented
    throw new Error('commitAsync is not implemented');
@@ -44,7 +45,7 @@ export abstract class Client {

  // (optional) mark file as tracked, if this method is called on file, the next call to
  // `commitAsync({ commitAllFiles: false })` should commit that file
-  public async trackFileAsync(file: string): Promise<void> {}
+  public async trackFileAsync(_file: string): Promise<void> {}

  // (optional) print diff of the changes that will be commited in the next call to
  // `commitAsync({ commitAllFiles: false })`
@@ -74,7 +75,7 @@ export abstract class Client {
  //
  // @param filePath has to be a relative normalized path pointing to a file
  // located under the root of the repository
-  public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
+  public async isFileIgnoredAsync(_filePath: string): Promise<boolean> {
    return false;
  }
 }
@@ -7,19 +7,36 @@ import { promptAsync } from '../prompts';

 export async function prepareInputParamsAsync(
  {
-    event,
+    event: maybeEvent,
    url: maybeUrl,
    secret: maybeSecret,
  }: {
-    event: WebhookType;
+    event?: WebhookType;
    url?: string;
    secret?: string;
  },
  existingWebhook?: WebhookFragment
 ): Promise<WebhookInput> {
+  let event: WebhookType | undefined = maybeEvent;
  let url: string | undefined = maybeUrl;
  let secret: string | undefined = maybeSecret;

+  if (!event) {
+    const choices = [
+      { title: 'Build', value: WebhookType.Build },
+      { title: 'Submit', value: WebhookType.Submit },
+    ];
+    ({ event } = await promptAsync({
+      type: 'select',
+      name: 'event',
+      message: 'Webhook event type:',
+      choices,
+      initial: existingWebhook?.event
+        ? choices.findIndex(choice => choice.value === existingWebhook.event)
+        : undefined,
+    }));
+  }
+
  if (!url || !validateURL(url)) {
    const urlValidationMessage =
      'The provided webhook URL is invalid and must be an absolute URL, including a scheme.';
@@ -50,7 +67,7 @@ export async function prepareInputParamsAsync(
  }

  return {
-    event,
+    event: nullthrows(event),
    url: nullthrows(url),
    secret: nullthrows(secret),
  };
@@ -1 +0,0 @@
-/build
@@ -1,11 +1,11 @@
 {
  "name": "@expo/eas-json",
  "description": "A library for interacting with eas.json",
-  "version": "0.36.0",
+  "version": "0.40.0",
  "author": "Expo <[email protected]>",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/eas-build-job": "0.2.57",
+    "@expo/eas-build-job": "0.2.61",
    "@expo/json-file": "8.2.33",
    "chalk": "4.1.2",
    "env-string": "1.0.1",
@@ -16,7 +16,8 @@
  },
  "devDependencies": {
    "@types/fs-extra": "9.0.12",
-    "memfs": "3.2.2"
+    "memfs": "3.2.2",
+    "typescript": "4.5.2"
  },
  "engines": {
    "node": ">=12.0.0"
@@ -1,31 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-
-import { AndroidBuildProfile, CommonBuildProfile, IosBuildProfile } from './EasBuild.types';
-import { AndroidSubmitProfile, IosSubmitProfile } from './EasSubmit.types';
-
-export enum CredentialsSource {
-  LOCAL = 'local',
-  REMOTE = 'remote',
-}
-
-export interface RawBuildProfile extends Partial<CommonBuildProfile> {
-  extends?: string;
-  [Platform.ANDROID]?: Partial<AndroidBuildProfile>;
-  [Platform.IOS]?: Partial<IosBuildProfile>;
-}
-
-export interface EasSubmitConfiguration {
-  [Platform.ANDROID]?: AndroidSubmitProfile;
-  [Platform.IOS]?: IosSubmitProfile;
-}
-
-export interface CliConfig {
-  version?: string;
-  requireCommit?: boolean;
-}
-
-export interface EasJson {
-  cli?: CliConfig;
-  build: { [profile: string]: RawBuildProfile };
-  submit?: { [profile: string]: EasSubmitConfiguration };
-}
@@ -1,259 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import JsonFile from '@expo/json-file';
-import envString from 'env-string';
-import path from 'path';
-
-import { BuildProfile } from './EasBuild.types';
-import { CliConfig, CredentialsSource, EasJson, RawBuildProfile } from './EasJson.types';
-import {
-  AndroidSubmitProfileSchema,
-  CliConfigSchema,
-  EasJsonSchema,
-  IosSubmitProfileSchema,
-  MinimalEasJsonSchema,
-} from './EasJsonSchema';
-import {
-  AndroidSubmitProfileFieldsToEvaluate,
-  IosSubmitProfileFieldsToEvaluate,
-  SubmitProfile,
-} from './EasSubmit.types';
-import { InvalidEasJsonError } from './errors';
-
-interface EasJsonPreValidation {
-  cli?: object;
-  build: { [profile: string]: object };
-  submit?: { [profile: string]: object };
-}
-
-const defaults = {
-  distribution: 'store',
-  credentialsSource: CredentialsSource.REMOTE,
-} as const;
-
-type LoggerFn = (...args: any[]) => void;
-
-interface Logger {
-  log: LoggerFn;
-  warn: LoggerFn;
-}
-
-export class EasJsonReader {
-  private static log?: Logger;
-
-  public static formatEasJsonPath(projectDir: string): string {
-    return path.join(projectDir, 'eas.json');
-  }
-
-  public static setLog(log: Logger): void {
-    this.log = log;
-  }
-
-  constructor(private projectDir: string) {}
-
-  public async getBuildProfileNamesAsync(): Promise<string[]> {
-    const easJson = await this.readRawAsync();
-    return Object.keys(easJson?.build ?? {});
-  }
-
-  public async getCliConfigAsync(): Promise<CliConfig | null> {
-    try {
-      const easJson = await this.readRawAsync();
-      if (!easJson.cli) {
-        return null;
-      }
-      const { value, error } = CliConfigSchema.validate(easJson.cli, {
-        allowUnknown: false,
-        convert: true,
-        abortEarly: false,
-      });
-      if (error) {
-        throw new Error(`"cli" field in eas.json is not valid [${error.toString()}]`);
-      }
-      return value as CliConfig;
-    } catch (err: any) {
-      if (err.code === 'ENOENT') {
-        return null;
-      }
-      throw err;
-    }
-  }
-
-  public async getSubmitProfileNamesAsync({ throwIfEasJsonDoesNotExist = true } = {}): Promise<
-    string[]
-  > {
-    try {
-      const easJson = await this.readRawAsync();
-      return Object.keys(easJson?.submit ?? {});
-    } catch (err: any) {
-      if (!throwIfEasJsonDoesNotExist && err.code === 'ENOENT') {
-        return [];
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  public async readBuildProfileAsync<T extends Platform>(
-    platform: T,
-    profileName: string
-  ): Promise<BuildProfile<T>> {
-    const easJson = await this.readAndValidateAsync();
-    this.ensureBuildProfileExists(easJson, profileName);
-    const {
-      android: resolvedAndroidSpecificValues,
-      ios: resolvedIosSpecificValues,
-      ...resolvedProfile
-    } = this.resolveBuildProfile(easJson, profileName);
-    if (platform === Platform.ANDROID) {
-      const profileWithoutDefaults = profileMerge(
-        resolvedProfile,
-        resolvedAndroidSpecificValues ?? {}
-      );
-      return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
-    } else if (platform === Platform.IOS) {
-      const profileWithoutDefaults = profileMerge(resolvedProfile, resolvedIosSpecificValues ?? {});
-      return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
-    } else {
-      throw new Error(`Unknown platform ${platform}`);
-    }
-  }
-
-  public async readSubmitProfileAsync<T extends Platform>(
-    platform: T,
-    profileNameArg?: string
-  ): Promise<SubmitProfile<T>> {
-    let profileName = profileNameArg;
-
-    if (!profileName) {
-      const profileNames = await this.getSubmitProfileNamesAsync({
-        throwIfEasJsonDoesNotExist: false,
-      });
-
-      if (profileNames.includes('production')) {
-        profileName = 'production';
-      } else if (profileNames.includes('release')) {
-        profileName = 'release';
-      } else {
-        return getDefaultSubmitProfile(platform);
-      }
-    }
-
-    const easJson = await this.readAndValidateAsync();
-    const profile = easJson?.submit?.[profileName];
-    if (!profile) {
-      throw new Error(`There is no profile named ${profileName} in eas.json`);
-    }
-    const platformProfile = profile[platform];
-    if (platformProfile) {
-      return this.evaluateFields(platform, platformProfile as SubmitProfile<T>);
-    } else {
-      return getDefaultSubmitProfile(platform);
-    }
-  }
-
-  public async readAndValidateAsync(): Promise<EasJson> {
-    const easJson = await this.readRawAsync();
-    const { value, error } = EasJsonSchema.validate(easJson, {
-      allowUnknown: false,
-      convert: true,
-      abortEarly: false,
-    });
-
-    if (error) {
-      throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
-    }
-    return value as EasJson;
-  }
-
-  public async readRawAsync(): Promise<EasJsonPreValidation> {
-    try {
-      const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
-      const rawEasJson = JsonFile.read(easJsonPath);
-      const { value, error } = MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
-      if (error) {
-        throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
-      }
-      return value;
-    } catch (err: any) {
-      if (err.code === 'EJSONPARSE') {
-        err.message = `Found invalid JSON in eas.json. ${err.message}`;
-      }
-      throw err;
-    }
-  }
-
-  private resolveBuildProfile(
-    easJson: EasJson,
-    profileName: string,
-    depth: number = 0
-  ): RawBuildProfile {
-    if (depth >= 2) {
-      throw new Error(
-        'Too long chain of build profile extensions, make sure "extends" keys do not make a cycle'
-      );
-    }
-    const buildProfile = easJson.build[profileName];
-    if (!buildProfile) {
-      throw new Error(`There is no profile named ${profileName} in eas.json`);
-    }
-    const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
-    if (baseProfileName) {
-      return profileMerge(
-        this.resolveBuildProfile(easJson, baseProfileName, depth + 1),
-        buildProfileRest
-      );
-    } else {
-      return buildProfileRest;
-    }
-  }
-
-  private ensureBuildProfileExists(easJson: EasJson, profileName: string): void {
-    if (!easJson.build || !easJson.build[profileName]) {
-      throw new Error(`There is no profile named ${profileName} in eas.json`);
-    }
-  }
-
-  private evaluateFields<T extends Platform>(
-    platform: T,
-    profile: SubmitProfile<T>
-  ): SubmitProfile<T> {
-    const fields =
-      platform === Platform.ANDROID
-        ? AndroidSubmitProfileFieldsToEvaluate
-        : IosSubmitProfileFieldsToEvaluate;
-    const evaluatedProfile = { ...profile };
-    for (const field of fields) {
-      if (field in evaluatedProfile) {
-        // @ts-ignore
-        evaluatedProfile[field] = envString(evaluatedProfile[field], process.env);
-      }
-    }
-    return evaluatedProfile;
-  }
-}
-
-export function profileMerge(base: RawBuildProfile, update: RawBuildProfile): RawBuildProfile {
-  const result = {
-    ...base,
-    ...update,
-  };
-  if (base.env && update.env) {
-    result.env = {
-      ...base.env,
-      ...update.env,
-    };
-  }
-  if (base.android && update.android) {
-    result.android = profileMerge(base.android, update.android);
-  }
-  if (base.ios && update.ios) {
-    result.ios = profileMerge(base.ios, update.ios);
-  }
-  return result;
-}
-
-function getDefaultSubmitProfile<T extends Platform>(platform: T): SubmitProfile<T> {
-  const Schema =
-    platform === Platform.ANDROID ? AndroidSubmitProfileSchema : IosSubmitProfileSchema;
-  return Schema.validate({}, { convert: true }).value;
-}
@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import { vol } from 'memfs';

-import { EasJsonReader } from '../EasJsonReader';
+import { EasJsonReader } from '../reader';

 jest.mock('fs');

@@ -19,18 +19,18 @@ test('minimal valid eas.json for both platforms', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'production');
-  const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'production');
+  const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'production');
+  const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'production');

-  expect({
+  expect(androidProfile).toEqual({
    distribution: 'store',
    credentialsSource: 'remote',
-  }).toEqual(androidProfile);
+  });

-  expect({
+  expect(iosProfile).toEqual({
    distribution: 'store',
    credentialsSource: 'remote',
-  }).toEqual(iosProfile);
+  });
 });

 test('valid eas.json for development client builds', async () => {
@@ -47,20 +47,20 @@ test('valid eas.json for development client builds', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'debug');
-  const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
-  expect({
+  const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'debug');
+  const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
+  expect(androidProfile).toEqual({
    credentialsSource: 'remote',
    distribution: 'store',
    developmentClient: true,
    withoutCredentials: true,
-  }).toEqual(androidProfile);
+  });

-  expect({
+  expect(iosProfile).toEqual({
    credentialsSource: 'remote',
    distribution: 'store',
    developmentClient: true,
-  }).toEqual(iosProfile);
+  });
 });

 test('valid profile for internal distribution on Android', async () => {
@@ -73,11 +73,11 @@ test('valid profile for internal distribution on Android', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const profile = await reader.readBuildProfileAsync(Platform.ANDROID, 'internal');
-  expect({
+  const profile = await reader.getBuildProfileAsync(Platform.ANDROID, 'internal');
+  expect(profile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',
-  }).toEqual(profile);
+  });
 });

 test('valid profile extending other profile', async () => {
@@ -95,18 +95,18 @@ test('valid profile extending other profile', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
-  const extendedProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
-  expect({
+  const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
+  const extendedProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
+  expect(baseProfile).toEqual({
    distribution: 'store',
    credentialsSource: 'remote',
    node: '12.0.0',
-  }).toEqual(baseProfile);
-  expect({
+  });
+  expect(extendedProfile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',
    node: '13.0.0',
-  }).toEqual(extendedProfile);
+  });
 });

 test('valid profile extending other profile with platform specific envs', async () => {
@@ -134,33 +134,33 @@ test('valid profile extending other profile with platform specific envs', async
  });

  const reader = new EasJsonReader('/project');
-  const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
-  const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
-  const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
-  expect({
+  const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
+  const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
+  const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
+  expect(baseProfile).toEqual({
    distribution: 'store',
    credentialsSource: 'remote',
    env: {
      BASE_ENV: '1',
      PROFILE: 'base',
    },
-  }).toEqual(baseProfile);
-  expect({
+  });
+  expect(extendedAndroidProfile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',
    env: {
      BASE_ENV: '1',
      PROFILE: 'extension:android',
    },
-  }).toEqual(extendedAndroidProfile);
-  expect({
+  });
+  expect(extendedIosProfile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',
    env: {
      BASE_ENV: '1',
      PROFILE: 'extension',
    },
-  }).toEqual(extendedIosProfile);
+  });
 });

 test('valid profile extending other profile with platform specific caching', async () => {
@@ -188,32 +188,32 @@ test('valid profile extending other profile with platform specific caching', asy
  });

  const reader = new EasJsonReader('/project');
-  const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
-  const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
-  const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
-  expect({
+  const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
+  const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
+  const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
+  expect(baseProfile).toEqual({
    distribution: 'store',
    credentialsSource: 'remote',
    cache: {
      disabled: true,
    },
-  }).toEqual(baseProfile);
-  expect({
+  });
+  expect(extendedAndroidProfile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',
    cache: {
      cacheDefaultPaths: false,
      customPaths: ['somefakepath'],
    },
-  }).toEqual(extendedAndroidProfile);
-  expect({
+  });
+  expect(extendedIosProfile).toEqual({
    distribution: 'internal',
    credentialsSource: 'remote',

    cache: {
      key: 'extend-key',
    },
-  }).toEqual(extendedIosProfile);
+  });
 });

 test('valid eas.json with missing profile', async () => {
@@ -224,8 +224,8 @@ test('valid eas.json with missing profile', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
-  await expect(promise).rejects.toThrowError('There is no profile named debug in eas.json');
+  const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
+  await expect(promise).rejects.toThrowError('Missing build profile in eas.json: debug');
 });

 test('invalid eas.json when using wrong buildType', async () => {
@@ -236,7 +236,7 @@ test('invalid eas.json when using wrong buildType', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
+  const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
  await expect(promise).rejects.toThrowError(
    'eas.json is not valid [ValidationError: "build.production.android.buildType" must be one of [apk, app-bundle]]'
  );
@@ -246,8 +246,8 @@ test('empty json', async () => {
  await fs.writeJson('/project/eas.json', {});

  const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
-  await expect(promise).rejects.toThrowError('There is no profile named production in eas.json');
+  const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
+  await expect(promise).rejects.toThrowError('Missing build profile in eas.json: production');
 });

 test('invalid semver value', async () => {
@@ -258,17 +258,29 @@ test('invalid semver value', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
+  const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
  await expect(promise).rejects.toThrowError(
    'eas.json is not valid [ValidationError: "build.production.node" failed custom validation because 12.0.0-alpha is not a valid version]'
  );
 });

+test('invalid release channel', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: { releaseChannel: 'feature/myfeature' },
+    },
+  });
+
+  const reader = new EasJsonReader('/project');
+  const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
+  await expect(promise).rejects.toThrowError(/fails to match the required pattern/);
+});
+
 test('get profile names', async () => {
  await fs.writeJson('/project/eas.json', {
    build: {
-      production: { node: '12.0.0-alpha' },
-      blah: { node: '12.0.0-alpha' },
+      production: { node: '12.0.0' },
+      blah: { node: '12.0.0' },
    },
  });

@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import { vol } from 'memfs';

-import { EasJsonReader } from '../EasJsonReader';
+import { EasJsonReader } from '../reader';

 jest.mock('fs');

@@ -19,8 +19,8 @@ test('minimal allowed eas.json for both platforms', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
-  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
+  const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');
+  const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');

  expect(androidProfile).toEqual({
    changesNotSentForReview: false,
@@ -46,7 +46,7 @@ test('android config with all required values', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
+  const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');

  expect(androidProfile).toEqual({
    serviceAccountKeyPath: './path.json',
@@ -72,7 +72,7 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
  try {
    process.env.GOOGLE_SERVICE_ACCOUNT = './path.json';
    const reader = new EasJsonReader('/project');
-    const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
+    const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');

    expect(androidProfile).toEqual({
      serviceAccountKeyPath: './path.json',
@@ -102,7 +102,7 @@ test('ios config with all required values', async () => {
  });

  const reader = new EasJsonReader('/project');
-  const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
+  const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');

  expect(iosProfile).toEqual({
    appleId: '[email protected]',
@@ -136,7 +136,7 @@ test('ios config with ascApiKey fields set to env var', async () => {
    process.env.ASC_API_KEY_ISSUER_ID = 'abc-123-def-456';
    process.env.ASC_API_KEY_ID = 'ABCD';
    const reader = new EasJsonReader('/project');
-    const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
+    const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'release');

    expect(iosProfile).toEqual({
      appleId: '[email protected]',
@@ -153,3 +153,45 @@ test('ios config with ascApiKey fields set to env var', async () => {
    process.env.ASC_API_KEY_ID = undefined;
  }
 });
+
+test('valid profile extending other profile', async () => {
+  await fs.writeJson('/project/eas.json', {
+    submit: {
+      base: {
+        ios: {
+          appleId: '[email protected]',
+          ascAppId: '1223423523',
+          appleTeamId: 'QWERTY',
+        },
+      },
+      extension: {
+        extends: 'base',
+        ios: {
+          appleTeamId: 'ABCDEF',
+          ascApiKeyPath: './path-ABCD.p8',
+          ascApiKeyIssuerId: 'abc-123-def-456',
+          ascApiKeyId: 'ABCD',
+        },
+      },
+    },
+  });
+
+  const reader = new EasJsonReader('/project');
+  const baseProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'base');
+  const extendedProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'extension');
+  expect(baseProfile).toEqual({
+    language: 'en-US',
+    appleId: '[email protected]',
+    ascAppId: '1223423523',
+    appleTeamId: 'QWERTY',
+  });
+  expect(extendedProfile).toEqual({
+    language: 'en-US',
+    appleId: '[email protected]',
+    ascAppId: '1223423523',
+    appleTeamId: 'ABCDEF',
+    ascApiKeyPath: './path-ABCD.p8',
+    ascApiKeyIssuerId: 'abc-123-def-456',
+    ascApiKeyId: 'ABCD',
+  });
+});
@@ -0,0 +1,97 @@
+import { Platform } from '@expo/eas-build-job';
+
+import { MissingParentProfileError, MissingProfileError } from '../errors';
+import { EasJson } from '../types';
+import { BuildProfileSchema } from './schema';
+import { BuildProfile, EasJsonBuildProfile } from './types';
+
+type EasJsonBuildProfileResolved = Omit<EasJsonBuildProfile, 'extends'>;
+
+export function resolveBuildProfile<T extends Platform>({
+  easJson,
+  platform,
+  profileName,
+}: {
+  easJson: EasJson;
+  platform: T;
+  profileName: string;
+}): BuildProfile<T> {
+  const easJsonProfile = resolveProfile({
+    easJson,
+    profileName,
+  });
+  const { android, ios, ...base } = easJsonProfile;
+  const withoutDefaults = mergeProfiles(base, easJsonProfile[platform] ?? {});
+  return mergeProfiles(getDefaultProfile(platform), withoutDefaults) as BuildProfile<T>;
+}
+
+function resolveProfile({
+  easJson,
+  profileName,
+  depth = 0,
+}: {
+  easJson: EasJson;
+  profileName: string;
+  depth?: number;
+}): EasJsonBuildProfileResolved {
+  if (depth >= 2) {
+    throw new Error(
+      'Too long chain of profile extensions, make sure "extends" keys do not make a cycle'
+    );
+  }
+
+  const profile = easJson.build?.[profileName];
+  if (!profile) {
+    if (depth === 0) {
+      throw new MissingProfileError(`Missing build profile in eas.json: ${profileName}`);
+    } else {
+      throw new MissingParentProfileError(
+        `Extending non-existent build profile in eas.json: ${profileName}`
+      );
+    }
+  }
+
+  const { extends: baseProfileName, ...rest } = profile;
+  if (baseProfileName) {
+    const baseProfile = resolveProfile({
+      easJson,
+      profileName: baseProfileName,
+      depth: depth + 1,
+    });
+    return mergeProfiles(baseProfile, rest);
+  } else {
+    return rest;
+  }
+}
+
+function mergeProfiles(
+  base: EasJsonBuildProfileResolved,
+  update: EasJsonBuildProfileResolved
+): EasJsonBuildProfileResolved {
+  const result = {
+    ...base,
+    ...update,
+  };
+  if (base.env && update.env) {
+    result.env = {
+      ...base.env,
+      ...update.env,
+    };
+  }
+  if (base.android && update.android) {
+    result.android = mergeProfiles(base.android, update.android);
+  }
+  if (base.ios && update.ios) {
+    result.ios = mergeProfiles(base.ios, update.ios);
+  }
+  return result;
+}
+
+function getDefaultProfile<T extends Platform>(platform: T): EasJsonBuildProfile {
+  const defaultProfile = BuildProfileSchema.validate(
+    {},
+    { allowUnknown: false, abortEarly: false, convert: true }
+  ).value;
+  const { android, ios, ...base } = defaultProfile;
+  return mergeProfiles(base, defaultProfile[platform]);
+}
@@ -1,16 +1,6 @@
 import { Android, Ios } from '@expo/eas-build-job';
 import Joi from 'joi';

-import { AndroidReleaseStatus, AndroidReleaseTrack } from './EasSubmit.types';
-
-const semverSchemaCheck = (value: any): any => {
-  if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
-    return value;
-  } else {
-    throw new Error(`${value} is not a valid version`);
-  }
-};
-
 const CacheSchema = Joi.object({
  disabled: Joi.boolean(),
  key: Joi.string().max(128),
@@ -19,11 +9,11 @@ const CacheSchema = Joi.object({
 });

 const CommonBuildProfileSchema = Joi.object({
-  credentialsSource: Joi.string().valid('local', 'remote'),
-  distribution: Joi.string().valid('store', 'internal'),
+  credentialsSource: Joi.string().valid('local', 'remote').default('remote'),
+  distribution: Joi.string().valid('store', 'internal').default('store'),
  cache: CacheSchema,
-  releaseChannel: Joi.string(),
-  channel: Joi.string(),
+  releaseChannel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
+  channel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
  developmentClient: Joi.boolean(),

  node: Joi.string().empty(null).custom(semverSchemaCheck),
@@ -34,6 +24,8 @@ const CommonBuildProfileSchema = Joi.object({

 const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
  Joi.object({
+    credentialsSource: Joi.string().valid('local', 'remote'),
+    distribution: Joi.string().valid('store', 'internal'),
    withoutCredentials: Joi.boolean(),

    image: Joi.string().valid(...Android.builderBaseImages),
@@ -52,6 +44,8 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(

 const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
  Joi.object({
+    credentialsSource: Joi.string().valid('local', 'remote'),
+    distribution: Joi.string().valid('store', 'internal'),
    enterpriseProvisioning: Joi.string().valid('adhoc', 'universal'),
    autoIncrement: Joi.alternatives().try(
      Joi.boolean(),
@@ -70,7 +64,7 @@ const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
  })
 );

-const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
+export const BuildProfileSchema = CommonBuildProfileSchema.concat(
  Joi.object({
    extends: Joi.string(),
    android: AndroidBuildProfileSchema,
@@ -78,48 +72,10 @@ const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
  })
 );

-export const AndroidSubmitProfileSchema = Joi.object({
-  serviceAccountKeyPath: Joi.string(),
-  track: Joi.string()
-    .valid(...Object.values(AndroidReleaseTrack))
-    .default(AndroidReleaseTrack.internal),
-  releaseStatus: Joi.string()
-    .valid(...Object.values(AndroidReleaseStatus))
-    .default(AndroidReleaseStatus.completed),
-  changesNotSentForReview: Joi.boolean().default(false),
-});
-
-export const IosSubmitProfileSchema = Joi.object({
-  ascApiKeyPath: Joi.string(),
-  ascApiKeyId: Joi.string(),
-  ascApiKeyIssuerId: Joi.string(),
-  appleId: Joi.string(),
-  ascAppId: Joi.string(),
-  appleTeamId: Joi.string(),
-  sku: Joi.string(),
-  language: Joi.string().default('en-US'),
-  companyName: Joi.string(),
-  appName: Joi.string(),
-});
-
-const EasJsonSubmitConfigurationSchema = Joi.object({
-  android: AndroidSubmitProfileSchema,
-  ios: IosSubmitProfileSchema,
-});
-
-export const CliConfigSchema = Joi.object({
-  version: Joi.string(),
-  requireCommit: Joi.boolean(),
-});
-
-export const MinimalEasJsonSchema = Joi.object({
-  cli: Joi.object(),
-  build: Joi.object().pattern(Joi.string(), Joi.object()),
-  submit: Joi.object().pattern(Joi.string(), Joi.object()),
-});
-
-export const EasJsonSchema = Joi.object({
-  cli: CliConfigSchema,
-  build: Joi.object().pattern(Joi.string(), EasJsonBuildProfileSchema),
-  submit: Joi.object().pattern(Joi.string(), EasJsonSubmitConfigurationSchema),
-});
+function semverSchemaCheck(value: any): any {
+  if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
+    return value;
+  } else {
+    throw new Error(`${value} is not a valid version`);
+  }
+}
Author	SHA1	Message	Date
jonsamp	ddfe60a7b0	v0.40.0	2021-12-08 15:43:11 -05:00
jkh	7dedeb904b	[eas-cli] change eas update:publish to eas update (#830 ) * [eas-cli] change eas update:publish to eas update * update CHANGELOG.md * grammar	2021-12-08 15:15:25 -05:00
Quinlan Jung	4c02e0102b	[eas-cli] pass build profile env to credentials ctx (#828 ) * [eas-cli] pass build profile env to credentials ctx * update CHANGELOG.md * pr feedback * oops	2021-12-08 11:15:04 -08:00
kgc00	e91516fcc7	[eas-cli] removes account name from tracking context (#827 )	2021-12-08 10:15:46 -08:00
jkh	d01f6c0d8e	[eas-cli] ask for publish message before staring bundling (#826 )	2021-12-08 11:13:26 -05:00
jkh	1ce69cd7c9	[eas-cli] rename branch:publish to update:publish (#818 )	2021-12-06 11:38:20 -05:00
Expo CI	83c10793ac	update CHANGELOG.md	2021-12-06 11:47:10 +00:00
Wojciech Kozyra	a344c11ba1	v0.39.0	2021-12-06 12:41:24 +01:00
Wojciech Kozyra	c7d5a9a819	upgrade eas-cli-local-build-plugin to 0.0.54	2021-12-06 12:41:08 +01:00
Wojciech KozyraandDominik Sokal	2f43ed94ab	detect react-native version + update eas-build-job (#823 ) * detect react-native version + update eas-build-job * update CHANGELOG.md * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]> * update packages Co-authored-by: Dominik Sokal <[email protected]>	2021-12-06 12:38:29 +01:00
Dominik Sokal	4a4ebf3cd6	print project workflow in `eas diagnostics` + update bug report template - add manged/bare input (#822 ) * update bug report template - add manged/bare input * print project workflow in eas diagnostics * update CHANGELOG.md	2021-12-06 12:05:20 +01:00
Dominik Sokal	18b832dbda	fix setting up credentials for projects with Apple Watch companion apps (#812 ) * fix setting up credentials for projects with Apple Watch companion apps * update CHANGELOG.md	2021-12-06 11:37:39 +01:00
Dominik Sokal	1200e7fecd	upgrade @expo/* deps (#821 ) * upgrade @expo/* deps * update CHANGELOG.md	2021-12-06 10:50:44 +01:00
Dominik Sokal	3cc6b73d3a	make iOS submission message less scary: App Store -> App Store Connect (#815 )	2021-12-06 09:41:46 +01:00
jkh	4831ff186a	[eas-cli] bump config-plugins to 4.0.11 (#817 )	2021-12-03 16:26:00 -05:00
Wojciech Kozyra	a2d60a4a76	[eas-cli] improve error message for missing ascAppId (#813 ) * [eas-cli] improve error message for missing ascAppId * update CHANGELOG.md * Update packages/eas-cli/src/submit/ios/IosSubmitCommand.ts	2021-12-03 09:03:11 +01:00
jkh	9f604777b9	[eas-cli] set runtime version in eas update:configure (#811 )	2021-12-02 09:15:26 -05:00
Dominik Sokal	fce9bda9bb	[changelog-bot] revert checkout action back to v2	2021-12-02 11:27:00 +01:00
Dominik Sokal	4cc6745a0d	[changelog-bot] revert setup-node action back to v2; use checkout@v1	2021-12-02 11:22:17 +01:00
Dominik Sokal	67f0b806f4	[changelog-bot] revert setup-node action to v1	2021-12-02 11:11:42 +01:00
Dominik Sokal	9280dfb3ad	[changelog-bot] always capitalize message	2021-12-02 09:36:12 +01:00
jkh	2befbb0eba	[eas-cli] fix typos in eas channel:view logging (#810 )	2021-12-01 12:53:55 -05:00
Wojciech Kozyra	41359b7194	[eas-cli] pass bundle identifier when resolving asc app id (#809 ) * [eas-cli] pass bundle identifier when resolving asc app id * update CHANGELOG.md	2021-12-01 16:32:55 +01:00
jkh	c57861a67d	[eas-cli] add missing @expo/sdk-runtime-versions dependency (#808 )	2021-11-30 13:19:55 -05:00
Expo CI	d31ece8793	update CHANGELOG.md	2021-11-29 23:11:26 +00:00
Brent Vatne	4f7148b756	v0.38.3	2021-11-29 15:04:37 -08:00
Brent Vatne	bc8a781d86	[eas-cli] upgrade @expo/* deps (#806 )	2021-11-29 14:49:44 -08:00
jkh	153a70fb85	[eas-cli] add eas update:configure (#800 )	2021-11-29 07:58:02 -05:00
Wojciech Kozyra	2f93492fc3	[eas-cli] print warning about outdated version to stderr (#805 ) * print warning about outdated version to stderr * update CHANGELOG.md	2021-11-29 11:23:31 +01:00
Dominik Sokal	0b39ff1457	update README.md	2021-11-29 10:15:39 +01:00
Kim BrandwijkandDominik Sokal	f6817037ae	docs: fix broken links to all command source files in readme (#791 ) * docs: fix broken links to all command source files in readme They pointed to .js, but they're all .ts * docs: fix command paths by adding typescript devdependency * fix: add typescript devDependency to eas-json for consistency Co-authored-by: Dominik Sokal <[email protected]>	2021-11-29 10:13:53 +01:00
Expo CI	216f97ea8a	update CHANGELOG.md	2021-11-26 22:01:36 +00:00
Brent Vatne	11c194a168	v0.38.2	2021-11-26 13:50:29 -08:00
Brent Vatne	3c74c111a7	Update yarn.lock	2021-11-26 13:41:40 -08:00
Brent Vatne	b69b8b87a7	[eas-cli] upgrade @expo/* deps (#801 )	2021-11-26 13:40:58 -08:00
jkh	825baa9f68	[eas-cli] check EAS Update URL is correctly configured before publish (#789 )	2021-11-26 16:23:14 -05:00
Dominik Sokal	9f5736cfaa	fix lint error	2021-11-26 14:39:10 +01:00
Dominik Sokal	ae24ffbe86	fix getProfilesAsync tests	2021-11-26 14:23:08 +01:00
Dominik Sokal	487316370b	refactor @expo/eas-json (#794 ) * refactor @expo/eas-json * update CHANGELOG.md	2021-11-26 12:35:49 +01:00
Dominik Sokal	8bc3565270	fix evaluating template strings from info.plist (#798 ) * fix evaluating template strings from info.plist * update CHANGELOG.md	2021-11-26 11:41:57 +01:00
Expo CI	07450f6bf7	update CHANGELOG.md	2021-11-25 09:34:42 +00:00
Dominik Sokal	71d48c3cf2	v0.38.1	2021-11-25 10:29:10 +01:00
Dominik Sokal	7343e81065	upgrade @expo/* deps (#792 ) * upgrade @expo/* deps * update CHANGELOG.md * fix import	2021-11-25 10:25:05 +01:00
Expo CI	1f1310bef6	update CHANGELOG.md	2021-11-24 13:56:49 +00:00
Dominik Sokal	27c69ec8e1	v0.38.0	2021-11-24 14:50:06 +01:00
Wojciech Kozyra	b81b896bc6	[eas-cli] pass identifier from build to submit (#780 ) * pass identifier from build to submit * update CHANGELOG.md * review feedback	2021-11-24 14:02:25 +01:00
Dominik Sokal	ef79db2ca5	clean up .gitignore (#788 )	2021-11-24 13:53:19 +01:00
Dominik Sokal	88565eec62	implement submit webhooks (#777 ) * implement submit webhooks * update CHANGELOG.md	2021-11-24 10:43:25 +01:00
Dominik SokalandBrent Vatne	e8a520e55f	better error message when git is not installed (#784 ) * better error message when git is not installed * update CHANGELOG.md * Update packages/eas-cli/src/vcs/clients/git.ts Co-authored-by: Brent Vatne <[email protected]> * Update packages/eas-cli/src/vcs/clients/git.ts Co-authored-by: Brent Vatne <[email protected]>	2021-11-24 10:42:17 +01:00
Dominik Sokal	9a33f7bd93	check npm version when building locally (#787 ) * check npm version when building locally * update CHANGELOG.md	2021-11-24 10:16:54 +01:00
kgc00	23c70e237b	bump rudder node sdk (#786 )	2021-11-24 09:23:16 +01:00
jkh	7fcf41db78	[eas-cli] fix bug that required runtime version for all builds (#785 )	2021-11-23 15:25:44 -05:00
Evan BaconandDominik Sokal	36f4a4bd38	Improve unknown error message from #740 (#775 ) * Improve unknown error message from #740 * Update CHANGELOG.md * Update bundleIdCapabilities.ts * Update packages/eas-cli/src/credentials/ios/appstore/bundleIdCapabilities.ts Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-11-23 13:22:12 -07:00
jkh	87541db80d	[eas-cli] compute the runtime version for a build's metadata (#783 )	2021-11-23 09:36:37 -05:00
Dominik Sokal	80112c682f	upgrade typescript to 4.5.2 (#781 ) * upgrade typescript to 4.5.2 * bump oclif deps * update CHANGELOG.md	2021-11-22 16:30:02 +01:00
Expo CI	eb29d3dadb	update CHANGELOG.md	2021-11-18 09:51:37 +00:00
Dominik Sokal	558c367038	v0.37.0	2021-11-18 10:42:38 +01:00
Dominik Sokal	4b88d00379	upgrade eas-cli-local-build-plugin to 0.0.50	2021-11-18 10:42:16 +01:00
Dominik Sokal	aad3b5ccd5	interactively configure git user.name and user.email (#772 ) * interactively configure git user.name and user.email * update CHANGELOG.md * address PR feedback	2021-11-18 10:30:51 +01:00
Quinlan Jung	8b50806093	[eas-cli] make the missing eas.json messages better (#770 ) * [eas-cli] make the missing eas.json messages better * make error upstream * revert * fix tests and stuff * update CHANGELOG.md	2021-11-17 13:39:44 -08:00
Dominik Sokal	45c9bda2e9	remove eas availability checks (#771 )	2021-11-17 13:26:36 +01:00
Dominik Sokal	23237210d1	Update CHANGELOG.md	2021-11-17 09:58:36 +01:00
Dominik Sokal	e34382e6a3	show plist path when parsing failed (#768 ) * show plist path when parsing failed * Update packages/eas-cli/src/build/ios/version.ts	2021-11-17 09:57:59 +01:00
jkh	b8ad2ee29a	[eas-cli] auto create channel on publish (#766 )	2021-11-16 13:23:39 -05:00
Wojciech KozyraandDominik Sokal	6bd62bac64	[eas-cli] read correct identifiers for multi-scheme/multi-flavor projects (#765 ) * [eas-cli] read correct appIdentifier for multi-scheme/multi-flavor project * review feedback * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-11-16 15:52:39 +01:00
Dominik Sokal	8b959fc6d8	make the missing build/submit profile error message more descriptive (#761 )	2021-11-15 20:04:34 +01:00
Bartosz Kaszubowski	6e615e20d6	[workflows] update `setup-node` action to `v2` (#763 )	2021-11-15 19:59:29 +01:00
Bartosz Kaszubowski	efbc5fc4bc	[workspace] update Prettier (#762 )	2021-11-15 19:59:12 +01:00
Dominik Sokal	79c77ae835	validate release channel in eas.json (#764 ) * validate release channel in eas.json * update CHANGELOG.md	2021-11-15 16:52:12 +01:00
Expo CI	618b6b1caf	update CHANGELOG.md	2021-11-15 11:50:31 +00:00
Dominik Sokal	864658df80	v0.36.1	2021-11-15 12:26:39 +01:00
Dominik Sokal	4510e86b64	update CHANGELOG.md	2021-11-15 12:24:53 +01:00
Dominik Sokal	4af4490abc	upgrade eas-cli-local-build-plugin to 0.0.48	2021-11-15 12:23:18 +01:00
Expo CI	37c4040203	update CHANGELOG.md	2021-11-15 10:48:35 +00:00