v0.26.0

[eas-cli] support for names with unicode only characters (#596 )
* [eas-cli] support for names with unicode only characters * update CHANGELOG
2026-11-15 03:38:08 -10:00 · 2021-09-08 09:50:50 +02:00 · 2021-09-08 09:46:12 +02:00 · 2021-09-07 16:14:19 +02:00 · 2021-09-07 10:05:24 +02:00 · 2021-09-06 16:03:51 +02:00
207 changed files with 14128 additions and 8494 deletions
@@ -10,7 +10,7 @@ module.exports = {
    jasmine: false,
  },
  rules: {
-    'no-console':'warn',
+    'no-console': 'warn',
    'no-constant-condition': ['warn', { checkLoops: false }],
    'sort-imports': [
      'warn',
@@ -19,6 +19,8 @@ module.exports = {
      },
    ],
    'flowtype/no-types-missing-file-annotation': 'off',
+    curly: 'warn',
+    'import/no-relative-packages': 'error',
  },
  settings: {
    react: {
@@ -0,0 +1 @@
+**/yarn.lock linguist-generated
@@ -0,0 +1,47 @@
+name: "\U0001F41B Bug Report in EAS CLI"
+labels: 'bug'
+description: 'You want to report a reproducible bug or regression in EAS CLI.'
+body:
+  - type: markdown
+    attributes:
+      value: "We're looking to keep questions on our forums and bug reports on the GitHub repo. For questions and help using EAS CLI, post in our [community forums](https://forums.expo.dev/c/help-expo-application-services) (log in with your Expo developer account)."
+  - type: markdown
+    attributes:
+      value: Found a bug in the Expo SDK? Open a bug report [here](https://github.com/expo/expo/issues/new?assignees=&labels=needs+review&template=bug_report.yml) instead.
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
+  - type: markdown
+    attributes:
+      value: If you leave out sections there is a high likelihood your issue will be closed. If you have a question, not a bug report, please post it on our [forums](https://forums.expo.dev/) instead.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      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: Environment
+      placeholder: Run `eas diagnostics` and paste the output here
+  - type: textarea
+    validations:
+      required: false
+    attributes:
+      label: Error output
+      placeholder: If you're running into an error message, please run the same command with `EXPO_DEBUG=true <your command here>` and paste output here.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Reproducible demo or steps to reproduce from a blank project
+      description: 'This should include as little code as possible, do not simply link your entire project. Sharing a link to a [Snack](https://snack.expo.dev/) is a GREAT way to provide a reproducible demo :) If a reproducible demo, or a complete list of steps from blank project to bug, are not provided, it is very likely your issue will be closed. Read [here more guidance](https://stackoverflow.com/help/mcve).'
+  - type: markdown
+    attributes:
+      value: Please make sure contributors can follow the steps your provided in order to reproduce the bug.
+  - type: markdown
+    attributes:
+      value: "**Realize that it is up to you to debug your code and be as certain as possible that the bug is with EAS CLI, not with your own app.** [Here's an excellent guide to debugging you can follow](https://github.com/expo/fyi/blob/master/manual-debugging.md#how-to-narrow-down-the-source-of-an-error-a-step-by-step-guide-to-good-old-fashioned-manual-debugging)."
@@ -0,0 +1,14 @@
+name: "\U0001F64B Enhancement"
+labels: 'enhancement'
+description: 'Want us to add something to EAS CLI?'
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for helping us make EAS even better! 😀 Unfortunately, this is not the right place for feature requests. Please find and upvote your feature (or create a new one) at https://expo.canny.io instead.
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Do you understand that any feature requests opened in this repository will be closed?
+      options:
+        - 'Yes'
@@ -27,7 +27,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: '14'
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn build
      - name: Build tarballs
@@ -60,7 +60,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: '14'
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn build
      - name: Build tarballs
@@ -83,7 +83,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: '14'
+          node-version: '16'
      - run: yarn install --frozen-lockfile --check-files
      - run: sudo apt-get install nsis
      - run: yarn build
@@ -112,4 +112,4 @@ jobs:
          upload_url: ${{ needs.release.outputs.upload_url }}
          asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
          asset_name: ${{ steps.x86.outputs.filename }}
-          asset_content_type: application/gzip
+          asset_content_type: application/gzip
@@ -9,7 +9,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: '14'
+          node-version: '16'
      - uses: preactjs/compressed-size-action@v2
        with:
          build-script: 'build:tarballs:linux'
@@ -10,9 +10,9 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node: ['12', '14']
+        node: ['12', '14', '16']
        include:
-          - node: '14'
+          - node: '16'
            coverage: true
    name: Test with Node ${{ matrix.node }}
    steps:
@@ -11,3 +11,4 @@ tmp
 node_modules
 coverage
 .history
+.DS_Store
@@ -6,17 +6,160 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

- Unifify generic and managed workflow, deprecate `workflow` field. ([#497](https://github.com/expo/eas-cli/pull/497) by [@wkozyra95](https://github.com/wkozyra95))
+- Require `eas submit` to be configured with eas.json submit profiles. Drop support for CLI params. ([#590](https://github.com/expo/eas-cli/pull/590) by [@dsokal](https://github.com/dsokal))

 ### 🎉 New features

+- Add `eas diagnostics` command. ([#594](https://github.com/expo/eas-cli/pull/594) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix `eas build` from throwing an exception when detecting the git `core.ignorecase` setting. ([#592](https://github.com/expo/eas-cli/pull/592) by [@mwillbanks](https://github.com/mwillbanks))
+- Support app names that consist only of unicode characters. ([#596](https://github.com/expo/eas-cli/pull/596) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+## [0.25.0](https://github.com/expo/eas-cli/releases/tag/v0.25.0) - 2021-09-01
+
+### 🛠 Breaking changes
+
+- Drop support for node < 12. ([#581](https://github.com/expo/eas-cli/pull/581) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Support `--no-wait` in `eas submit`. ([#578](https://github.com/expo/eas-cli/pull/578) by [@dsokal](https://github.com/dsokal))
+- Detect changes when `core.ignorecase` is set to true. ([#570](https://github.com/expo/eas-cli/pull/570) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix wrong warning for `metro.config.js` check on Windows. ([#587](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
+- Fix detecting `googleServicesFile` with `EAS_NO_VCS=1`. ([#583](https://github.com/expo/eas-cli/pull/583) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Replace `@hapi/joi` with `joi`. Upgrade typescript to 4.4.2. Upgrade dependencies. ([#582](https://github.com/expo/eas-cli/pull/582) by [@dsokal](https://github.com/dsokal))
+- Change typescript target from `ES2017` to `ES2019`. ([#584](https://github.com/expo/eas-cli/pull/584) by [@dsokal](https://github.com/dsokal))
+- Use `ts-jest` instead of `babel-jest`. ([#585](https://github.com/expo/eas-cli/pull/585) by [@dsokal](https://github.com/dsokal))
+
+## [0.24.1](https://github.com/expo/eas-cli/releases/tag/v0.24.1) - 2021-08-25
+
+### 🐛 Bug fixes
+
+- Fix wrong `EasJsonReader` import causing `eas submit` to fail. ([951ee](https://github.com/expo/eas-cli/commit/951eea2396591bd612aa7cb3038da35e45c33bb8) by [@dsokal](https://github.com/dsokal))
+
+## [0.24.0](https://github.com/expo/eas-cli/releases/tag/v0.24.0) - 2021-08-25
+
+### 🛠 Breaking changes
+
+- Allow publishing of multiple update groups. ([#566](https://github.com/expo/eas-cli/pull/566) by [@jkhales](https://github.com/jkhales))
+
+### 🎉 New features
+
+- Retry status code 500-600 server errors from Apple servers with cookies auth. ([#574](https://github.com/expo/eas-cli/pull/574) by [@EvanBacon](https://github.com/EvanBacon))
+- Throw internal server errors when Apple servers fail to authenticate. ([#574](https://github.com/expo/eas-cli/pull/574) by [@EvanBacon](https://github.com/EvanBacon))
+- Add --auto flag for eas branch:publish. ([#549](https://github.com/expo/eas-cli/pull/549) by [@jkhales](https://github.com/jkhales))
+- Add submissions link in output of `eas submit`. ([#553](https://github.com/expo/eas-cli/pull/553) by [@ajsmth](https://github.com/ajsmth))
+- Add submit profiles. ([#555](https://github.com/expo/eas-cli/pull/555) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `changesNotSentForReview` option to android submissions. ([#560](https://github.com/expo/eas-cli/pull/560) by [@wkozyra95](https://github.com/wkozyra95))
+- Support `--json` flag in build commands. ([#567](https://github.com/expo/eas-cli/pull/567) by [@wkozyra95](https://github.com/wkozyra95))
+- Add link to https://expo.fyi/eas-build-archive in `eas build` output to make it easier to understand what is going on in the archive/upload phase of the build. ([#562](https://github.com/expo/eas-cli/pull/562) by [@brentvatne](https://github.com/brentvatne))
+- Update QR code URL for Android internal distribution build and generate smaller QR code. ([#573](https://github.com/expo/eas-cli/pull/573) by [@axeldelafosse](https://github.com/axeldelafosse))
+
+### 🐛 Bug fixes
+
+- Fix `--sku` flag being ignored when running `eas submit -p ios`. ([#559](https://github.com/expo/eas-cli/pull/559) by [@barthap](https://github.com/barthap))
+- Set correct distribution for simulator builds. ([#556](https://github.com/expo/eas-cli/pull/556) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add warnings around common issues (`NODE_ENV=production`, git ignored `googleServicesFile`). ([#569](https://github.com/expo/eas-cli/pull/569) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.23.0](https://github.com/expo/eas-cli/releases/tag/v0.23.0) - 2021-08-05
+
+### 🛠 Breaking changes
+
+- Stop including deprecated storageBucket field when publishing. ([#547](https://github.com/expo/eas-cli/pull/547) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Pass through metadata context to app version resolver. ([#550](https://github.com/expo/eas-cli/pull/550) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.22.4](https://github.com/expo/eas-cli/releases/tag/v0.22.4) - 2021-08-02
+
+### 🐛 Bug fixes
+
+- Fix build profile schema validation when `simulator` key is present for iOS. ([#546](https://github.com/expo/eas-cli/pull/546) by [@sallar](https://github.com/sallar))
+
+## [0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2) - 2021-08-02
+
+### 🛠 Breaking changes
+
+- Introduce new format of eas.json (old eas.json will be migrated automatically). ([#537](https://github.com/expo/eas-cli/pull/537) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- Validate metro config for managed workflow projects. ([#534](https://github.com/expo/eas-cli/pull/534) by [@dsokal](https://github.com/dsokal))
+- Add more filter params to `build:list`. ([#540](https://github.com/expo/eas-cli/pull/540) by [@dsokal](https://github.com/dsokal))
+- Evaluate interpolated iOS version strings for metadata. ([#541](https://github.com/expo/eas-cli/pull/541) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Validate metadata client side to print better errors. ([#542](https://github.com/expo/eas-cli/pull/542) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `new` build status when building both paltforms. ([#543](https://github.com/expo/eas-cli/pull/543) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix link to build details page where previously we used `project.name` instead of `project.slug` - leave out project segment entirely and depend on redirect. ([#554](https://github.com/expo/eas-cli/pull/554) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.22.1](https://github.com/expo/eas-cli/releases/tag/v0.22.1) - 2021-07-28
+
+### 🎉 New features
+
+- Include the file extension for update's assets in the manifest fragment. ([#532](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
+- Use env variables from `eas.json` when evaluating `app.config.js`. ([#532](https://github.com/expo/eas-cli/pull/532) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix workflow detection when xcodeproj is an empty directory. ([#531](https://github.com/expo/eas-cli/pull/531) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix Android Keystore upload. ([#538](https://github.com/expo/eas-cli/pull/538) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Upgrade typescript to 4.3.5. ([#533](https://github.com/expo/eas-cli/pull/533) by [@dsokal](https://github.com/dsokal))
+
+## [0.22.0](https://github.com/expo/eas-cli/releases/tag/v0.22.0) - 2021-07-23
+
+### 🎉 New features
+
+- Added support for automatically creating and linking iOS capability identifiers (Apple Pay, iCloud Containers, App Groups). ([#524](https://github.com/expo/eas-cli/pull/524) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `secret:create --force` command to overwrite existing secrets. ([#513](https://github.com/expo/eas-cli/pull/513) by [@bycedric](https://github.com/bycedric))
+- Fall back to APK when building for internal distribution. ([#527](https://github.com/expo/eas-cli/pull/527) by [@dsokal](https://github.com/dsokal))
+- Add `iosEnterpriseProvisioning` to build metadata. ([#522](https://github.com/expo/eas-cli/pull/522) by [@dsokal](https://github.com/dsokal))
+- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix iOS capability syncing on build. ([#521](https://github.com/expo/eas-cli/pull/521) by [@EvanBacon](https://github.com/EvanBacon))
+- Fix unhandled error when amplitude domains are blocked. ([#512](https://github.com/expo/eas-cli/pull/512) by [@wkozyra95](https://github.com/wkozyra95))
+- Use default value for `appBuildVersion` in build metadata when building an Android managed project. ([#526](https://github.com/expo/eas-cli/pull/526) by [@dsokal](https://github.com/dsokal))
+
+## [0.21.0](https://github.com/expo/eas-cli/releases/tag/v0.21.0) - 2021-07-12
+
+### 🎉 New features
+
+- Add `project:*` commands. ([#500](https://github.com/expo/eas-cli/pull/500) by [@jkhales](https://github.com/jkhales))
+- Added support for iOS 15 capabilities: Communication Notifications, Time Sensitive Notifications, Group Activities, and Family Controls. ([#499](https://github.com/expo/eas-cli/pull/499) by [@EvanBacon](https://github.com/EvanBacon))
+- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504) and [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
+- Add runtime version to build metadata. ([#493](https://github.com/expo/eas-cli/pull/493) by [@dsokal](https://github.com/dsokal))
+
+## [0.20.0](https://github.com/expo/eas-cli/releases/tag/v0.20.0) - 2021-07-09
+
+### 🛠 Breaking changes
+
+- Unifify generic and managed workflow, deprecate `workflow` field. ([#497](https://github.com/expo/eas-cli/pull/497) by [@wkozyra95](https://github.com/wkozyra95))
+
 ### 🐛 Bug fixes

 - Fix runtime version checks. ([#495](https://github.com/expo/eas-cli/pull/495) by [@dsokal](https://github.com/dsokal))
 - Resolve `--android-package` correctly in `eas submit` command. ([#494](https://github.com/expo/eas-cli/pull/494) by [@wkozyra95](https://github.com/wkozyra95))

-### 🧹 Chores
-
 ## [0.19.1](https://github.com/expo/eas-cli/releases/tag/v0.19.1) - 2021-07-02

 ### 🎉 New features
@@ -0,0 +1,7 @@
+# Community Code of Conduct
+
+The Expo team is committed to fostering an open and welcoming environment.
+
+**Our Community Guidelines can be found here:**
+
+https://expo.dev/guidelines
@@ -1,6 +0,0 @@
-module.exports = function (api) {
-  api.cache(true);
-  return {
-    presets: ['@expo/babel-preset-cli'],
-  };
-};
@@ -1,9 +1,7 @@
 module.exports = {
+  preset: 'ts-jest',
  testEnvironment: 'node',
  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-  transform: {
-    '^.+\\.[jt]sx?$': ['babel-jest', { configFile: require.resolve('./babel.config.js') }],
-  },
  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
 };
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.20.0"
+  "version": "0.26.0"
 }
@@ -10,19 +10,25 @@
    "start": "lerna run watch --parallel",
    "watch": "yarn start",
    "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint . --ext .ts --ext .js",
    "release": "lerna version",
    "test": "jest"
  },
  "devDependencies": {
    "@expo/oclif-dev-cli": "1.24.0-expo",
-    "@types/jest": "^26.0.13",
-    "eslint": "^6.6.0",
-    "eslint-config-universe": "^4.0.0",
-    "eslint-plugin-graphql": "^4.0.0",
-    "jest": "^26.4.2",
-    "jest-watch-typeahead": "^0.6.1",
-    "lerna": "^3.22.1",
-    "prettier": "^2.0.5"
+    "@types/jest": "27.0.1",
+    "@types/node": "16.7.8",
+    "eslint": "7.32.0",
+    "eslint-config-universe": "7.0.1",
+    "jest": "27.1.0",
+    "jest-watch-typeahead": "0.6.4",
+    "lerna": "4.0.0",
+    "prettier": "2.3.2",
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.2"
+  },
+  "volta": {
+    "node": "16.8.0",
+    "yarn": "1.22.11"
  }
 }
@@ -0,0 +1,2 @@
+graphql.schema.json linguist-generated
+src/graphql/generated.ts linguist-generated
@@ -42,15 +42,19 @@ eas --help COMMAND
 * [`eas build:configure`](#eas-buildconfigure)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
+* [`eas config`](#eas-config)
 * [`eas credentials`](#eas-credentials)
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:list`](#eas-devicelist)
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
+* [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
+* [`eas project:info`](#eas-projectinfo)
+* [`eas project:init`](#eas-projectinit)
 * [`eas secret:create`](#eas-secretcreate)
 * [`eas secret:delete`](#eas-secretdelete)
 * [`eas secret:list`](#eas-secretlist)
-* [`eas submit --platform=(android|ios)`](#eas-submit---platformandroidios)
+* [`eas submit`](#eas-submit)
 * [`eas webhook:create`](#eas-webhookcreate)
 * [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
 * [`eas webhook:list`](#eas-webhooklist)
@@ -69,7 +73,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

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

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

 ## `eas account:view`

@@ -97,22 +101,22 @@ ALIASES
  $ eas whoami
 ```

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

 ## `eas analytics [STATUS]`

-View or change analytics settings
+view or change analytics settings

 ```
 USAGE
  $ eas analytics [STATUS]
 ```

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

 ## `eas build`

-Start a build
+start a build

 ```
 USAGE
@@ -121,6 +125,7 @@ USAGE
 OPTIONS
  -p, --platform=(android|ios|all)
  --clear-cache                     Clear cache before the build
+  --json                            Enable JSON output, non-JSON messages will be printed to stderr
  --local                           Run build locally [experimental]
  --non-interactive                 Run command in --non-interactive mode
  --profile=profile                 [default: release] Name of the build profile from eas.json
@@ -128,7 +133,7 @@ OPTIONS
  --[no-]wait                       Wait for build(s) to complete
 ```

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

 ## `eas build:cancel [BUILD_ID]`

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

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

 ## `eas build:configure`

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

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

 ## `eas build:list`

@@ -164,12 +169,29 @@ USAGE
  $ eas build:list

 OPTIONS
+  --appBuildVersion=appBuildVersion
+  --appIdentifier=appIdentifier
+  --appVersion=appVersion
+  --buildProfile=buildProfile
+  --channel=channel
+  --distribution=(store|internal|simulator)
+  --gitCommitHash=gitCommitHash
+
+  --json                                                         Enable JSON output, non-JSON messages will be printed
+                                                                 to stderr
+
  --limit=limit
+
  --platform=(all|android|ios)
+
+  --runtimeVersion=runtimeVersion
+
+  --sdkVersion=sdkVersion
+
  --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```

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

 ## `eas build:view [BUILD_ID]`

@@ -178,20 +200,38 @@ view a build for your project
 ```
 USAGE
  $ eas build:view [BUILD_ID]
+
+OPTIONS
+  --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```

-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.20.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/build/view.js)_
+
+## `eas config`
+
+show the eas.json config
+
+```
+USAGE
+  $ eas config
+
+OPTIONS
+  -p, --platform=(android|ios)
+  --profile=profile
+```
+
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/config.js)_

 ## `eas credentials`

-Manage your credentials
+manage your credentials

 ```
 USAGE
  $ eas credentials
 ```

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

 ## `eas device:create`

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

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

 ## `eas device:list`

@@ -216,7 +256,7 @@ OPTIONS
  --apple-team-id=apple-team-id
 ```

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

 ## `eas device:view [UDID]`

@@ -227,7 +267,18 @@ USAGE
  $ eas device:view [UDID]
 ```

-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.20.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/device/view.js)_
+
+## `eas diagnostics`
+
+log environment info to the console
+
+```
+USAGE
+  $ eas diagnostics
+```
+
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/diagnostics.js)_

 ## `eas help [COMMAND]`

@@ -244,7 +295,32 @@ OPTIONS
  --all  see all commands in CLI
 ```

-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.3/src/commands/help.ts)_
+
+## `eas project:info`
+
+information about the current project
+
+```
+USAGE
+  $ eas project:info
+```
+
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/project/info.js)_
+
+## `eas project:init`
+
+create or link an EAS project
+
+```
+USAGE
+  $ eas project:init
+
+ALIASES
+  $ eas init
+```
+
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/project/init.js)_

 ## `eas secret:create`

@@ -255,12 +331,13 @@ USAGE
  $ eas secret:create

 OPTIONS
+  --force                    Delete and recreate existing secrets
  --name=name                Name of the secret
  --scope=(account|project)  [default: project] Scope for the secret
  --value=value              Value of the secret
 ```

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

 ## `eas secret:delete`

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

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

 ## `eas secret:list`

@@ -288,87 +365,34 @@ USAGE
  $ eas secret:list
 ```

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

-## `eas submit --platform=(android|ios)`
+## `eas submit`

-Submits build artifact to app store
+submit build archive to app store

 ```
 USAGE
-  $ eas submit --platform=(android|ios)
+  $ eas submit

 OPTIONS
-  -p, --platform=(android|ios)                                       For which platform you want to submit a build
+  -p, --platform=(android|ios)
+  --id=id                       ID of the build to submit
+  --latest                      Submit the latest build for specified platform
+  --path=path                   Path to the .apk/.aab/.ipa file
+  --profile=profile             Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.
+  --url=url                     App archive url
+  --verbose                     Always print logs from Submission Service
+  --[no-]wait                   Wait for submission to complete

-  Android specific options=android-package                           Android package name (default: expo.android.package
-                                                                     from app config)
-
-  iOS specific options=app-name                                      The name of your app as it will appear on the App
-                                                                     Store (default: expo.name from app config)
-
-  iOS specific options=apple-id                                      Your Apple ID username (you can also set
-                                                                     EXPO_APPLE_ID env variable)
-
-  iOS specific options=apple-team-id                                 Your Apple Developer Team ID
-
-  iOS specific options=asc-app-id                                    App Store Connect unique application Apple ID
-                                                                     number. Providing this param results in skipping
-                                                                     app creation step. Learn more:
-                                                                     https://expo.fyi/asc-app-id
-
-  iOS specific options=bundle-identifier                             Your iOS Bundle Identifier (default:
-                                                                     expo.ios.bundleIdentifier from app config)
-
-  iOS specific options=company-name                                  The name of your company, needed only for the first
-                                                                     upload of any app to App Store
-
-  --id=id                                                            ID of the build to submit
-
-  Android specific options=key                                       Path to the JSON key used to authenticate with
-                                                                     Google Play
-
-  iOS specific options=language                                      [default: en-US] Primary language (e.g. English,
-                                                                     German, ...)
-
-  --latest                                                           Submit the latest build for specified platform
-
-  --path=path                                                        Path to the .apk/.aab file
-
-  Android specific options=(completed|draft|halted|inProgress)       [default: completed] Release status (used when
-                                                                     uploading new APKs/AABs)
-
-  iOS specific options=sku                                           An unique ID for your app that is not visible on
-                                                                     the App Store, will be generated unless provided
-
-  Android specific options=(production|beta|alpha|internal|rollout)  [default: internal] The track of the application to
-                                                                     use
-
-  Android specific options=(apk|aab)                                 Android archive type
-
-  --url=url                                                          App archive url
-
-  --verbose                                                          Always print logs from Submission Service
+DESCRIPTION
+  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/

 ALIASES
  $ eas build:submit
-
-EXAMPLES
-  $ eas submit --platform=ios
-       - Fully interactive iOS submission
-
-  $ eas submit --platform=android
-       - Fully interactive Android submission
-
-  $ eas submit -p android --latest --key=/path/to/google-services.json
-       - Minimal non-interactive Android submission, however it can ask you for other params if not specified
-
-  $ EXPO_APPLE_APP_SPECIFIC_PASSWORD=xxx eas submit -p ios --latest [email protected] --asc-app-id=1234567890,
-       - Minimal non-interactive iOS submission, assuming you already have an app in App Store Connect
-         and provide its App ID
 ```

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

 ## `eas webhook:create`

@@ -387,7 +411,7 @@ OPTIONS
  --url=url        Webhook URL
 ```

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

 ## `eas webhook:delete [ID]`

@@ -401,7 +425,7 @@ ARGUMENTS
  ID  ID of the webhook to delete
 ```

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

 ## `eas webhook:list`

@@ -415,7 +439,7 @@ OPTIONS
  --event=(BUILD)  Event type that triggers the webhook
 ```

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

 ## `eas webhook:update`

@@ -435,7 +459,7 @@ OPTIONS
  --url=url        Webhook URL
 ```

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

 ## `eas webhook:view ID`

@@ -449,5 +473,5 @@ ARGUMENTS
  ID  ID of the webhook to view
 ```

-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.20.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->
@@ -6,4 +6,7 @@ if (process.env.TMPDIR) {
  fs.mkdirSync(process.env.TMPDIR, { recursive: true });
 }

+// fs-extra@10 is not compatible with memfs, the following line fixes tests
+(fs.realpath as any).native = jest.fn();
+
 module.exports = fs;
@@ -1,113 +1,104 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "0.20.0",
-  "author": "Expo <support@expo.io>",
+  "version": "0.26.0",
+  "author": "Expo <support@expo.dev>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@amplitude/identify": "1.5.0",
-    "@amplitude/node": "1.5.0",
-    "@expo/apple-utils": "0.0.0-alpha.20",
+    "@amplitude/identify": "1.7.0",
+    "@amplitude/node": "1.7.0",
+    "@expo/apple-utils": "0.0.0-alpha.25",
    "@expo/config": "3.3.42",
-    "@expo/config-plugins": "3.0.3",
-    "@expo/eas-build-job": "0.2.41",
-    "@expo/eas-json": "^0.20.0",
+    "@expo/config-plugins": "3.1.0",
+    "@expo/eas-build-job": "0.2.46",
+    "@expo/eas-json": "^0.26.0",
    "@expo/json-file": "8.2.25",
    "@expo/pkcs12": "0.0.4",
-    "@expo/plist": "0.0.11",
+    "@expo/plist": "0.0.14",
    "@expo/plugin-warn-if-update-available": "1.7.0",
    "@expo/results": "1.0.0",
+    "@expo/rudder-sdk-node": "1.0.7",
    "@expo/sdk-runtime-versions": "1.0.0",
    "@expo/spawn-async": "1.5.0",
-    "@hapi/joi": "17.1.1",
    "@oclif/command": "1.8.0",
    "@oclif/config": "1.17.0",
-    "@oclif/errors": "1.3.3",
-    "@oclif/plugin-help": "3.2.0",
-    "@urql/core": "2.0.0",
-    "@urql/exchange-retry": "0.2.0",
-    "chalk": "4.1.0",
+    "@oclif/errors": "1.3.5",
+    "@oclif/plugin-help": "3.2.3",
+    "@urql/core": "2.3.1",
+    "@urql/exchange-retry": "0.3.0",
+    "chalk": "4.1.2",
    "cli-table3": "0.6.0",
-    "dateformat": "3.0.3",
+    "dateformat": "4.5.1",
    "env-paths": "2.2.0",
-    "fast-glob": "3.2.4",
+    "envinfo": "7.8.1",
+    "fast-glob": "3.2.7",
    "figures": "3.2.0",
    "form-data": "3.0.0",
-    "fs-extra": "9.0.1",
+    "fs-extra": "10.0.0",
    "getenv": "1.0.0",
-    "got": "11.5.2",
-    "graphql": "15.3.0",
-    "graphql-tag": "2.11.0",
+    "got": "11.8.2",
+    "graphql": "15.5.1",
+    "graphql-tag": "2.12.5",
    "ignore": "5.1.8",
    "indent-string": "4.0.0",
-    "jks-js": "1.0.0",
+    "jks-js": "1.0.1",
+    "joi": "17.4.2",
    "keychain": "1.3.0",
-    "lodash": "4.17.20",
-    "mime": "2.4.7",
+    "lodash": "4.17.21",
+    "mime": "2.5.2",
    "minimatch": "3.0.4",
-    "nanoid": "3.1.23",
+    "nanoid": "3.1.25",
    "node-fetch": "2.6.1",
    "node-forge": "0.10.0",
    "nullthrows": "1.1.1",
    "ora": "5.1.0",
    "pkg-dir": "4.2.0",
-    "progress": "2.0.3",
    "prompts": "2.3.2",
    "qrcode-terminal": "0.12.0",
    "resolve-from": "5.0.0",
-    "semver": "7.3.4",
+    "semver": "7.3.5",
    "strip-ansi": "6.0.0",
-    "tar": "6.0.5",
+    "tar": "6.1.11",
    "tempy": "0.7.0",
    "terminal-link": "2.1.1",
    "timeago.js": "4.0.2",
-    "tslib": "1.14.1",
-    "turndown": "7.0.0",
+    "tslib": "2.3.1",
+    "turndown": "7.1.1",
    "untildify": "4.0.0",
-    "uuid": "8.3.0",
+    "uuid": "8.3.2",
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-typescript": "^7.10.4",
-    "@expo/babel-preset-cli": "^0.2.17",
    "@graphql-codegen/cli": "^1.19.2",
    "@graphql-codegen/introspection": "^1.18.0",
    "@graphql-codegen/typescript": "^1.17.11",
    "@graphql-codegen/typescript-operations": "^1.17.10",
-    "@types/color-string": "^1.5.0",
-    "@types/dateformat": "^3.0.1",
+    "@types/dateformat": "3.0.1",
+    "@types/envinfo": "7.8.1",
    "@types/form-data": "^2.5.0",
-    "@types/fs-extra": "^9.0.1",
+    "@types/fs-extra": "9.0.12",
    "@types/getenv": "^1.0.0",
-    "@types/lodash": "^4.14.161",
-    "@types/mime": "^2.0.3",
-    "@types/node": "^12",
+    "@types/lodash": "4.14.172",
+    "@types/mime": "2.0.3",
    "@types/node-fetch": "^2.5.7",
    "@types/node-forge": "^0.9.5",
-    "@types/progress": "^2.0.3",
    "@types/prompts": "^2.0.9",
-    "@types/semver": "^7.3.4",
-    "@types/tar": "^4.0.3",
-    "@types/tough-cookie": "^4.0.0",
-    "@types/uuid": "^8.3.0",
-    "@types/wrap-ansi": "^3.0.0",
-    "@vercel/ncc": "^0.23.0",
-    "axios": "^0.21.0",
-    "babel-jest": "^26.3.0",
-    "memfs": "^3.2.0",
+    "@types/semver": "7.3.8",
+    "@types/tar": "4.0.5",
+    "@types/tough-cookie": "4.0.1",
+    "@types/uuid": "8.3.1",
+    "@types/wrap-ansi": "3.0.0",
+    "axios": "0.21.4",
+    "eslint-plugin-graphql": "4.0.0",
+    "memfs": "3.2.2",
    "mockdate": "^3.0.2",
-    "nock": "^13.0.5",
-    "ts-node": "^8",
-    "typescript": "^3.9.7",
-    "wonka": "^4.0.14"
+    "nock": "^13.0.5"
  },
  "engines": {
-    "node": ">=8.0.0"
+    "node": ">=12.0.0"
  },
  "files": [
    "/bin",
@@ -131,15 +122,27 @@
    ],
    "helpClass": "./build/help",
    "topics": {
+      "account": {
+        "description": "manage your account"
+      },
      "build": {
        "description": "build app binaries"
      },
      "channel": {
        "description": "manage update channels"
      },
+      "device": {
+        "description": "manage your Apple devices for internal distribution"
+      },
+      "project": {
+        "description": "manage your project"
+      },
      "release": {
        "description": "manage update releases"
      },
+      "secret": {
+        "description": "manage project and account secrets"
+      },
      "update": {
        "description": "manage individual updates"
      },
@@ -175,7 +178,5 @@
    "test": "jest",
    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
-  },
-  "types": "build/index.d.ts",
-  "gitHead": "161808bc37c255fdea6801d69d23dbc725c056c3"
+  }
 }
@@ -24,7 +24,7 @@ describe('apiClient', () => {
    let error: Error | null = null;
    try {
      await apiClient.post('test');
-    } catch (e) {
+    } catch (e: any) {
      error = e;
    }

@@ -44,7 +44,7 @@ describe('apiClient', () => {
    let error: Error | null = null;
    try {
      await apiClient.post('test');
-    } catch (e) {
+    } catch (e: any) {
      error = e;
    }
    expect(error).toBeInstanceOf(RequestError);
@@ -1,6 +1,8 @@
 import { Identify } from '@amplitude/identify';
 import * as Amplitude from '@amplitude/node';
+import RudderAnalytics from '@expo/rudder-sdk-node';
 import os from 'os';
+import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';

 import UserSettings from './user/UserSettings';
@@ -18,8 +20,9 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
  linux: 'Linux',
 };

-let client: Amplitude.NodeClient | null = null;
-let userIdentifyCalled = false;
+let amplitudeClient: Amplitude.NodeClient | null = null;
+let rudderstackClient: RudderAnalytics | null = null;
+let userIdentified = false;
 let identifyData: {
  userId: string;
  deviceId: string;
@@ -32,11 +35,33 @@ export async function initAsync(): Promise<void> {
  }
  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', true);
  if (amplitudeEnabled) {
-    const apiKey =
+    const config =
      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-        ? 'cdebbc678931403439486c4750781544'
-        : '4ac443afd5073c0df6169291db1d3495';
-    client = Amplitude.init(apiKey);
+        ? {
+            // staging environment
+            amplitudeWriteKey: 'cdebbc678931403439486c4750781544',
+            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          }
+        : {
+            // prod environment
+            amplitudeWriteKey: '4ac443afd5073c0df6169291db1d3495',
+            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          };
+
+    amplitudeClient = Amplitude.init(config.amplitudeWriteKey, {
+      retryClass: new Amplitude.OfflineRetryHandler(config.amplitudeWriteKey),
+    });
+
+    rudderstackClient = new RudderAnalytics(
+      config.rudderstackWriteKey,
+      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
+      {
+        flushInterval: 300,
+      }
+    );
+    rudderstackClient.logger.silent = true;
  }
 }

@@ -53,6 +78,7 @@ export async function setUserDataAsync(
  if (!savedDeviceId) {
    await UserSettings.setAsync('amplitudeDeviceId', deviceId);
  }
+
  identifyData = {
    userId,
    deviceId,
@@ -63,41 +89,79 @@ export async function setUserDataAsync(
 }

 export async function flushAsync(): Promise<void> {
-  if (client) {
-    await client.flush();
+  if (rudderstackClient) {
+    rudderstackClient.flush();
+  }
+
+  if (amplitudeClient) {
+    await amplitudeClient.flush();
  }
 }

 export function logEvent(name: string, properties: Record<string, any> = {}) {
-  if (client) {
-    ensureUserIdentified();
-    const { userId, deviceId } = identifyData ?? {};
-    client.logEvent({
+  if (!amplitudeClient && !rudderstackClient) {
+    return;
+  }
+  ensureUserIdentified();
+
+  const { userId, deviceId } = identifyData ?? {};
+  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
+
+  if (amplitudeClient) {
+    amplitudeClient.logEvent({
      event_type: name,
-      event_properties: properties,
+      event_properties: { ...properties, ...commonEventProperties },
      ...(userId && { user_id: userId }),
      ...(deviceId && { device_id: deviceId }),
-      ...getContext(),
+      ...getAmplitudeContext(),
+    });
+  }
+
+  if (rudderstackClient) {
+    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+    rudderstackClient.track({
+      event: name,
+      properties: { ...properties, ...commonEventProperties },
+      ...identity,
+      context: getRudderStackContext(),
    });
  }
 }

 function ensureUserIdentified() {
-  if (client && !userIdentifyCalled && identifyData) {
-    client.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
-    userIdentifyCalled = true;
+  if (!(rudderstackClient || amplitudeClient) || userIdentified || !identifyData) {
+    return;
  }
+
+  if (amplitudeClient) {
+    amplitudeClient.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
+  }
+
+  if (rudderstackClient) {
+    rudderstackClient.identify({
+      userId: identifyData.userId,
+      anonymousId: identifyData.deviceId,
+    });
+  }
+  userIdentified = true;
 }

-function getContext() {
+function getAmplitudeContext() {
  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
  return {
    os_name: platform,
    os_version: os.release(),
    device_brand: platform,
    device_model: platform,
-    source_version: packageJSON?.version,
-    source: 'eas cli',
+  };
+}
+
+function getRudderStackContext() {
+  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+  return {
+    os: { name: platform, version: os.release() },
+    device: { type: platform, model: platform },
+    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
  };
 }

@@ -50,10 +50,10 @@ export function getExpoApiBaseUrl(): string {

 export function getExpoWebsiteBaseUrl(): string {
  if (process.env.EXPO_STAGING) {
-    return `https://staging.expo.io`;
+    return `https://staging.expo.dev`;
  } else if (process.env.EXPO_LOCAL) {
    return `http://expo.test`;
  } else {
-    return `https://expo.io`;
+    return `https://expo.dev`;
  }
 }
@@ -14,10 +14,11 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');

  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const updatedBuildGradleContents = AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
-      projectDir,
-      buildGradleContents
-    );
+    const updatedBuildGradleContents =
+      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
+        projectDir,
+        buildGradleContents
+      );
    await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
  }

@@ -94,7 +95,7 @@ export async function readChannelSafelyAsync(projectDir: string): Promise<string
    const androidManifest = await getAndroidManifestAsync(projectDir);
    const stringifiedRequestHeaders = AndroidConfig.Manifest.getMainApplicationMetaDataValue(
      androidManifest,
-      'expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY' //TODO-JJ AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+      AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
    );
    if (!stringifiedRequestHeaders) {
      return null;
@@ -1,5 +1,4 @@
-import { Android, Metadata, Workflow } from '@expo/eas-build-job';
-import { EasConfig } from '@expo/eas-json';
+import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

@@ -15,25 +14,23 @@ import {
 } from '../../project/android/applicationId';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
-import { CredentialsResult, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommandContext, createBuildContextAsync } from '../context';
+import {
+  BuildRequestSender,
+  CredentialsResult,
+  prepareBuildRequestForPlatformAsync,
+} from '../build';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { Platform } from '../types';
 import { logCredentialsSource } from '../utils/credentials';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';

 export async function prepareAndroidBuildAsync(
-  commandCtx: CommandContext,
-  easConfig: EasConfig
-): Promise<() => Promise<string | undefined>> {
-  const buildCtx = await createBuildContextAsync<Platform.ANDROID>({
-    commandCtx,
-    platform: Platform.ANDROID,
-    easConfig,
-  });
-  const { buildProfile } = buildCtx;
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
+  const { buildProfile } = ctx;

  if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
    Log.addNewLineIfNone();
@@ -51,18 +48,22 @@ This means that it will most likely produce an AAB and you will not be able to i
    }
  }

-  if (buildCtx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(commandCtx.projectDir, commandCtx.exp);
+  checkNodeEnvVariable(ctx);
+  await checkGoogleServicesFileAsync(ctx);
+
+  if (ctx.workflow === Workflow.MANAGED) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
  }

  return await prepareBuildRequestForPlatformAsync({
-    ctx: buildCtx,
+    ctx,
    ensureCredentialsAsync: ensureAndroidCredentialsAsync,
    ensureProjectConfiguredAsync: async () => {
-      if (buildCtx.workflow === Workflow.GENERIC) {
-        await validateAndSyncProjectConfigurationAsync(commandCtx.projectDir, commandCtx.exp);
+      if (ctx.workflow === Workflow.GENERIC) {
+        await validateAndSyncProjectConfigurationAsync(ctx.projectDir, ctx.exp);
      }
    },
+    getMetadataContext: () => ({}),
    prepareJobAsync,
    sendBuildRequestAsync: async (
      appId: string,
@@ -90,21 +91,19 @@ async function ensureAndroidCredentialsAsync(
  if (!shouldProvideCredentials(ctx)) {
    return;
  }
-  const androidApplicationIdentifier = await getApplicationIdAsync(
-    ctx.commandCtx.projectDir,
-    ctx.commandCtx.exp
-  );
+  const androidApplicationIdentifier = await getApplicationIdAsync(ctx.projectDir, ctx.exp);
  const provider = new AndroidCredentialsProvider(
-    await createCredentialsContextAsync(ctx.commandCtx.projectDir, {
-      nonInteractive: ctx.commandCtx.nonInteractive,
+    await createCredentialsContextAsync(ctx.projectDir, {
+      exp: ctx.exp,
+      nonInteractive: ctx.nonInteractive,
    }),
    {
      app: {
        account: nullthrows(
-          findAccountByName(ctx.commandCtx.user.accounts, ctx.commandCtx.accountName),
-          `You do not have access to account: ${ctx.commandCtx.accountName}`
+          findAccountByName(ctx.user.accounts, ctx.accountName),
+          `You do not have access to account: ${ctx.accountName}`
        ),
-        projectName: ctx.commandCtx.projectName,
+        projectName: ctx.projectName,
        androidApplicationIdentifier,
      },
    }
@@ -1,4 +1,5 @@
-import { ArchiveSource, Job, sanitizeJob } from '@expo/eas-build-job';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
+import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';

 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
@@ -6,20 +7,25 @@ import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import vcs from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';

 interface JobData {
  projectArchive: ArchiveSource;
  credentials?: AndroidCredentials;
 }

+const cacheDefaults = {
+  disabled: false,
+  customPaths: [],
+  cacheDefaultPaths: true,
+};
+
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
-  const projectRootDirectory =
-    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
+  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
  const { credentials } = jobData;
  const buildCredentials = credentials
    ? {
@@ -34,22 +40,28 @@ export async function prepareJobAsync(
      }
    : {};

-  const job = {
+  let buildType = ctx.buildProfile.buildType;
+  if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
+    buildType = Android.BuildType.APK;
+  }
+
+  const job: Android.Job = {
    type: ctx.workflow,
    platform: Platform.ANDROID,
    projectRootDirectory,
    projectArchive: jobData.projectArchive,
    builderEnvironment: {
-      image: ctx.buildProfile.image,
-      node: ctx.buildProfile.node,
-      yarn: ctx.buildProfile.yarn,
-      ndk: ctx.buildProfile.ndk,
-      expoCli: ctx.buildProfile.expoCli,
-      env: ctx.buildProfile.env,
+      image: buildProfile.image ?? 'default',
+      node: buildProfile.node,
+      yarn: buildProfile.yarn,
+      ndk: buildProfile.ndk,
+      expoCli: buildProfile.expoCli,
+      env: buildProfile.env,
    },
    cache: {
-      ...ctx.buildProfile.cache,
-      clear: ctx.commandCtx.clearCache,
+      ...cacheDefaults,
+      ...buildProfile.cache,
+      clear: ctx.clearCache,
    },
    secrets: {
      ...buildCredentials,
@@ -57,11 +69,11 @@ export async function prepareJobAsync(
    releaseChannel: ctx.buildProfile.releaseChannel,
    updates: { channel: ctx.buildProfile.channel },

-    gradleCommand: ctx.buildProfile.gradleCommand,
-    artifactPath: ctx.buildProfile.artifactPath,
+    gradleCommand: buildProfile.gradleCommand,
+    artifactPath: buildProfile.artifactPath,

    username,
-    buildType: ctx.buildProfile.buildType,
+    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
  };

  return sanitizeJob(job);
@@ -19,7 +19,7 @@ export async function readVersionCodeAsync(
      return undefined;
    }
  } else {
-    return AndroidConfig.Version.getVersionCode(exp) ?? undefined;
+    return AndroidConfig.Version.getVersionCode(exp) ?? 1;
  }
 }

@@ -1,20 +1,25 @@
-import { ArchiveSource, ArchiveSourceType, Job, Metadata } from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
+import chalk from 'chalk';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
+import ora from 'ora';

-import { UploadSessionType } from '../graphql/generated';
+import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
-import Log from '../log';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log, { learnMore } from '../log';
 import { promptAsync } from '../prompts';
 import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
+import { sleep } from '../utils/promise';
 import vcs from '../vcs';
 import { requestedPlatformDisplayNames } from './constants';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { collectMetadata } from './metadata';
-import { Platform, TrackingContext } from './types';
+import { MetadataContext, collectMetadata } from './metadata';
+import { TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { commitPromptAsync, makeProjectTarballAsync } from './utils/repository';
@@ -36,69 +41,68 @@ 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>;
 }

+export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
+
 export async function prepareBuildRequestForPlatformAsync<
  TPlatform extends Platform,
  Credentials,
  TJob extends Job
->(builder: Builder<TPlatform, Credentials, TJob>): Promise<() => Promise<string | undefined>> {
+>(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
+  const { ctx } = builder;
  const credentialsResult = await withAnalyticsAsync(
-    async () => await builder.ensureCredentialsAsync(builder.ctx),
+    async () => await builder.ensureCredentialsAsync(ctx),
    {
      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
-      trackingCtx: builder.ctx.trackingCtx,
+      trackingCtx: ctx.trackingCtx,
    }
  );
-  if (!builder.ctx.commandCtx.skipProjectConfiguration) {
-    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(builder.ctx), {
+  if (!ctx.skipProjectConfiguration) {
+    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
-      trackingCtx: builder.ctx.trackingCtx,
+      trackingCtx: ctx.trackingCtx,
    });
  }

  if (await vcs.hasUncommittedChangesAsync()) {
    Log.addNewLineIfNone();
    await reviewAndCommitChangesAsync(
-      `[EAS Build] Run EAS Build for ${
-        requestedPlatformDisplayNames[builder.ctx.platform as Platform]
-      }`,
-      {
-        nonInteractive: builder.ctx.commandCtx.nonInteractive,
-      }
+      `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
+      { nonInteractive: ctx.nonInteractive }
    );
  }

-  const projectArchive = builder.ctx.commandCtx.local
+  const projectArchive = ctx.local
    ? ({
        type: ArchiveSourceType.PATH,
        path: (await makeProjectTarballAsync()).path,
      } as const)
    : ({
        type: ArchiveSourceType.S3,
-        bucketKey: await uploadProjectAsync(builder.ctx),
+        bucketKey: await uploadProjectAsync(ctx),
      } as const);

-  const metadata = await collectMetadata(builder.ctx, {
-    credentialsSource: credentialsResult?.source,
-  });
-  const job = await builder.prepareJobAsync(builder.ctx, {
+  const metadataContext = builder.getMetadataContext();
+  const metadata = await collectMetadata(ctx, metadataContext);
+  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
    credentials: credentialsResult?.credentials,
  });

  return async () => {
-    if (builder.ctx.commandCtx.local) {
+    if (ctx.local) {
      await runLocalBuildAsync(job);
      return undefined;
    } else {
      try {
        return await sendBuildRequestAsync(builder, job, metadata);
-      } catch (error) {
+      } catch (error: any) {
        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
          throw new Error('Build request failed.');
@@ -109,6 +113,13 @@ export async function prepareBuildRequestForPlatformAsync<
            'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
          );
          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED'
+        ) {
+          Log.error(
+            'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
+          );
+          throw new Error('Build request failed.');
        } else if (
          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
        ) {
@@ -148,7 +159,10 @@ async function uploadProjectAsync<TPlatform extends Platform>(
              `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
                projectTarball.size
              )})`,
-            completedMessage: `Uploaded to EAS`,
+            completedMessage: (duration: string) =>
+              `Uploaded to EAS ${chalk.dim(duration)} ${learnMore(
+                'https://expo.fyi/eas-build-archive'
+              )}`,
          })
        );
        return bucketKey;
@@ -170,7 +184,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
  builder: Builder<TPlatform, Credentials, TJob>,
  job: TJob,
  metadata: Metadata
-): Promise<string> {
+): Promise<BuildFragment> {
  const { ctx } = builder;
  return await withAnalyticsAsync(
    async () => {
@@ -179,13 +193,13 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
      }

      const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
-        ctx.commandCtx.projectId,
+        ctx.projectId,
        job,
        metadata
      );

      printDeprecationWarnings(deprecationInfo);
-      return build.id;
+      return build;
    },
    {
      successEvent: Event.BUILD_REQUEST_SUCCESS,
@@ -207,7 +221,7 @@ async function withAnalyticsAsync<Result>(
    const result = await fn();
    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
    return result;
-  } catch (error) {
+  } catch (error: any) {
    Analytics.logEvent(analytics.failureEvent, {
      ...analytics.trackingCtx,
      reason: error.message,
@@ -267,3 +281,98 @@ async function reviewAndCommitChangesAsync(
    });
  }
 }
+
+export async function waitForBuildEndAsync(
+  buildIds: string[],
+  { timeoutSec = 3600, intervalSec = 30 } = {}
+): Promise<(BuildFragment | null)[]> {
+  Log.log(
+    `Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`
+  );
+  const spinner = ora().start();
+  let time = new Date().getTime();
+  const endTime = time + timeoutSec * 1000;
+  while (time <= endTime) {
+    const builds: (BuildFragment | null)[] = await Promise.all(
+      buildIds.map(async buildId => {
+        try {
+          return await BuildQuery.byIdAsync(buildId, { useCache: false });
+        } catch (err) {
+          return null;
+        }
+      })
+    );
+    if (builds.length === 1) {
+      const build = nullthrows(builds[0]);
+      switch (build.status) {
+        case BuildStatus.Finished:
+          spinner.succeed('Build finished');
+          return builds;
+        case BuildStatus.New:
+          spinner.text = 'Build created';
+          break;
+        case BuildStatus.InQueue:
+          spinner.text = 'Build queued...';
+          break;
+        case BuildStatus.Canceled:
+          spinner.text = 'Build canceled';
+          spinner.stopAndPersist();
+          return builds;
+        case BuildStatus.InProgress:
+          spinner.text = 'Build in progress...';
+          break;
+        case BuildStatus.Errored:
+          spinner.fail('Build failed');
+          if (build.error) {
+            return builds;
+          } else {
+            throw new Error(`Standalone build failed!`);
+          }
+        default:
+          spinner.warn('Unknown status.');
+          throw new Error(`Unknown status: ${builds} - aborting!`);
+      }
+    } else {
+      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
+        spinner.succeed('All builds have finished');
+        return builds;
+      } else if (
+        builds.filter(build =>
+          build?.status
+            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
+                build.status
+              )
+            : false
+        ).length === builds.length
+      ) {
+        spinner.fail('Some of the builds were canceled or failed.');
+        return builds;
+      } else {
+        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
+        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
+        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
+        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
+        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
+        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
+        const unknownState = builds.length - newBuilds - inQueue - inProgress - errored - finished;
+        spinner.text = [
+          newBuilds && `Builds created: ${newBuilds}`,
+          inQueue && `Builds in queue: ${inQueue}`,
+          inProgress && `Builds in progress: ${inProgress}`,
+          canceled && `Builds canceled: ${canceled}`,
+          errored && chalk.red(`Builds failed: ${errored}`),
+          finished && chalk.green(`Builds finished: ${finished}`),
+          unknownState && chalk.red(`Builds in unknown state: ${unknownState}`),
+        ]
+          .filter(i => i)
+          .join('\t');
+      }
+    }
+    time = new Date().getTime();
+    await sleep(intervalSec * 1000);
+  }
+  spinner.warn('Timed out');
+  throw new Error(
+    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
+  );
+}
@@ -1,12 +1,13 @@
 import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJsonReader } from '@expo/eas-json';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
+import chalk from 'chalk';
 import fs from 'fs-extra';
-import path from 'path';

-import Log from '../log';
+import Log, { learnMore } from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
-import { promptAsync } from '../prompts';
+import { confirmAsync, promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
 import vcs from '../vcs';
 import { configureAndroidAsync } from './android/configure';
@@ -21,6 +22,37 @@ const configureCommitMessage = {
  [RequestedPlatform.All]: 'Configure EAS Build',
 };

+export async function ensureProjectConfiguredAsync(
+  projectDir: string,
+  requestedPlatform: RequestedPlatform
+): Promise<void> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
+    return;
+  }
+
+  const message = 'This project is not configured to build with EAS. Set it up now?';
+  const confirm = await confirmAsync({ message });
+  if (confirm) {
+    await configureAsync({
+      projectDir,
+      platform: requestedPlatform,
+    });
+    if (await vcs.hasUncommittedChangesAsync()) {
+      error(
+        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
+        { exit: 1 }
+      );
+    }
+  } else {
+    error(
+      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
+        'https://docs.expo.dev/build/eas-json'
+      )})`,
+      { exit: 1 }
+    );
+  }
+}
+
 export async function configureAsync(options: {
  platform: RequestedPlatform;
  projectDir: string;
@@ -63,95 +95,56 @@ export async function configureAsync(options: {
  }
 }

-const ANDROID_MANAGED_DEFAULTS = {
-  release: {
-    buildType: 'app-bundle',
+const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+  build: {
+    release: {},
+    development: {
+      developmentClient: true,
+      distribution: 'internal',
+    },
  },
-  development: {
-    buildType: 'development-client',
-    distribution: 'internal',
-  },
-};
-const ANDROID_GENERIC_DEFAULTS = {
-  release: {
-    gradleCommand: ':app:bundleRelease',
-  },
-  development: {
-    gradleCommand: ':app:assembleDebug',
-    distribution: 'internal',
+  submit: {
+    release: {},
  },
 };

-const IOS_MANAGED_DEFAULTS = {
-  release: {
-    buildType: 'release',
+const EAS_JSON_GENERIC_DEFAULT: EasJson = {
+  build: {
+    release: {},
+    development: {
+      distribution: 'internal',
+      android: {
+        gradleCommand: ':app:assembleDebug',
+      },
+      ios: {
+        buildConfiguration: 'Debug',
+      },
+    },
  },
-  development: {
-    buildType: 'development-client',
-    distribution: 'internal',
-  },
-};
-
-const IOS_GENERIC_DEFAULTS = {
-  release: {
-    schemeBuildConfiguration: 'Release',
-  },
-  development: {
-    schemeBuildConfiguration: 'Debug',
-    distribution: 'internal',
+  submit: {
+    release: {},
  },
 };

 export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
-  const easJsonPath = path.join(ctx.projectDir, 'eas.json');
-  let existingEasJson;
+  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);

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

-    existingEasJson = await reader.readRawAsync();
    Log.withTick('Validated eas.json');
-
-    // If we have already populated eas.json with the default fields for the
-    // platform then proceed
-    if (ctx.requestedPlatform !== 'all' && existingEasJson.builds[ctx.requestedPlatform]) {
-      return;
-    } else if (
-      ctx.requestedPlatform === 'all' &&
-      existingEasJson.builds.ios &&
-      existingEasJson.builds.android
-    ) {
-      return;
-    }
+    return;
  }

-  const shouldInitIOS =
-    ['all', 'ios'].includes(ctx.requestedPlatform) && !existingEasJson?.builds.ios;
-  const shouldInitAndroid =
-    ['all', 'android'].includes(ctx.requestedPlatform) && !existingEasJson?.builds.android;
-
-  const easJson = {
-    builds: {
-      ...existingEasJson?.builds,
-      ...(shouldInitAndroid
-        ? {
-            android: ctx.hasAndroidNativeProject
-              ? ANDROID_GENERIC_DEFAULTS
-              : ANDROID_MANAGED_DEFAULTS,
-          }
-        : null),
-      ...(shouldInitIOS
-        ? {
-            ios: ctx.hasIosNativeProject ? IOS_GENERIC_DEFAULTS : IOS_MANAGED_DEFAULTS,
-          }
-        : null),
-    },
-  };
+  const easJson =
+    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+      ? EAS_JSON_GENERIC_DEFAULT
+      : EAS_JSON_MANAGED_DEFAULT;

  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
  await vcs.trackFileAsync(easJsonPath);
-  Log.withTick(`${existingEasJson ? 'Updated' : 'Generated'} eas.json`);
+  Log.withTick('Generated eas.json');
 }

 enum ShouldCommitChanges {
@@ -1,4 +1,3 @@
-import { AppPlatform } from '../graphql/generated';
 import { RequestedPlatform } from './types';

 export const requestedPlatformDisplayNames: Record<RequestedPlatform, string> = {
@@ -6,13 +5,3 @@ export const requestedPlatformDisplayNames: Record<RequestedPlatform, string> =
  [RequestedPlatform.Android]: 'Android',
  [RequestedPlatform.All]: 'Android and iOS',
 };
-
-export const appPlatformDisplayNames: Record<AppPlatform, string> = {
-  [AppPlatform.Android]: 'Android',
-  [AppPlatform.Ios]: 'iOS',
-};
-
-export const appPlatformEmojis = {
-  [AppPlatform.Ios]: '🍎',
-  [AppPlatform.Android]: '🤖',
-};
@@ -1,78 +1,19 @@
 import { ExpoConfig } from '@expo/config';
-import { Workflow } from '@expo/eas-build-job';
-import { AndroidBuildProfile, EasConfig, IosBuildProfile } from '@expo/eas-json';
+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 { getProjectAccountName } from '../project/projectUtils';
+import { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { findAccountByName } from '../user/Account';
 import { Actor } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
-import { Platform, RequestedPlatform, TrackingContext } from './types';
+import { RequestedPlatform, TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';

-export interface CommandContext {
-  requestedPlatform: RequestedPlatform;
-  profile: string;
-  projectDir: string;
-  projectId: string;
-  user: Actor;
-  accountName: string;
-  projectName: string;
-  exp: ExpoConfig;
-  nonInteractive: boolean;
-  local: boolean;
-  clearCache: boolean;
-  skipProjectConfiguration: boolean;
-  waitForBuildEnd: boolean;
-}
-
-export async function createCommandContextAsync({
-  requestedPlatform,
-  profile,
-  exp,
-  projectDir,
-  projectId,
-  nonInteractive = false,
-  local,
-  clearCache = false,
-  skipProjectConfiguration = false,
-  waitForBuildEnd,
-}: {
-  requestedPlatform: RequestedPlatform;
-  profile: string;
-  exp: ExpoConfig;
-  projectId: string;
-  projectDir: string;
-  nonInteractive: boolean;
-  local: boolean;
-  clearCache: boolean;
-  skipProjectConfiguration: boolean;
-  waitForBuildEnd: boolean;
-}): Promise<CommandContext> {
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-
-  return {
-    requestedPlatform,
-    profile,
-    projectDir,
-    projectId,
-    user,
-    accountName,
-    projectName,
-    exp,
-    nonInteractive,
-    local,
-    clearCache,
-    skipProjectConfiguration,
-    waitForBuildEnd,
-  };
-}
-
 export interface ConfigureContext {
  user: Actor;
  projectDir: string;
@@ -84,56 +25,83 @@ export interface ConfigureContext {
  hasIosNativeProject: boolean;
 }

-type PlatformBuildProfile<T extends Platform> = T extends Platform.ANDROID
-  ? AndroidBuildProfile
-  : IosBuildProfile;
-
 export interface BuildContext<T extends Platform> {
-  commandCtx: CommandContext;
-  trackingCtx: TrackingContext;
+  accountName: string;
+  buildProfile: BuildProfile<T>;
+  buildProfileName: string;
+  clearCache: boolean;
+  exp: ExpoConfig;
+  local: boolean;
+  nonInteractive: boolean;
  platform: T;
-  buildProfile: PlatformBuildProfile<T>;
+  projectDir: string;
+  projectId: string;
+  projectName: string;
+  skipProjectConfiguration: boolean;
+  trackingCtx: TrackingContext;
+  user: Actor;
  workflow: Workflow;
 }

 export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
  platform,
-  easConfig,
-  commandCtx,
+  projectDir,
+  skipProjectConfiguration = false,
 }: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
  platform: T;
-  easConfig: EasConfig;
-  commandCtx: CommandContext;
+  projectDir: string;
+  skipProjectConfiguration: boolean;
 }): Promise<BuildContext<T>> {
-  const buildProfile = easConfig.builds[platform] as PlatformBuildProfile<T> | undefined;
-  if (!buildProfile) {
-    throw new Error(`${platform} build profile does not exist`);
-  }
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });

-  const workflow = await resolveWorkflowAsync(commandCtx.projectDir, platform);
-  const accountId = findAccountByName(commandCtx.user.accounts, commandCtx.accountName)?.id;
+  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 devClientProperties = getDevClientEventProperties({
    platform,
-    projectDir: commandCtx.projectDir,
+    projectDir,
    buildProfile,
-    workflow,
  });
  const trackingCtx = {
    tracking_id: uuidv4(),
    platform,
    ...(accountId && { account_id: accountId }),
-    account_name: commandCtx.accountName,
-    project_id: commandCtx.projectId,
+    account_name: accountName,
+    project_id: projectId,
    project_type: workflow,
    ...devClientProperties,
  };
  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
  return {
-    commandCtx,
-    workflow,
-    trackingCtx,
-    platform,
+    accountName,
    buildProfile,
+    buildProfileName,
+    clearCache,
+    exp,
+    local,
+    nonInteractive,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    skipProjectConfiguration,
+    trackingCtx,
+    user,
+    workflow,
  };
 }

@@ -141,21 +109,19 @@ function getDevClientEventProperties({
  platform,
  projectDir,
  buildProfile,
-  workflow,
 }: {
  platform: Platform;
  projectDir: string;
  buildProfile: AndroidBuildProfile | IosBuildProfile;
-  workflow: Workflow;
 }): 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 && 'schemeBuildConfiguration' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.schemeBuildConfiguration === 'Debug');
-  } else if ('buildType' in buildProfile) {
-    includesDevClient = buildProfile.buildType === 'development-client';
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
  } else {
    includesDevClient = false;
  }
@@ -1,173 +0,0 @@
-import { EasJsonReader } from '@expo/eas-json';
-import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import ora from 'ora';
-
-import { BuildFragment, BuildStatus } from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log from '../log';
-import { sleep } from '../utils/promise';
-import vcs from '../vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { CommandContext } from './context';
-import { prepareIosBuildAsync } from './ios/build';
-import { Platform, RequestedPlatform } from './types';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
-
-export async function buildAsync(commandCtx: CommandContext): Promise<void> {
-  await vcs.ensureRepoExistsAsync();
-  await ensureRepoIsCleanAsync(commandCtx.nonInteractive);
-
-  const scheduledBuilds = await startBuildsAsync(commandCtx);
-  if (commandCtx.local) {
-    return;
-  }
-  Log.newLine();
-  printLogsUrls(commandCtx.accountName, scheduledBuilds);
-  Log.newLine();
-
-  if (commandCtx.waitForBuildEnd) {
-    const builds = await waitForBuildEndAsync(scheduledBuilds.map(i => i.buildId));
-    printBuildResults(commandCtx.accountName, builds);
-    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
-  }
-}
-
-async function startBuildsAsync(
-  commandCtx: CommandContext
-): Promise<{ platform: Platform; buildId: string }[]> {
-  const shouldBuildAndroid = [RequestedPlatform.Android, RequestedPlatform.All].includes(
-    commandCtx.requestedPlatform
-  );
-  const shouldBuildIos = [RequestedPlatform.Ios, RequestedPlatform.All].includes(
-    commandCtx.requestedPlatform
-  );
-  const easConfig = await new EasJsonReader(
-    commandCtx.projectDir,
-    commandCtx.requestedPlatform
-  ).readAsync(commandCtx.profile);
-
-  const builds: {
-    platform: Platform;
-    sendBuildRequestAsync: () => Promise<string | undefined>;
-  }[] = [];
-  if (shouldBuildAndroid) {
-    const sendBuildRequestAsync = await prepareAndroidBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.ANDROID, sendBuildRequestAsync });
-  }
-  if (shouldBuildIos) {
-    const sendBuildRequestAsync = await prepareIosBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.IOS, sendBuildRequestAsync });
-  }
-  return (
-    await Promise.all(
-      builds.map(async ({ platform, sendBuildRequestAsync }) => ({
-        platform,
-        buildId: await sendBuildRequestAsync(),
-      }))
-    )
-  ).filter((build): build is { platform: Platform; buildId: string } => !!build.buildId);
-}
-
-async function waitForBuildEndAsync(
-  buildIds: string[],
-  { timeoutSec = 3600, intervalSec = 30 } = {}
-): Promise<(BuildFragment | null)[]> {
-  Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
-  const spinner = ora().start();
-  let time = new Date().getTime();
-  const endTime = time + timeoutSec * 1000;
-  while (time <= endTime) {
-    const builds: (BuildFragment | null)[] = await Promise.all(
-      buildIds.map(async buildId => {
-        try {
-          return await BuildQuery.byIdAsync(buildId, { useCache: false });
-        } catch (err) {
-          return null;
-        }
-      })
-    );
-    if (builds.length === 1) {
-      const build = nullthrows(builds[0]);
-      switch (build.status) {
-        case BuildStatus.Finished:
-          spinner.succeed('Build finished');
-          return builds;
-        case BuildStatus.New:
-          spinner.text = 'Build created';
-          break;
-        case BuildStatus.InQueue:
-          spinner.text = 'Build queued...';
-          break;
-        case BuildStatus.Canceled:
-          spinner.text = 'Build canceled';
-          spinner.stopAndPersist();
-          return builds;
-        case BuildStatus.InProgress:
-          spinner.text = 'Build in progress...';
-          break;
-        case BuildStatus.Errored:
-          spinner.fail('Build failed');
-          if (build.error) {
-            return builds;
-          } else {
-            throw new Error(`Standalone build failed!`);
-          }
-        default:
-          spinner.warn('Unknown status.');
-          throw new Error(`Unknown status: ${builds} - aborting!`);
-      }
-    } else {
-      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
-        spinner.succeed('All builds have finished');
-        return builds;
-      } else if (
-        builds.filter(build =>
-          build?.status
-            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
-                build.status
-              )
-            : false
-        ).length === builds.length
-      ) {
-        spinner.fail('Some of the builds were canceled or failed.');
-        return builds;
-      } else {
-        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
-        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknownState = builds.length - inQueue - inProgress - errored - finished;
-        spinner.text = [
-          newBuilds && `Builds created: ${newBuilds}`,
-          inQueue && `Builds in queue: ${inQueue}`,
-          inProgress && `Builds in progress: ${inProgress}`,
-          canceled && `Builds canceled: ${canceled}`,
-          errored && chalk.red(`Builds failed: ${errored}`),
-          finished && chalk.green(`Builds finished: ${finished}`),
-          unknownState && chalk.red(`Builds in unknown state: ${unknownState}`),
-        ]
-          .filter(i => i)
-          .join('\t');
-      }
-    }
-    time = new Date().getTime();
-    await sleep(intervalSec * 1000);
-  }
-  spinner.warn('Timed out');
-  throw new Error(
-    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
-  );
-}
-
-function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
-  const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
-    i => i.status === BuildStatus.Errored
-  );
-  if (failedBuilds.length > 0) {
-    process.exit(1);
-  }
-}
@@ -2,6 +2,7 @@ import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-

 import {
  BuildCredentialsSource,
+  BuildIosEnterpriseProvisioning,
  BuildMetadataInput,
  BuildWorkflow,
  DistributionType,
@@ -32,6 +33,9 @@ export function transformMetadata(metadata: Metadata): BuildMetadataInput {
      metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
    distribution: metadata.distribution && transformDistribution(metadata.distribution),
    workflow: metadata.workflow && transformWorkflow(metadata.workflow),
+    iosEnterpriseProvisioning:
+      metadata.iosEnterpriseProvisioning &&
+      transformIosEnterpriseProvisioning(metadata.iosEnterpriseProvisioning),
  };
 }

@@ -62,3 +66,13 @@ export function transformWorkflow(workflow: Workflow): BuildWorkflow {
    return BuildWorkflow.Managed;
  }
 }
+
+export function transformIosEnterpriseProvisioning(
+  enterpriseProvisioning: Metadata['iosEnterpriseProvisioning']
+): BuildIosEnterpriseProvisioning {
+  if (enterpriseProvisioning === 'adhoc') {
+    return BuildIosEnterpriseProvisioning.Adhoc;
+  } else {
+    return BuildIosEnterpriseProvisioning.Universal;
+  }
+}
@@ -149,7 +149,7 @@ describe(readBuildNumberAsync, () => {
  describe('generic project', () => {
    it('reads the build number from native code', async () => {
      const exp = initGenericProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -157,7 +157,7 @@ describe(readBuildNumberAsync, () => {
  describe('managed project', () => {
    it('reads the build number from expo config', async () => {
      const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -167,21 +167,33 @@ describe(readShortVersionAsync, () => {
  describe('generic project', () => {
    it('reads the short version from native code', async () => {
      const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp);
+      const shortVersion = await readShortVersionAsync('/repo', exp, {});
      expect(shortVersion).toBe('1.0.0');
    });
+    it('evaluates interpolated build number', async () => {
+      const exp = initGenericProject({
+        shortVersion: '$(CURRENT_PROJECT_VERSION)',
+      });
+      const buildNumber = await readShortVersionAsync('/repo', exp, {
+        CURRENT_PROJECT_VERSION: '1.0.0',
+      });
+      expect(buildNumber).toBe('1.0.0');
+    });
  });

  describe('managed project', () => {
    it('reads the version from app config', async () => {
      const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp);
+      const shortVersion = await readShortVersionAsync('/repo', exp, {});
      expect(shortVersion).toBe('1.0.0');
    });
  });
 });

-function initGenericProject(): ExpoConfig {
+function initGenericProject({
+  shortVersion = '1.0.0',
+  version = '1',
+}: { shortVersion?: string; version?: string } = {}): ExpoConfig {
  vol.fromJSON(
    {
      './app.json': JSON.stringify({
@@ -197,9 +209,9 @@ function initGenericProject(): ExpoConfig {
 <plist version="1.0">
 <dict>
  <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>${shortVersion}</string>
  <key>CFBundleVersion</key>
-  <string>1</string>
+  <string>${version}</string>
 </dict>
 </plist>`,
    },
@@ -1,66 +1,74 @@
-import { Ios, Job, Metadata, Workflow } from '@expo/eas-build-job';
-import { EasConfig } from '@expo/eas-json';
+import { IOSConfig } from '@expo/config-plugins';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';

 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
-import { resolveTargetsAsync } from '../../project/ios/target';
-import { JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommandContext, createBuildContextAsync } from '../context';
+import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
+import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { Platform } from '../types';
+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';

 export async function prepareIosBuildAsync(
-  commandCtx: CommandContext,
-  easConfig: EasConfig
-): Promise<() => Promise<string | undefined>> {
-  const buildCtx = await createBuildContextAsync<Platform.IOS>({
-    commandCtx,
-    platform: Platform.IOS,
-    easConfig,
-  });
-  const { buildProfile } = buildCtx;
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
+  const { buildProfile } = ctx;

-  if (buildCtx.workflow === Workflow.MANAGED) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(
-      commandCtx.projectDir,
-      commandCtx.exp
-    );
+  if (ctx.workflow === Workflow.MANAGED) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
  }

+  checkNodeEnvVariable(ctx);
+  await checkGoogleServicesFileAsync(ctx);
+
  const xcodeBuildContext = await resolveXcodeBuildContextAsync(
    {
-      projectDir: commandCtx.projectDir,
-      nonInteractive: commandCtx.nonInteractive,
-      exp: commandCtx.exp,
+      projectDir: ctx.projectDir,
+      nonInteractive: ctx.nonInteractive,
+      exp: ctx.exp,
    },
    buildProfile
  );
  const targets = await resolveTargetsAsync(
    {
-      projectDir: commandCtx.projectDir,
-      exp: commandCtx.exp,
+      projectDir: ctx.projectDir,
+      exp: ctx.exp,
    },
    xcodeBuildContext
  );

  return await prepareBuildRequestForPlatformAsync({
-    ctx: buildCtx,
+    ctx,
    ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
      return ensureIosCredentialsAsync(ctx, targets);
    },
    ensureProjectConfiguredAsync: async () => {
      await validateAndSyncProjectConfigurationAsync({
-        projectDir: commandCtx.projectDir,
-        exp: commandCtx.exp,
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
        buildProfile,
      });
    },
+    getMetadataContext: (): IosMetadataContext => {
+      if (ctx.workflow === Workflow.MANAGED) {
+        return { buildSettings: {} };
+      }
+      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 };
+    },
    prepareJobAsync: async (
      ctx: BuildContext<Platform.IOS>,
      jobData: JobData<IosCredentials>
@@ -38,7 +38,7 @@ export async function validateAndSyncProjectConfigurationAsync({
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  const { autoIncrement } = buildProfile;
-  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement);
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
@@ -1,3 +1,5 @@
+import { Platform } from '@expo/eas-build-job';
+
 import { createCredentialsContextAsync } from '../../credentials/context';
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
 import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
@@ -5,7 +7,6 @@ import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/ent
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 import { logCredentialsSource } from '../utils/credentials';

 export async function ensureIosCredentialsAsync(
@@ -16,20 +17,16 @@ export async function ensureIosCredentialsAsync(
    return;
  }

-  const { projectDir } = buildCtx.commandCtx;
-
-  const ctx = await createCredentialsContextAsync(projectDir, {
-    nonInteractive: buildCtx.commandCtx.nonInteractive,
+  const credentialsCtx = await createCredentialsContextAsync(buildCtx.projectDir, {
+    exp: buildCtx.exp,
+    nonInteractive: buildCtx.nonInteractive,
  });

-  const provider = new IosCredentialsProvider(ctx, {
-    app: getAppFromContext(ctx),
+  const provider = new IosCredentialsProvider(credentialsCtx, {
+    app: getAppFromContext(credentialsCtx),
    targets,
    iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(
-        buildCtx.commandCtx.projectDir,
-        buildCtx.workflow
-      ),
+      entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
    },
    distribution: buildCtx.buildProfile.distribution ?? 'store',
    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
@@ -45,5 +42,5 @@ export async function ensureIosCredentialsAsync(
 }

 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  return buildCtx.buildProfile.distribution !== 'simulator';
+  return !buildCtx.buildProfile.simulator;
 }
@@ -1,4 +1,4 @@
-import { ArchiveSource, Ios, Job, sanitizeJob } from '@expo/eas-build-job';
+import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
 import semver from 'semver';

@@ -7,7 +7,6 @@ import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import vcs from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';

 interface JobData {
  projectArchive: ArchiveSource;
@@ -15,13 +14,18 @@ interface JobData {
  buildScheme: string;
 }

+const cacheDefaults = {
+  disabled: false,
+  customPaths: [],
+  cacheDefaultPaths: true,
+};
+
 export async function prepareJobAsync(
  ctx: BuildContext<Platform.IOS>,
  jobData: JobData
 ): Promise<Job> {
-  const projectRootDirectory =
-    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
-  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
+  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
  if (jobData.credentials) {
    const targetNames = Object.keys(jobData.credentials);
@@ -30,12 +34,12 @@ export async function prepareJobAsync(
    }
  }

-  const job = {
+  const job: Ios.Job = {
    type: ctx.workflow,
    platform: Platform.IOS,
    projectArchive: jobData.projectArchive,
    projectRootDirectory,
-    distribution: ctx.buildProfile.distribution,
+    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
    builderEnvironment: {
      image: resolveImage(ctx),
      node: ctx.buildProfile.node,
@@ -47,8 +51,9 @@ export async function prepareJobAsync(
      env: ctx.buildProfile.env,
    },
    cache: {
+      ...cacheDefaults,
      ...ctx.buildProfile.cache,
-      clear: ctx.commandCtx.clearCache,
+      clear: ctx.clearCache,
    },
    secrets: {
      buildCredentials,
@@ -57,20 +62,21 @@ export async function prepareJobAsync(
    updates: { channel: ctx.buildProfile.channel },

    scheme: jobData.buildScheme,
-    buildConfiguration: ctx.buildProfile.schemeBuildConfiguration,
+    buildConfiguration: ctx.buildProfile.buildConfiguration,
    artifactPath: ctx.buildProfile.artifactPath,

-    buildType: ctx.buildProfile.buildType,
+    buildType: ctx.buildProfile.developmentClient
+      ? Ios.BuildType.DEVELOPMENT_CLIENT
+      : Ios.BuildType.RELEASE,
    username,
  };
-
  return sanitizeJob(job);
 }

 function resolveImage(ctx: BuildContext<Platform.IOS>): Ios.BuilderEnvironment['image'] {
  // see https://linear.app/expo/issue/ENG-1396/make-default-image-dependent-on-sdk-version
-  if (!ctx.buildProfile.image && ctx.commandCtx.exp.sdkVersion) {
-    const majorSdkVersion = semver.major(ctx.commandCtx.exp.sdkVersion);
+  if (!ctx.buildProfile.image && ctx.exp.sdkVersion) {
+    const majorSdkVersion = semver.major(ctx.exp.sdkVersion);
    if (majorSdkVersion <= 41) {
      return 'macos-catalina-10.15-xcode-12.4';
    }
@@ -4,11 +4,13 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
+import type { XCBuildConfiguration } from 'xcode';

 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { evaluateString } from '../utils/template';
 import { readPlistAsync, writePlistAsync } from './plist';

 export enum BumpStrategy {
@@ -104,12 +106,16 @@ export async function bumpVersionInAppJsonAsync({

 export async function readShortVersionAsync(
  projectDir: string,
-  exp: ExpoConfig
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleShortVersionString;
+    return (
+      infoPlist.CFBundleShortVersionString &&
+      evaluateString(infoPlist.CFBundleShortVersionString, buildSettings)
+    );
  } else {
    return exp.version;
  }
@@ -117,12 +123,13 @@ export async function readShortVersionAsync(

 export async function readBuildNumberAsync(
  projectDir: string,
-  exp: ExpoConfig
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleVersion;
+    return infoPlist.CFBundleVersion && evaluateString(infoPlist.CFBundleVersion, buildSettings);
  } else {
    return IOSConfig.Version.getBuildNumber(exp);
  }
@@ -18,7 +18,7 @@ export async function runLocalBuildAsync(job: Job): Promise<void> {
    await spawnAsync(execNameOrPath, [arg], {
      stdio: 'inherit',
    });
-  } catch (err) {
+  } catch (err: any) {
    if (err.code === 'ENOENT') {
      Log.warn(`Could not resolve executable ${execNameOrPath}.`);
      Log.warn(
@@ -1,5 +1,6 @@
-import { Metadata } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { IosEnterpriseProvisioning } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';

 import { getApplicationIdAsync } from '../project/android/applicationId';
 import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
@@ -17,7 +18,6 @@ import {
  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from './ios/UpdatesModule';
 import { readBuildNumberAsync, readShortVersionAsync } from './ios/version';
-import { Platform } from './types';
 import { isExpoUpdatesInstalled } from './utils/updates';

 /**
@@ -27,50 +27,69 @@ import { isExpoUpdatesInstalled } from './utils/updates';
 */
 const packageJSON = require('../../package.json');

+export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
+  ? object
+  : IosMetadataContext;
+
+export interface IosMetadataContext {
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}
+
 export async function collectMetadata<T extends Platform>(
  ctx: BuildContext<T>,
-  {
-    credentialsSource,
-  }: {
-    credentialsSource?: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
-  }
+  platformContext?: MetadataContext<T>
 ): Promise<Metadata> {
  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
-  return {
+  const distribution =
+    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
+      ? 'simulator'
+      : ctx.buildProfile.distribution) ?? 'store';
+  const metadata = {
    trackingContext: ctx.trackingCtx,
-    appVersion: await resolveAppVersionAsync(ctx),
-    appBuildVersion: await resolveAppBuildVersionAsync(ctx),
+    appVersion: await resolveAppVersionAsync(ctx, platformContext),
+    appBuildVersion: await resolveAppBuildVersionAsync(ctx, platformContext),
    cliVersion: packageJSON.version,
    workflow: ctx.workflow,
-    credentialsSource,
-    sdkVersion: ctx.commandCtx.exp.sdkVersion,
+    credentialsSource: ctx.buildProfile.credentialsSource,
+    sdkVersion: ctx.exp.sdkVersion,
+    runtimeVersion: ctx.exp.runtimeVersion,
    ...channelOrReleaseChannel,
-    distribution: ctx.buildProfile.distribution ?? 'store',
-    appName: ctx.commandCtx.exp.name,
+    distribution,
+    appName: ctx.exp.name,
    appIdentifier: await resolveAppIdentifierAsync(ctx),
-    buildProfile: ctx.commandCtx.profile,
+    buildProfile: ctx.buildProfileName,
    gitCommitHash: await vcs.getCommitHashAsync(),
-    username: getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync()),
+    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    ...(ctx.platform === Platform.IOS && {
+      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
+        ctx as BuildContext<Platform.IOS>
+      ),
+    }),
  };
+  return sanitizeMetadata(metadata);
 }

 async function resolveAppVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: BuildContext<T>,
+  platformContext?: MetadataContext<T>
 ): Promise<string | undefined> {
  if (ctx.platform === Platform.IOS) {
-    return await readShortVersionAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    const iosContext = platformContext as IosMetadataContext | undefined;
+    return await readShortVersionAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
  } else {
-    return await readVersionNameAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    return await readVersionNameAsync(ctx.projectDir, ctx.exp);
  }
 }

 async function resolveAppBuildVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: BuildContext<T>,
+  platformContext?: MetadataContext<T>
 ): Promise<string | undefined> {
  if (ctx.platform === Platform.IOS) {
-    return await readBuildNumberAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    const iosContext = platformContext as IosMetadataContext | undefined;
+    return await readBuildNumberAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
  } else {
-    const versionCode = await readVersionCodeAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    const versionCode = await readVersionCodeAsync(ctx.projectDir, ctx.exp);
    return versionCode !== undefined ? String(versionCode) : undefined;
  }
 }
@@ -79,16 +98,16 @@ async function resolveAppIdentifierAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<string> {
  if (ctx.platform === Platform.IOS) {
-    return await getBundleIdentifierAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
  } else {
-    return await getApplicationIdAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    return await getApplicationIdAsync(ctx.projectDir, ctx.exp);
  }
 }

 async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<{ channel: string } | { releaseChannel: string } | null> {
-  if (!isExpoUpdatesInstalled(ctx.commandCtx.projectDir)) {
+  if (!isExpoUpdatesInstalled(ctx.projectDir)) {
    return null;
  }
  if (ctx.buildProfile.channel) {
@@ -110,10 +129,10 @@ async function getNativeReleaseChannelAsync<T extends Platform>(
 ): Promise<string> {
  switch (ctx.platform) {
    case Platform.ANDROID: {
-      return (await readAndroidReleaseChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? 'default';
+      return (await readAndroidReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
    }
    case Platform.IOS: {
-      return (await readIosReleaseChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? 'default';
+      return (await readIosReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
    }
    default:
      return 'default';
@@ -125,12 +144,18 @@ async function getNativeChannelAsync<T extends Platform>(
 ): Promise<string | undefined> {
  switch (ctx.platform) {
    case Platform.ANDROID: {
-      return (await readAndroidChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? undefined;
+      return (await readAndroidChannelSafelyAsync(ctx.projectDir)) ?? undefined;
    }
    case Platform.IOS: {
-      return (await readIosChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? undefined;
+      return (await readIosChannelSafelyAsync(ctx.projectDir)) ?? undefined;
    }
  }

  return undefined;
 }
+
+function resolveIosEnterpriseProvisioning(
+  ctx: BuildContext<Platform.IOS>
+): IosEnterpriseProvisioning | undefined {
+  return ctx.buildProfile.enterpriseProvisioning;
+}
@@ -1,5 +1,3 @@
-export { Platform } from '@expo/eas-build-job';
-
 export enum RequestedPlatform {
  Android = 'android',
  Ios = 'ios',
@@ -15,4 +13,10 @@ export enum BuildStatus {
  CANCELED = 'canceled',
 }

+export enum BuildDistributionType {
+  STORE = 'store',
+  INTERNAL = 'internal',
+  SIMULATOR = 'simulator',
+}
+
 export type TrackingContext = Record<string, string | number | boolean>;
@@ -18,6 +18,8 @@ export enum Event {
  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
+
+  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
 }

 export default {
@@ -7,9 +7,10 @@ import { requestedPlatformDisplayNames } from '../constants';

 export function logCredentialsSource(credentialsSource: CredentialsSource, platform: Platform) {
  let message = `Using ${credentialsSource} ${requestedPlatformDisplayNames[platform]} credentials`;
-  if (credentialsSource === CredentialsSource.LOCAL)
+  if (credentialsSource === CredentialsSource.LOCAL) {
    message += ` ${chalk.dim('(credentials.json)')}`;
-  else if (credentialsSource === CredentialsSource.REMOTE)
+  } else if (credentialsSource === CredentialsSource.REMOTE) {
    message += ` ${chalk.dim('(Expo server)')}`;
+  }
  Log.succeed(message);
 }
@@ -1,14 +1,17 @@
 import chalk from 'chalk';

-import { BuildFragment, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus as GraphQLBuildStatus,
+} from '../../graphql/generated';
+import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
-import { appPlatformDisplayNames } from '../constants';
 import { getBuildLogsUrl } from './url';

 export function formatGraphQLBuild(build: BuildFragment) {
  const actor = getActorName(build);
-  const account = build.project.__typename === 'App' ? build.project.ownerAccount.name : 'unknown';
-  const fields: { label: string; value: string }[] = [
+  const fields: { label: string; value?: string | null }[] = [
    { label: 'ID', value: build.id },
    {
      label: 'Platform',
@@ -37,15 +40,43 @@ export function formatGraphQLBuild(build: BuildFragment) {
    },
    {
      label: 'Distribution',
-      value: build.distribution?.toLowerCase() ?? chalk.gray('unknown'),
+      value: build.distribution?.toLowerCase(),
+    },
+    {
+      label: 'Enterprise Provisioning',
+      value: build.iosEnterpriseProvisioning?.toLowerCase(),
    },
    {
      label: 'Release Channel',
-      value: build.releaseChannel ?? chalk.gray('unknown'),
+      value: build.releaseChannel,
+    },
+    {
+      label: 'Channel',
+      value: build.channel,
+    },
+    {
+      label: 'SDK Version',
+      value: build.sdkVersion,
+    },
+    {
+      label: 'Runtime Version',
+      value: build.runtimeVersion,
+    },
+    {
+      label: 'Version',
+      value: build.appVersion,
+    },
+    {
+      label: build.platform === AppPlatform.Android ? 'Version code' : 'Build number',
+      value: build.appBuildVersion,
+    },
+    {
+      label: 'Commit',
+      value: build.gitCommitHash,
    },
    {
      label: 'Logs',
-      value: getBuildLogsUrl({ buildId: build.id, account }),
+      value: getBuildLogsUrl(build),
    },
    {
      label: 'Artifact',
@@ -57,13 +88,13 @@ export function formatGraphQLBuild(build: BuildFragment) {
            return '<in progress>';
          case GraphQLBuildStatus.Canceled:
          case GraphQLBuildStatus.Errored:
-            return '---------';
+            return null;
          case GraphQLBuildStatus.Finished: {
            const url = build.artifacts?.buildUrl;
            return url ? url : chalk.red('not found');
          }
          default:
-            return 'unknown';
+            return null;
        }
      },
    },
@@ -81,7 +112,11 @@ export function formatGraphQLBuild(build: BuildFragment) {
    { label: 'Started by', value: actor ?? 'unknown' },
  ];

-  return formatFields(fields);
+  const filteredFields = fields.filter(({ value }) => value !== undefined && value !== null) as {
+    label: string;
+    value: string;
+  }[];
+  return formatFields(filteredFields);
 }

 const getActorName = (build: BuildFragment): string => {
@@ -4,6 +4,7 @@ import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';

 import {
+  AppPlatform,
  BuildError,
  BuildFragment,
  BuildStatus,
@@ -12,51 +13,39 @@ import {
  EasBuildDeprecationInfoType,
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
-import {
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  requestedPlatformDisplayNames,
-} from '../constants';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

-export function printLogsUrls(
-  accountName: string,
-  builds: { platform: 'android' | 'ios'; buildId: string }[]
-): void {
+export function printLogsUrls(builds: BuildFragment[]): void {
  if (builds.length === 1) {
-    const { buildId } = builds[0];
-    const logsUrl = getBuildLogsUrl({
-      buildId,
-      account: accountName,
-    });
-    Log.log(`Build details: ${chalk.underline(logsUrl)}`);
+    Log.log(`Build details: ${chalk.underline(getBuildLogsUrl(builds[0]))}`);
  } else {
-    builds.forEach(({ buildId, platform }) => {
-      const logsUrl = getBuildLogsUrl({
-        buildId,
-        account: accountName,
-      });
+    builds.forEach(build => {
+      const logsUrl = getBuildLogsUrl(build);
      Log.log(
-        `${requestedPlatformDisplayNames[platform]} build details: ${chalk.underline(logsUrl)}`
+        `${appPlatformDisplayNames[build.platform]} build details: ${chalk.underline(logsUrl)}`
      );
    });
  }
 }

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

-function printBuildResult(accountName: string, build: BuildFragment): void {
+function printBuildResult(build: BuildFragment): void {
  Log.addNewLineIfNone();
  if (build.status === BuildStatus.Errored) {
    const userError = build.error;
@@ -80,12 +69,14 @@ function printBuildResult(accountName: string, build: BuildFragment): void {
  }

  if (build.distribution === DistributionType.Internal) {
-    const logsUrl = getBuildLogsUrl({
-      buildId: build.id,
-      account: accountName,
-    });
-    const installUrl = getInternalDistributionInstallUrl(build);
-    qrcodeTerminal.generate(installUrl, code => Log.log(`${indentString(code, 2)}\n`));
+    const logsUrl = getBuildLogsUrl(build);
+    // It's tricky to install the .apk file directly on Android so let's fallback
+    // to the build details page and let people press the button to download there
+    const qrcodeUrl =
+      build.platform === AppPlatform.Ios ? getInternalDistributionInstallUrl(build) : logsUrl;
+    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code =>
+      Log.log(`${indentString(code, 2)}\n`)
+    );
    Log.log(
      `${appPlatformEmojis[build.platform]} Open this link on your ${
        appPlatformDisplayNames[build.platform]
@@ -0,0 +1,5 @@
+import template from 'lodash/template';
+
+export function evaluateString(s: string, vars: Record<string, any>): string {
+  return template(s, { interpolate: /\$\(([\s\S]+?)\)/g })(vars);
+}
@@ -3,14 +3,17 @@ import assert from 'assert';
 import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
 import { AppPlatform, BuildFragment } from '../../graphql/generated';

-export function getBuildLogsUrl({
-  buildId,
-  account,
-}: {
-  buildId: string;
-  account: string;
-}): string {
-  return `${getExpoWebsiteBaseUrl()}/accounts/${account}/builds/${buildId}`;
+export function getProjectDashboardUrl(accountName: string, projectName: string): string {
+  return `${getExpoWebsiteBaseUrl()}/accounts/${accountName}/projects/${projectName}`;
+}
+
+export function getBuildLogsUrl(build: BuildFragment): string {
+  const { project } = build;
+  if (project.__typename === 'App') {
+    return `${getExpoWebsiteBaseUrl()}/accounts/${project.ownerAccount.name}/builds/${build.id}`;
+  } else {
+    return `${getExpoWebsiteBaseUrl()}/builds/${build.id}`;
+  }
 }

 export function getArtifactUrl(artifactId: string): string {
@@ -0,0 +1,52 @@
+import { Platform, Workflow } from '@expo/eas-build-job';
+import fs from 'fs-extra';
+import path from 'path';
+
+import Log, { learnMore } from '../log';
+import vcs from '../vcs';
+import { BuildContext } from './context';
+
+export function checkNodeEnvVariable(ctx: BuildContext<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.'
+    );
+    Log.newLine();
+  }
+}
+
+export async function checkGoogleServicesFileAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<void> {
+  if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
+    return;
+  }
+  const googleServicesFilePath = ctx.exp[ctx.platform]?.googleServicesFile;
+  if (!googleServicesFilePath) {
+    return;
+  }
+  const rootDir = await vcs.getRootPathAsync();
+  const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
+  if (
+    (await fs.pathExists(absGoogleServicesFilePath)) &&
+    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
+      (await vcs.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+  ) {
+    Log.warn(
+      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
+    );
+    Log.warn(
+      `Use EAS Secret to pass all values that you don't want to include in your version control. ${learnMore(
+        'https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables'
+      )}`
+    );
+    Log.warn(
+      'If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.'
+    );
+    Log.newLine();
+  }
+}
+
+function isInsideDirectory(file: string, directory: string): boolean {
+  return file.startsWith(directory);
+}
@@ -5,35 +5,42 @@ import { ensureLoggedInAsync } from '../../user/actions';
 import EasCommand from '../EasCommand';
 import TestEasCommand from './TestEasCommand';

+TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
+
+jest.mock('../../user/User');
+jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
+jest.mock('../../analytics', () => {
+  const { AnalyticsEvent } = jest.requireActual('../../analytics');
+  return {
+    AnalyticsEvent,
+    logEvent: jest.fn(),
+    initAsync: jest.fn(),
+    flushAsync: jest.fn(),
+  };
+});
+
+beforeEach(() => {
+  (getUserAsync as jest.Mock).mockReset().mockImplementation(() => mockJester);
+  (ensureLoggedInAsync as jest.Mock).mockReset().mockImplementation(() => mockJester);
+  (initAsync as jest.Mock).mockReset();
+  (flushAsync as jest.Mock).mockReset();
+  (logEvent as jest.Mock).mockReset();
+});
+
 describe(EasCommand.name, () => {
-  beforeAll(() => {
-    TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
-    jest.mock('../../user/User', () => ({ getUserAsync: jest.fn(() => mockJester) }));
-    jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
-    jest.mock('../../analytics', () => {
-      const { AnalyticsEvent } = jest.requireActual('../../analytics');
-      return {
-        AnalyticsEvent,
-        logEvent: jest.fn(),
-        initAsync: jest.fn(),
-        flushAsync: jest.fn(),
-      };
-    });
-  });
-
-  afterEach(() => {
-    (ensureLoggedInAsync as jest.Mock).mockClear();
-    (initAsync as jest.Mock).mockClear();
-    (flushAsync as jest.Mock).mockClear();
-    (logEvent as jest.Mock).mockClear();
-  });
-
  describe('without exceptions', () => {
+    // The first test in this suite should have an increased timeout
+    // because of the implementation of Command from @oclif/command.
+    // It seems that loading config takes significant amount of time
+    // and I'm not sure how to mock it.
+    //
+    // See https://github.com/oclif/command/blob/master/src/command.ts#L80
+    // and look for "Config.load"
    it('ensures the user is logged in', async () => {
      await TestEasCommand.run();

-      expect(ensureLoggedInAsync).toHaveReturnedWith(mockJester);
-    });
+      expect(ensureLoggedInAsync).toHaveBeenCalled();
+    }, 15_000);

    it('ensures the user data is read from cache', async () => {
      (TestEasCommand.prototype.authValue as jest.Mock).mockImplementationOnce(() => false);
@@ -4,7 +4,7 @@ import Log from '../log';
 import UserSettings from '../user/UserSettings';

 export default class AnalyticsView extends Command {
-  static description = 'View or change analytics settings';
+  static description = 'view or change analytics settings';

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

@@ -1,4 +1,4 @@
-import { getConfig, getDefaultTarget } from '@expo/config';
+import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
 import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
 import { Command, flags } from '@oclif/command';
 import assert from 'assert';
@@ -10,11 +10,13 @@ import ora from 'ora';

 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
-  Actor,
  GetUpdateGroupAsyncQuery,
+  Robot,
  RootQueryUpdatesByGroupArgs,
  Update,
  UpdateInfoGroup,
+  User,
+  ViewBranchQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log from '../../log';
@@ -22,7 +24,7 @@ import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUt
 import {
  PublishPlatform,
  buildBundlesAsync,
-  buildUpdateInfoGroupAsync,
+  buildUnsortedUpdateInfoGroupAsync,
  collectAssets,
  uploadAssetsAsync,
 } from '../../project/publish';
@@ -30,6 +32,7 @@ import { promptAsync, selectAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
 import formatFields from '../../utils/formatFields';
 import vcs from '../../vcs';
+import { createUpdateBranchOnAppAsync } from './create';
 import { listBranchesAsync } from './list';
 import { viewUpdateBranchAsync } from './view';

@@ -63,6 +66,33 @@ async function getUpdateGroupAsync({
  return updatesByGroup;
 }

+async function ensureBranchExists({
+  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 Command {
  static hidden = true;
  static description = 'Publish an update group to a branch.';
@@ -76,7 +106,7 @@ export default class BranchPublish extends Command {

  static flags = {
    message: flags.string({
-      description: 'Short message describing the updates.',
+      description: 'short message describing the updates.',
      required: false,
    }),
    republish: flags.boolean({
@@ -98,7 +128,7 @@ export default class BranchPublish extends Command {
    }),
    platform: flags.enum({
      char: 'p',
-      description: `Only publish to a single platform`,
+      description: `only publish to a single platform`,
      options: [...defaultPublishPlatforms, 'all'],
      default: 'all',
      required: false,
@@ -107,13 +137,19 @@ export default class BranchPublish extends Command {
      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 run() {
    let {
-      args: { name },
+      args: { name: branchName },
      flags: {
        json: jsonFlag,
+        auto: autoFlag,
        message,
        republish,
        group,
@@ -130,33 +166,28 @@ export default class BranchPublish extends Command {
      throw new Error('Please run this command inside a project directory.');
    }

-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    let { runtimeVersion, sdkVersion } = exp;
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+      isPublicConfig: true,
+    });

-    // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
-    // construct the runtimeVersion with special meaning indicating that the runtime is an
-    // Expo SDK preset runtime that can be launched in Expo Go.
-    const isManagedProject = getDefaultTarget(projectDir) === 'managed';
-    if (!runtimeVersion && sdkVersion && isManagedProject) {
-      Log.withTick('Generating runtime version from sdk version');
-      runtimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
-    }
+    const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);

-    if (!runtimeVersion) {
-      throw new Error(
-        "Couldn't find 'runtimeVersion'. Please specify it under the 'expo' key in 'app.json'"
-      );
-    }
    const projectId = await getProjectIdAsync(exp);

-    if (!name) {
+    if (!branchName && autoFlag) {
+      branchName =
+        (await vcs.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 });
-      name = await selectAsync<string>(
+      branchName = await selectAsync<string>(
        'which branch would you like to publish on?',
        branches.map(branch => {
          return {
@@ -167,15 +198,15 @@ export default class BranchPublish extends Command {
          };
        })
      );
+      assert(branchName, 'branch name must be specified.');
    }
-    assert(name, 'branch name must be specified.');

-    const { id: branchId, updates } = await viewUpdateBranchAsync({
+    const { id: branchId, updates } = await ensureBranchExists({
      appId: projectId,
-      name,
+      name: branchName,
    });

-    let updateInfoGroup: UpdateInfoGroup = {};
+    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.
@@ -203,7 +234,7 @@ export default class BranchPublish extends Command {
          }));
        if (updateGroups.length === 0) {
          throw new Error(
-            `There are no updates on branch "${name}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
          );
        }

@@ -219,7 +250,7 @@ export default class BranchPublish extends Command {
      );
      if (updatesToRepublishFilteredByPlatform.length === 0) {
        throw new Error(
-          `There are no updates on branch "${name}" published on the platform(s) "${platformFlag}" with group ID "${
+          `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?`
        );
@@ -242,7 +273,7 @@ export default class BranchPublish extends Command {
        const { manifestFragment } = update;
        const platform = update.platform as PublishPlatform;

-        updateInfoGroup[platform] = JSON.parse(manifestFragment);
+        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
      }

      // These are the same for each member of an update group
@@ -260,7 +291,7 @@ export default class BranchPublish extends Command {
        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
        const assets = collectAssets({ inputDir: inputDir!, platforms });
        await uploadAssetsAsync(assets);
-        updateInfoGroup = await buildUpdateInfoGroupAsync(assets);
+        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
        assetSpinner.succeed('Uploaded assets!');
      } catch (e) {
        assetSpinner.fail('Failed to upload assets');
@@ -268,6 +299,10 @@ export default class BranchPublish extends Command {
      }
    }

+    if (!message && autoFlag) {
+      message = (await vcs.getLastCommitMessageAsync())?.trim();
+    }
+
    if (!message) {
      const validationMessage = 'publish message may not be empty.';
      if (jsonFlag) {
@@ -284,15 +319,38 @@ export default class BranchPublish extends Command {
      }));
    }

-    let newUpdateGroup;
+    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 {
-      newUpdateGroup = await PublishMutation.publishUpdateGroupAsync({
-        branchId,
-        updateInfoGroup,
-        runtimeVersion: republish ? oldRuntimeVersion! : runtimeVersion,
-        message,
-      });
+      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
      publishSpinner.succeed('Published!');
    } catch (e) {
      publishSpinner.fail('Failed to published updates');
@@ -300,27 +358,118 @@ export default class BranchPublish extends Command {
    }

    if (jsonFlag) {
-      Log.log(JSON.stringify(newUpdateGroup));
+      Log.log(JSON.stringify(newUpdates));
    } else {
-      Log.log(
-        formatFields([
-          { label: 'branch', value: name },
-          { label: 'runtime version', value: runtimeVersion },
-          { label: 'update group ID', value: newUpdateGroup.group },
-          { label: 'message', value: message },
-        ])
-      );
+      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();
+      }
    }
  }
 }

-function formatUpdateTitle(
-  update: Pick<Update, 'message' | 'createdAt' | 'runtimeVersion'> & {
-    actor?: Pick<Actor, 'firstName'> | null;
+function getRuntimeVersionObject(
+  exp: ExpoConfig,
+  platformFlag: string,
+  projectDir: string
+): Record<string, string> {
+  let { runtimeVersion: defaultRuntimeVersion, sdkVersion } = exp;
+
+  // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
+  // construct the runtimeVersion with special meaning indicating that the runtime is an
+  // Expo SDK preset runtime that can be launched in Expo Go.
+  const isManagedProject = getDefaultTarget(projectDir) === 'managed';
+  if (!defaultRuntimeVersion && sdkVersion && isManagedProject) {
+    Log.withTick('Generating runtime version from sdk version');
+    defaultRuntimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
  }
+  const iOSRuntimeVersion = (exp as any).ios?.runtimeVersion; // TODO-JJ remove cast to any
+  const androidRuntimeVersion = (exp as any).android?.runtimeVersion; // TODO-JJ remove cast to any
+  let runtimeVersions: Record<string, string>;
+  switch (platformFlag) {
+    case 'ios': {
+      runtimeVersions = {
+        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    case 'android': {
+      runtimeVersions = {
+        android: androidRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    case 'all': {
+      runtimeVersions = {
+        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
+        android: androidRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    default:
+      throw new Error('Platform flag must be "ios", "android", or "all"');
+  }
+  if (Object.values(runtimeVersions).some(runtime => !runtime)) {
+    throw new Error(
+      "Couldn't find a 'runtimeVersion' for every platform. Please specify it under the 'expo' key in 'app.json'"
+    );
+  }
+  if (Object.values(runtimeVersions).some(runtime => typeof runtime !== 'string')) {
+    throw new Error(
+      `Please ensure that all of the runtime versions defined in the app.json are strings.`
+    );
+  }
+
+  return runtimeVersions;
+}
+
+function formatUpdateTitle(
+  update: Exclude<
+    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'][number]
 ): string {
  const { message, createdAt, actor, runtimeVersion } = update;
-  return `[${dateFormat(createdAt, 'mmm dd HH:MM')} by ${
-    actor?.firstName ?? 'unknown'
-  }, runtimeVersion: ${runtimeVersion}] ${message}`;
+
+  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}`;
 }
@@ -6,15 +6,7 @@ import gql from 'graphql-tag';
 import { groupBy } from 'lodash';

 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  Maybe,
-  Robot,
-  Update,
-  UpdateBranch,
-  User,
-  ViewBranchQuery,
-  ViewBranchQueryVariables,
-} from '../../graphql/generated';
+import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
@@ -23,21 +15,10 @@ import formatFields from '../../utils/formatFields';

 const PAGE_LIMIT = 10_000;

-type TruncatedUpdate = Pick<Update, 'group' | 'message' | 'createdAt' | 'actor'>;
-
 export async function viewUpdateBranchAsync({
  appId,
  name,
-}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<
-  Pick<UpdateBranch, 'id' | 'name'> & {
-    updates: (Pick<
-      Update,
-      'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform' | 'manifestFragment'
-    > & {
-      actor?: Maybe<Pick<User, 'firstName' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
-    })[];
-  }
-> {
+}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<ViewBranchQuery> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .query<ViewBranchQuery, ViewBranchQueryVariables>(
@@ -80,11 +61,7 @@ export async function viewUpdateBranchAsync({
      )
      .toPromise()
  );
-  const updateBranch = data.app?.byId.updateBranchByName;
-  if (!updateBranch) {
-    throw new Error(`Could not find branch "${name}"`);
-  }
-  return updateBranch;
+  return data;
 }

 export default class BranchView extends Command {
@@ -133,10 +110,14 @@ export default class BranchView extends Command {
      }));
    }

-    const UpdateBranch = await viewUpdateBranchAsync({
+    const { app } = await viewUpdateBranchAsync({
      appId: projectId,
      name,
    });
+    const UpdateBranch = app?.byId.updateBranchByName;
+    if (!UpdateBranch) {
+      throw new Error(`Could not find branch "${name}"`);
+    }

    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
      group => group[0]
@@ -4,7 +4,6 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';
 import ora from 'ora';

-import { appPlatformEmojis } from '../../build/constants';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
@@ -14,6 +13,7 @@ import {
 } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { appPlatformEmojis } from '../../platform';
 import {
  findProjectRootAsync,
  getProjectFullNameAsync,
@@ -67,9 +67,9 @@ async function selectBuildToCancelAsync(
  let builds;
  try {
    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.New }),
-      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InQueue }),
-      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InProgress }),
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.New } }),
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InQueue } }),
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InProgress } }),
    ]);
    spinner.stop();
    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
@@ -56,7 +56,7 @@ function logSuccess(platform: RequestedPlatform) {

 - Run ${chalk.bold('eas build')} when you are ready to create your first build.
 - Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
- ${learnMore('https://docs.expo.io/build/introduction', {
+- ${learnMore('https://docs.expo.dev/build/introduction', {
    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
  })}`);
 }
@@ -1,26 +1,59 @@
-import { ExpoConfig, getConfig } from '@expo/config';
-import { EasJsonReader } from '@expo/eas-json';
-import { flags } from '@oclif/command';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { configureAsync } from '../../build/configure';
-import { createCommandContextAsync } from '../../build/context';
-import { buildAsync } from '../../build/create';
-import { RequestedPlatform } from '../../build/types';
-import EasCommand from '../../commandUtils/EasCommand';
-import Log, { learnMore } from '../../log';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import {
+  EasJsonReader,
+  hasMismatchedExtendsAsync,
+  isUsingDeprecatedFormatAsync,
+  migrateAsync,
+} from '@expo/eas-json';
+import { flags } from '@oclif/command';
+import { error, exit } from '@oclif/errors';
+
+import { prepareAndroidBuildAsync } from '../../build/android/build';
+import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import { BuildContext, createBuildContextAsync } from '../../build/context';
+import { prepareIosBuildAsync } from '../../build/ios/build';
+import { RequestedPlatform } from '../../build/types';
+import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
+import EasCommand from '../../commandUtils/EasCommand';
+import { BuildFragment, BuildStatus } from '../../graphql/generated';
+import Log from '../../log';
+import {
+  EAS_UNAVAILABLE_MESSAGE,
  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
 } from '../../project/isEasEnabledForProject';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../prompts';
+import { enableJsonOutput } from '../../utils/json';
 import vcs from '../../vcs';

+interface RawBuildFlags {
+  platform?: string;
+  'skip-credentials-check': boolean;
+  'skip-project-configuration': boolean;
+  profile: string;
+  'non-interactive': boolean;
+  local: boolean;
+  wait: boolean;
+  'clear-cache': boolean;
+  json: boolean;
+}
+
+interface BuildFlags {
+  requestedPlatform: RequestedPlatform;
+  skipProjectConfiguration: boolean;
+  profile: string;
+  nonInteractive: boolean;
+  local: boolean;
+  wait: boolean;
+  clearCache: boolean;
+  json: boolean;
+}
+
 export default class Build extends EasCommand {
-  static description = 'Start a build';
+  static description = 'start a build';

  static flags = {
    platform: flags.enum({ char: 'p', options: ['android', 'ios', 'all'] }),
@@ -28,6 +61,10 @@ export default class Build extends EasCommand {
      default: false,
      hidden: true,
    }),
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+      default: false,
+    }),
    'skip-project-configuration': flags.boolean({
      default: false,
      description: 'Skip project configuration',
@@ -56,155 +93,184 @@ export default class Build extends EasCommand {
  };

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

+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
+
+    await vcs.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(flags.nonInteractive);
+
+    await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
+
+    const easJsonReader = new EasJsonReader(projectDir);
+    const platformsToBuild = this.getPlatformsToBuild(requestedPlatform);
+
+    const startedBuilds: BuildFragment[] = [];
+    let metroConfigValidated = false;
+    for (const platform of platformsToBuild) {
+      const ctx = await createBuildContextAsync({
+        buildProfileName: flags.profile,
+        clearCache: flags.clearCache,
+        buildProfile: await easJsonReader.readBuildProfileAsync(platform, flags.profile),
+        local: flags.local,
+        nonInteractive: flags.nonInteractive,
+        platform,
+        projectDir,
+        skipProjectConfiguration: flags.skipProjectConfiguration,
+      });
+
+      if (ctx.workflow === Workflow.MANAGED && !metroConfigValidated) {
+        await validateMetroConfigForManagedWorkflowAsync(ctx);
+        metroConfigValidated = true;
+      }
+
+      if (!ctx.local && !(await isEasEnabledForProjectAsync(ctx.projectId))) {
+        error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
+      }
+
+      const maybeBuild = await this.startBuildAsync(ctx);
+      if (maybeBuild) {
+        startedBuilds.push(maybeBuild);
+      }
+    }
+    if (flags.local) {
+      return;
+    }
+
+    Log.newLine();
+    printLogsUrls(startedBuilds);
+    Log.newLine();
+
+    if (flags.wait) {
+      const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
+      printBuildResults(builds, flags.json);
+      this.exitWithNonZeroCodeIfSomeBuildsFailed(builds);
+    }
+  }
+
+  private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
    const nonInteractive = flags['non-interactive'];
    if (!flags.platform && nonInteractive) {
-      throw new Error('--platform is required when building in non-interactive mode');
+      error('--platform is required when building in non-interactive mode', { exit: 1 });
+    }
+    if (flags.json && !nonInteractive) {
+      error('--json is allowed only when building in non-interactive mode', { exit: 1 });
+    }
+    const requestedPlatform =
+      (flags.platform as RequestedPlatform | undefined) ?? (await this.promptForPlatformAsync());
+
+    if (flags.local) {
+      if (requestedPlatform === RequestedPlatform.All) {
+        error('Builds for multiple platforms are not supported with flag --local', { exit: 1 });
+      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
+        error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+      }
    }
-    const platform =
-      (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());

    if (flags['skip-credentials-check']) {
      Log.warnDeprecatedFlag(
        'skip-credentials-check',
-        'Build credential validation is always skipped with the --non-interactive flag. You can also skip interactively.'
+        'Build credentials validation is always skipped with the --non-interactive flag. You can also skip interactively.'
      );
      Log.newLine();
    }

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    let { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const projectId = await getProjectIdAsync(exp);
-
-    if (!flags.local && !(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
-    if (flags.local && !verifyOptionsForLocalBuilds(platform)) {
-      process.exitCode = 1;
-      return;
-    }
-
-    exp = (await ensureProjectConfiguredAsync(projectDir, platform)) ?? exp;
-
-    const commandCtx = await createCommandContextAsync({
-      requestedPlatform: platform,
-      profile: flags.profile,
-      exp,
-      projectDir,
-      projectId,
-      nonInteractive,
-      clearCache: flags['clear-cache'],
-      local: flags.local,
+    return {
+      requestedPlatform,
      skipProjectConfiguration: flags['skip-project-configuration'],
-      waitForBuildEnd: flags.wait,
+      profile: flags['profile'],
+      nonInteractive,
+      local: flags['local'],
+      wait: flags['wait'],
+      clearCache: flags['clear-cache'],
+      json: flags['json'],
+    };
+  }
+
+  private async promptForPlatformAsync(): Promise<RequestedPlatform> {
+    const { platform } = await promptAsync({
+      type: 'select',
+      message: 'Build for platforms',
+      name: 'platform',
+      choices: [
+        { title: 'All', value: RequestedPlatform.All },
+        { title: 'iOS', value: RequestedPlatform.Ios },
+        { title: 'Android', value: RequestedPlatform.Android },
+      ],
    });
-
-    await buildAsync(commandCtx);
-  }
-}
-
-function verifyOptionsForLocalBuilds(platform: RequestedPlatform): boolean {
-  if (platform === RequestedPlatform.All) {
-    Log.error('Builds for multiple platforms are not supported with flag --local');
-    return false;
-  } else if (process.platform !== 'darwin' && platform === RequestedPlatform.Ios) {
-    Log.error('Unsupported platform, macOS is required to build apps for iOS');
-    return false;
-  } else {
-    return true;
-  }
-}
-
-async function promptForPlatformAsync(): Promise<RequestedPlatform> {
-  const { platform } = await promptAsync({
-    type: 'select',
-    message: 'Build for platforms',
-    name: 'platform',
-    choices: [
-      {
-        title: 'All',
-        value: RequestedPlatform.All,
-      },
-      {
-        title: 'iOS',
-        value: RequestedPlatform.Ios,
-      },
-      {
-        title: 'Android',
-        value: RequestedPlatform.Android,
-      },
-    ],
-  });
-  return platform;
-}
-
-async function ensureProjectConfiguredAsync(
-  projectDir: string,
-  platform: RequestedPlatform
-): Promise<ExpoConfig | null> {
-  const platformsToConfigure = await getPlatformsToConfigureAsync(projectDir, platform);
-
-  if (!platformsToConfigure) {
-    return null;
-  }
-
-  // Ensure the prompt is consistent with the platforms we need to configure
-  let message = 'This project is not configured to build with EAS. Set it up now?';
-  if (platformsToConfigure === RequestedPlatform.Ios) {
-    message = 'Your iOS project is not configured to build with EAS. Set it up now?';
-  } else if (platformsToConfigure === RequestedPlatform.Android) {
-    message = 'Your Android project is not configured to build with EAS. Set it up now?';
-  }
-
-  const confirm = await confirmAsync({ message });
-  if (confirm) {
-    await configureAsync({
-      projectDir,
-      platform: platformsToConfigure,
-    });
-    if (await vcs.hasUncommittedChangesAsync()) {
-      throw new Error(
-        'Build process requires clean working tree, please commit all your changes and run `eas build` again'
-      );
-    }
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    return exp;
-  } else {
-    throw new Error(
-      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
-        'https://docs.expo.io/build/eas-json'
-      )})`
-    );
-  }
-}
-
-async function getPlatformsToConfigureAsync(
-  projectDir: string,
-  platform: RequestedPlatform
-): Promise<RequestedPlatform | null> {
-  if (!(await fs.pathExists(path.join(projectDir, 'eas.json')))) {
    return platform;
  }

-  const easConfig = await new EasJsonReader(projectDir, platform).readRawAsync();
-  if (platform === RequestedPlatform.All) {
-    if (easConfig.builds?.android && easConfig.builds?.ios) {
-      return null;
-    } else if (easConfig.builds?.ios) {
-      return RequestedPlatform.Android;
-    } else if (easConfig.builds?.android) {
-      return RequestedPlatform.Ios;
+  private getPlatformsToBuild(requestedPlatform: RequestedPlatform): Platform[] {
+    if (requestedPlatform === RequestedPlatform.All) {
+      return [Platform.ANDROID, Platform.IOS];
+    } else if (requestedPlatform === RequestedPlatform.Android) {
+      return [Platform.ANDROID];
+    } else {
+      return [Platform.IOS];
    }
-  } else if (
-    (platform === RequestedPlatform.Android || platform === RequestedPlatform.Ios) &&
-    easConfig.builds?.[platform]
-  ) {
-    return null;
  }

-  return platform;
+  private async startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
+    let sendBuildRequestAsync: BuildRequestSender;
+    if (ctx.platform === Platform.ANDROID) {
+      sendBuildRequestAsync = await prepareAndroidBuildAsync(ctx as BuildContext<Platform.ANDROID>);
+    } else {
+      sendBuildRequestAsync = await prepareIosBuildAsync(ctx as BuildContext<Platform.IOS>);
+    }
+    return await sendBuildRequestAsync();
+  }
+
+  private exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
+    const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
+      i => i.status === BuildStatus.Errored
+    );
+    if (failedBuilds.length > 0) {
+      exit(1);
+    }
+  }
+}
+
+export async function handleDeprecatedEasJsonAsync(
+  projectDir: string,
+  nonInteractive: boolean
+): Promise<void> {
+  if (await isUsingDeprecatedFormatAsync(projectDir)) {
+    const hasMismatchedExtendsKeys = await hasMismatchedExtendsAsync(projectDir);
+    if (nonInteractive) {
+      Log.error('We detected that your eas.json is using a deprecated format.');
+      Log.error(
+        'We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json'
+      );
+      error('Unsupported eas.json format', { exit: 1 });
+    }
+
+    const confirm = await confirmAsync({
+      message:
+        'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
+    });
+    if (confirm) {
+      await migrateAsync(projectDir);
+      if (hasMismatchedExtendsKeys) {
+        Log.warn(
+          '"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms'
+        );
+        Log.warn(
+          'Migration was successful, but you need to manually adjust the extend rules for your profiles'
+        );
+        error('Fix eas.json manually', { exit: 1 });
+      }
+    } else {
+      Log.error(
+        "Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again"
+      );
+      error('Unsupported eas.json format', { exit: 1 });
+    }
+  }
 }
@@ -3,9 +3,13 @@ import { Command, flags } from '@oclif/command';
 import chalk from 'chalk';
 import ora from 'ora';

-import { BuildStatus, RequestedPlatform } from '../../build/types';
+import { BuildDistributionType, BuildStatus, RequestedPlatform } from '../../build/types';
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
-import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  DistributionType,
+  BuildStatus as GraphQLBuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import {
@@ -13,6 +17,7 @@ import {
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class BuildList extends Command {
  static description = 'list all builds for your project';
@@ -21,6 +26,9 @@ export default class BuildList extends Command {
    platform: flags.enum({
      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
    }),
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
    status: flags.enum({
      options: [
        BuildStatus.NEW,
@@ -31,16 +39,40 @@ export default class BuildList extends Command {
        BuildStatus.CANCELED,
      ],
    }),
+    distribution: flags.enum({
+      options: [
+        BuildDistributionType.STORE,
+        BuildDistributionType.INTERNAL,
+        BuildDistributionType.SIMULATOR,
+      ],
+    }),
+    channel: flags.string(),
+    appVersion: flags.string(),
+    appBuildVersion: flags.string(),
+    sdkVersion: flags.string(),
+    runtimeVersion: flags.string(),
+    appIdentifier: flags.string(),
+    buildProfile: flags.string(),
+    gitCommitHash: flags.string(),
    limit: flags.integer(),
  };

  async run() {
-    const { platform: requestedPlatform, status: buildStatus, limit = 10 } = this.parse(
-      BuildList
-    ).flags;
+    const { flags } = this.parse(BuildList);
+    const {
+      json,
+      platform: requestedPlatform,
+      status: buildStatus,
+      distribution: buildDistribution,
+      limit = 10,
+    } = flags;
+    if (json) {
+      enableJsonOutput();
+    }

    const platform = toAppPlatform(requestedPlatform);
    const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
+    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);

    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -52,8 +84,19 @@ export default class BuildList extends Command {
    try {
      const builds = await BuildQuery.allForAppAsync(projectId, {
        limit,
-        platform,
-        status: graphqlBuildStatus,
+        filter: {
+          platform,
+          status: graphqlBuildStatus,
+          distribution: graphqlBuildDistribution,
+          channel: flags.channel,
+          appVersion: flags.appVersion,
+          appBuildVersion: flags.appBuildVersion,
+          sdkVersion: flags.sdkVersion,
+          runtimeVersion: flags.runtimeVersion,
+          appIdentifier: flags.appIdentifier,
+          buildProfile: flags.buildProfile,
+          gitCommitHash: flags.gitCommitHash,
+        },
      });

      if (builds.length) {
@@ -65,11 +108,15 @@ export default class BuildList extends Command {
          spinner.succeed(`Showing last ${builds.length} builds for the project ${projectName}`);
        }

-        const list = builds
-          .map(build => formatGraphQLBuild(build))
-          .join(`\n\n${chalk.dim('———')}\n\n`);
+        if (json) {
+          printJsonOnlyOutput(builds);
+        } else {
+          const list = builds
+            .map(build => formatGraphQLBuild(build))
+            .join(`\n\n${chalk.dim('———')}\n\n`);

-        Log.log(`\n${list}`);
+          Log.log(`\n${list}`);
+        }
      } else {
        spinner.fail(`Couldn't find any builds for the project ${projectName}`);
      }
@@ -90,7 +137,7 @@ const toAppPlatform = (requestedPlatform?: RequestedPlatform): AppPlatform | und
  }
 };

-const toGraphQLBuildStatus = (buildStatus: BuildStatus): GraphQLBuildStatus | undefined => {
+const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | undefined => {
  if (!buildStatus) {
    return undefined;
  } else if (buildStatus === BuildStatus.NEW) {
@@ -107,3 +154,17 @@ const toGraphQLBuildStatus = (buildStatus: BuildStatus): GraphQLBuildStatus | un
    return GraphQLBuildStatus.Canceled;
  }
 };
+
+const toGraphQLBuildDistribution = (
+  buildDistribution?: BuildDistributionType
+): DistributionType | undefined => {
+  if (buildDistribution === BuildDistributionType.STORE) {
+    return DistributionType.Store;
+  } else if (buildDistribution === BuildDistributionType.INTERNAL) {
+    return DistributionType.Internal;
+  } else if (buildDistribution === BuildDistributionType.SIMULATOR) {
+    return DistributionType.Simulator;
+  } else {
+    return undefined;
+  }
+};
@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
+import { Command, flags } from '@oclif/command';
 import ora from 'ora';

 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
@@ -11,14 +11,27 @@ import {
  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class BuildView extends Command {
  static description = 'view a build for your project';

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

+  static flags = {
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
+  };
+
  async run() {
-    const { BUILD_ID: buildId } = this.parse(BuildView).args;
+    const {
+      args: { BUILD_ID: buildId },
+      flags,
+    } = this.parse(BuildView);
+    if (flags.json) {
+      enableJsonOutput();
+    }

    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -47,7 +60,11 @@ export default class BuildView extends Command {
        spinner.succeed(`Showing the last build for the project ${projectName}`);
      }

-      Log.log(`\n${formatGraphQLBuild(build)}`);
+      if (flags.json) {
+        printJsonOnlyOutput(build);
+      } else {
+        Log.log(`\n${formatGraphQLBuild(build)}`);
+      }
    } catch (err) {
      if (buildId) {
        spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);
@@ -37,9 +37,7 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

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

  if (!newBranch || !oldBranch) {
    throw new Error(
@@ -140,9 +140,10 @@ async function startRolloutAsync({
    branchMapping: JSON.stringify(newBranchMapping),
  });

-  const oldBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-    branch => branch.id === oldBranchId
-  )[0];
+  const oldBranch =
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+      branch => branch.id === oldBranchId
+    )[0];
  if (!oldBranch) {
    throw new Error(
      `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
@@ -37,9 +37,11 @@ export type BranchMapping = {
 * Get the branch mapping and determine whether it is a rollout.
 * Ensure that the branch mapping is properly formatted.
 */
-export function getBranchMapping(
-  branchMappingString?: string
-): { branchMapping: BranchMapping; isRollout: boolean; rolloutPercent?: number } {
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
  if (!branchMappingString) {
    throw new Error('Missing branch mapping.');
  }
@@ -0,0 +1,67 @@
+import { getProjectConfigDescription } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { Command, flags } from '@oclif/command';
+
+import Log from '../log';
+import { getExpoConfig } from '../project/expoConfig';
+import { findProjectRootAsync } from '../project/projectUtils';
+import { selectAsync } from '../prompts';
+import { handleDeprecatedEasJsonAsync } from './build';
+
+export default class Config extends Command {
+  static description = 'show the eas.json config';
+
+  static flags = {
+    platform: flags.enum({ char: 'p', options: ['android', 'ios'] }),
+    profile: flags.string(),
+  };
+
+  async run() {
+    const { flags } = this.parse(Config);
+    const { platform: maybePlatform, profile: maybeProfile } = flags as {
+      platform?: Platform;
+      profile?: string;
+    };
+
+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    await handleDeprecatedEasJsonAsync(projectDir, false);
+
+    const reader = new EasJsonReader(projectDir);
+    const profileName =
+      maybeProfile ??
+      (await selectAsync(
+        'Select build profile',
+        (
+          await reader.getBuildProfileNamesAsync()
+        ).map(profileName => ({
+          title: profileName,
+          value: profileName,
+        }))
+      ));
+    const platform =
+      maybePlatform ??
+      (await selectAsync('Select platform', [
+        {
+          title: 'Android',
+          value: Platform.ANDROID,
+        },
+        {
+          title: 'iOS',
+          value: Platform.IOS,
+        },
+      ]));
+
+    const profile = await reader.readBuildProfileAsync(platform, profileName);
+    const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
+
+    Log.log(getProjectConfigDescription(projectDir));
+    Log.newLine();
+    Log.log(JSON.stringify(config, null, 2));
+    Log.newLine();
+    Log.newLine();
+    Log.log(`Build profile "${profileName}" from eas.json for platform ${platform}`);
+    Log.newLine();
+    Log.log(JSON.stringify(profile, null, 2));
+  }
+}
@@ -1,10 +1,9 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../commandUtils/EasCommand';
 import { createCredentialsContextAsync } from '../credentials/context';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';

-export default class Credentials extends Command {
-  static description = 'Manage your credentials';
+export default class Credentials extends EasCommand {
+  static description = 'manage your credentials';

  async run() {
    const ctx = await createCredentialsContextAsync(process.cwd(), {});
@@ -0,0 +1,34 @@
+import { Command } from '@oclif/command';
+import envinfo from 'envinfo';
+
+import Log from '../log';
+
+const packageJSON = require('../../package.json');
+
+export default class Diagnostics extends Command {
+  static description = 'log environment info to the console';
+
+  async run() {
+    const info = await envinfo.run(
+      {
+        System: ['OS', 'Shell'],
+        Binaries: ['Node', 'Yarn', 'npm'],
+        Utilities: ['Git'],
+        npmPackages: [
+          'expo',
+          'react',
+          'react-dom',
+          'react-native',
+          'react-native-web',
+          'react-navigation',
+          '@expo/webpack-config',
+        ],
+        npmGlobalPackages: ['eas-cli'],
+      },
+      {
+        title: `EAS CLI ${packageJSON.version} environment info`,
+      }
+    );
+    Log.log(info);
+  }
+}
@@ -31,7 +31,6 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
 }

 export default class ProjectInfo extends Command {
-  static hidden = true;
  static description = 'information about the current project';

  async run() {
@@ -49,8 +48,8 @@ export default class ProjectInfo extends Command {
    Log.addNewLineIfNone();
    Log.log(
      formatFields([
-        { label: 'ID', value: projectId },
        { label: 'fullName', value: app.byId.fullName },
+        { label: 'ID', value: projectId },
      ])
    );
  }
@@ -6,7 +6,6 @@ import Log from '../../log';
 import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';

 export default class ProjectInit extends Command {
-  static hidden = true;
  static description = 'create or link an EAS project';
  static aliases = ['init'];

@@ -3,6 +3,10 @@ import { Command, flags } from '@oclif/command';
 import chalk from 'chalk';

 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
+import {
+  EnvironmentSecretScope,
+  EnvironmentSecretsQuery,
+} from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
 import {
  isEasEnabledForProjectAsync,
@@ -18,10 +22,6 @@ import { findAccountByName } from '../../user/Account';
 import { getActorDisplayName } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';

-export enum EnvironmentSecretScope {
-  ACCOUNT = 'account',
-  PROJECT = 'project',
-}
 export default class EnvironmentSecretCreate extends Command {
  static description = 'Create an environment secret on the current project or owner account.';

@@ -37,12 +37,16 @@ export default class EnvironmentSecretCreate extends Command {
    value: flags.string({
      description: 'Value of the secret',
    }),
+    force: flags.boolean({
+      description: 'Delete and recreate existing secrets',
+      default: false,
+    }),
  };

  async run() {
    const actor = await ensureLoggedInAsync();
    let {
-      flags: { name, value: secretValue, scope },
+      flags: { name, value: secretValue, scope, force },
    } = this.parse(EnvironmentSecretCreate);

    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
@@ -93,7 +97,9 @@ export default class EnvironmentSecretCreate extends Command {
        },
      }));

-      if (!name) throw new Error('Secret name may not be empty.');
+      if (!name) {
+        throw new Error('Secret name may not be empty.');
+      }
    }

    if (!secretValue) {
@@ -106,10 +112,26 @@ export default class EnvironmentSecretCreate extends Command {
        validate: value => (value ? true : validationMessage),
      }));

-      if (!secretValue) throw new Error(validationMessage);
+      if (!secretValue) {
+        throw new Error(validationMessage);
+      }
    }

    if (scope === EnvironmentSecretScope.PROJECT) {
+      if (force) {
+        const existingSecrets = await EnvironmentSecretsQuery.byAppIdAsync(projectId);
+        const existingSecret = existingSecrets.find(secret => secret.name === name);
+
+        if (existingSecret) {
+          await EnvironmentSecretMutation.delete(existingSecret.id);
+          Log.withTick(
+            `Deleting existing secret ${chalk.bold(name)} on project ${chalk.bold(
+              `@${accountName}/${slug}`
+            )}.`
+          );
+        }
+      }
+
      const secret = await EnvironmentSecretMutation.createForApp(
        { name, value: secretValue },
        projectId
@@ -136,6 +158,20 @@ export default class EnvironmentSecretCreate extends Command {
        return;
      }

+      if (force) {
+        const existingSecrets = await EnvironmentSecretsQuery.byAcccountNameAsync(projectId);
+        const existingSecret = existingSecrets.find(secret => secret.name === name);
+
+        if (existingSecret) {
+          await EnvironmentSecretMutation.delete(existingSecret.id);
+          Log.withTick(
+            `Deleting existing secret ${chalk.bold(name)} on account ${chalk.bold(
+              ownerAccount.name
+            )}.`
+          );
+        }
+      }
+
      const secret = await EnvironmentSecretMutation.createForAccount(
        { name, value: secretValue },
        ownerAccount.id
@@ -4,6 +4,7 @@ import chalk from 'chalk';

 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
+  EnvironmentSecretScope,
  EnvironmentSecretWithScope,
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
@@ -15,12 +16,10 @@ import {
 import {
  findProjectRootAsync,
  getProjectAccountNameAsync,
-  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { EnvironmentSecretScope } from './create';

 export default class EnvironmentSecretDelete extends Command {
  static description = `Delete an environment secret by ID.
@@ -38,7 +37,6 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);

    if (!(await isEasEnabledForProjectAsync(projectId))) {
@@ -55,7 +53,7 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
    if (!id) {
      const validationMessage = 'You must select which secret to delete.';

-      const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectFullName);
+      const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);

      ({ secret } = await promptAsync({
        type: 'autocomplete',
@@ -69,7 +67,9 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;

      id = secret?.id;

-      if (!id) throw new Error(validationMessage);
+      if (!id) {
+        throw new Error(validationMessage);
+      }
    }

    Log.addNewLineIfNone();
@@ -13,7 +13,6 @@ import {
 import {
  findProjectRootAsync,
  getProjectAccountNameAsync,
-  getProjectFullNameAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
@@ -27,7 +26,6 @@ export default class EnvironmentSecretList extends Command {
    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);

    if (!(await isEasEnabledForProjectAsync(projectId))) {
@@ -40,7 +38,7 @@ export default class EnvironmentSecretList extends Command {
      throw new Error("Please run this command inside your project's directory");
    }

-    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectFullName);
+    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);

    const table = new Table({
      head: ['Name', 'Scope', 'ID', 'Updated at'],
@@ -1,168 +1,81 @@
 import { getConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader, IosSubmitProfile } from '@expo/eas-json';
 import { flags } from '@oclif/command';
+import { exit } from '@oclif/errors';
+import chalk from 'chalk';

 import EasCommand from '../commandUtils/EasCommand';
-import { AppPlatform } from '../graphql/generated';
-import { learnMore } from '../log';
+import { AppPlatform, SubmissionFragment, SubmissionStatus } from '../graphql/generated';
+import Log, { learnMore } from '../log';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../platform';
 import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { promptAsync } from '../prompts';
 import AndroidSubmitCommand from '../submissions/android/AndroidSubmitCommand';
 import IosSubmitCommand from '../submissions/ios/IosSubmitCommand';
-import { AndroidSubmitCommandFlags, IosSubmitCommandFlags } from '../submissions/types';
+import { SubmitArchiveFlags } from '../submissions/types';
+import { displayLogsAsync } from '../submissions/utils/logs';
+import { printSubmissionDetailsUrls } from '../submissions/utils/urls';
+import { waitForSubmissionsEndAsync } from '../submissions/utils/wait';

-const COMMON_FLAGS = '';
-const ANDROID_FLAGS = 'Android specific options';
-const IOS_FLAGS = 'iOS specific options';
+interface Flags {
+  verbose: boolean;
+  wait: boolean;
+  platform?: Platform;
+  profile?: string;
+  archiveFlags: SubmitArchiveFlags;
+}

 export default class BuildSubmit extends EasCommand {
-  static description = 'Submits build artifact to app store';
-  static usage = 'submit --platform=(android|ios)';
+  static description = `submit build archive to app store
+See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/submit/eas-json/', {
+    learnMoreMessage: '',
+  })}`;
  static aliases = ['build:submit'];

-  static examples = [
-    `$ eas submit --platform=ios
-    - Fully interactive iOS submission\n`,
-    `$ eas submit --platform=android
-    - Fully interactive Android submission\n`,
-    `$ eas submit -p android --latest --key=/path/to/google-services.json
-    - Minimal non-interactive Android submission, however it can ask you for other params if not specified\n`,
-    `$ EXPO_APPLE_APP_SPECIFIC_PASSWORD=xxx eas submit -p ios --latest [email protected] --asc-app-id=1234567890,
-    - Minimal non-interactive iOS submission, assuming you already have an app in App Store Connect
-      and provide its App ID`,
-  ];
-
  static flags = {
    platform: flags.enum({
      char: 'p',
-      description: 'For which platform you want to submit a build',
      options: ['android', 'ios'],
-      helpLabel: COMMON_FLAGS,
    }),
-
-    /* Common flags for both platforms */
+    profile: flags.string({
+      description:
+        'Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.',
+    }),
    latest: flags.boolean({
      description: 'Submit the latest build for specified platform',
      exclusive: ['id', 'path', 'url'],
      default: false,
-      helpLabel: COMMON_FLAGS,
    }),
    id: flags.string({
      description: 'ID of the build to submit',
      exclusive: ['latest, path, url'],
-      helpLabel: COMMON_FLAGS,
    }),
    path: flags.string({
-      description: 'Path to the .apk/.aab file',
+      description: 'Path to the .apk/.aab/.ipa file',
      exclusive: ['latest', 'id', 'url'],
-      helpLabel: COMMON_FLAGS,
    }),
    url: flags.string({
      description: 'App archive url',
      exclusive: ['latest', 'id', 'path'],
-      helpLabel: COMMON_FLAGS,
    }),
-
    verbose: flags.boolean({
      description: 'Always print logs from Submission Service',
      default: false,
-      helpLabel: COMMON_FLAGS,
    }),
-
-    /* Android specific flags */
-    type: flags.enum<'apk' | 'aab'>({
-      description: 'Android archive type',
-      options: ['apk', 'aab'],
-      helpLabel: ANDROID_FLAGS,
-    }),
-
-    key: flags.string({
-      description: 'Path to the JSON key used to authenticate with Google Play',
-      helpLabel: ANDROID_FLAGS,
-    }),
-    'android-package': flags.string({
-      description: 'Android package name (default: expo.android.package from app config)',
-      helpLabel: ANDROID_FLAGS,
-    }),
-
-    track: flags.enum({
-      description: 'The track of the application to use',
-      default: 'internal',
-      options: ['production', 'beta', 'alpha', 'internal', 'rollout'],
-      helpLabel: ANDROID_FLAGS,
-    }),
-    'release-status': flags.enum({
-      description: 'Release status (used when uploading new APKs/AABs)',
-      default: 'completed',
-      options: ['completed', 'draft', 'halted', 'inProgress'],
-      helpLabel: ANDROID_FLAGS,
-    }),
-
-    /* iOS specific flags */
-    'apple-id': flags.string({
-      description: 'Your Apple ID username (you can also set EXPO_APPLE_ID env variable)',
-      helpLabel: IOS_FLAGS,
-    }),
-    'asc-app-id': flags.string({
-      description: `App Store Connect unique application Apple ID number. Providing this param results in skipping app creation step. ${learnMore(
-        'https://expo.fyi/asc-app-id'
-      )}`,
-      helpLabel: IOS_FLAGS,
-    }),
-    'apple-team-id': flags.string({
-      description: 'Your Apple Developer Team ID',
-      helpLabel: IOS_FLAGS,
-    }),
-    'app-name': flags.string({
-      description:
-        'The name of your app as it will appear on the App Store (default: expo.name from app config)',
-      helpLabel: IOS_FLAGS,
-    }),
-    'bundle-identifier': flags.string({
-      description:
-        'Your iOS Bundle Identifier (default: expo.ios.bundleIdentifier from app config)',
-      helpLabel: IOS_FLAGS,
-    }),
-    sku: flags.string({
-      description:
-        'An unique ID for your app that is not visible on the App Store, will be generated unless provided',
-      helpLabel: IOS_FLAGS,
-    }),
-    language: flags.string({
-      description: 'Primary language (e.g. English, German, ...)',
-      default: 'en-US',
-      helpLabel: IOS_FLAGS,
-    }),
-    'company-name': flags.string({
-      description:
-        'The name of your company, needed only for the first upload of any app to App Store',
-      helpLabel: IOS_FLAGS,
+    wait: flags.boolean({
+      description: 'Wait for submission to complete',
+      default: true,
+      allowNo: true,
    }),
  };

  async run(): Promise<void> {
-    const {
-      flags: {
-        // android
-        'android-package': androidPackage,
-        'release-status': releaseStatus,
-
-        // ios
-        'apple-id': appleId,
-        'asc-app-id': ascAppId,
-        'apple-team-id': appleTeamId,
-        'app-name': appName,
-        'bundle-identifier': bundleIdentifier,
-        'company-name': companyName,
-
-        // common
-        ...flags
-      },
-    } = this.parse(BuildSubmit);
-
+    const flags = this.parseFlags();
    const platform =
      (flags.platform?.toUpperCase() as AppPlatform | undefined) ??
-      (await promptForPlatformAsync());
+      (await this.promptForPlatformAsync());

    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -174,56 +87,115 @@ export default class BuildSubmit extends EasCommand {
      return;
    }

-    // TODO: Make this work outside project dir
-    if (!projectDir) {
-      throw new Error("Please run this command inside your project's directory");
+    const easJsonReader = new EasJsonReader(projectDir);
+
+    const submissions: SubmissionFragment[] = [];
+    let iosSubmitProfile: IosSubmitProfile | null = null;
+    if (platform === AppPlatform.Android) {
+      const submitProfile = await easJsonReader.readSubmitProfileAsync(
+        Platform.ANDROID,
+        flags.profile
+      );
+      const ctx = AndroidSubmitCommand.createContext({
+        projectDir,
+        projectId,
+        profile: submitProfile,
+        archiveFlags: flags.archiveFlags,
+      });
+      const command = new AndroidSubmitCommand(ctx);
+      submissions.push(await command.runAsync());
+    } else {
+      iosSubmitProfile = await easJsonReader.readSubmitProfileAsync(Platform.IOS, flags.profile);
+      const ctx = IosSubmitCommand.createContext({
+        projectDir,
+        projectId,
+        profile: iosSubmitProfile,
+        archiveFlags: flags.archiveFlags,
+      });
+      const command = new IosSubmitCommand(ctx);
+      submissions.push(await command.runAsync());
    }

-    if (platform === AppPlatform.Android) {
-      const options: AndroidSubmitCommandFlags = {
-        androidPackage,
-        releaseStatus,
-        ...flags,
-      };
+    Log.newLine();
+    printSubmissionDetailsUrls(submissions);

-      const ctx = AndroidSubmitCommand.createContext(projectDir, projectId, options);
-      const command = new AndroidSubmitCommand(ctx);
-      await command.runAsync();
-    } else if (platform === AppPlatform.Ios) {
-      const options: IosSubmitCommandFlags = {
-        appleId,
-        ascAppId,
-        appleTeamId,
-        appName,
-        bundleIdentifier,
-        companyName,
-        ...flags,
-      };
+    if (flags.wait) {
+      Log.newLine();
+      const completedSubmissions = await waitForSubmissionsEndAsync(submissions);
+      for (const submission of completedSubmissions) {
+        if (completedSubmissions.length > 1) {
+          Log.log(
+            `${appPlatformEmojis[submission.platform]}${chalk.bold(
+              `${appPlatformDisplayNames[submission.platform]} submission`
+            )}`
+          );
+        }
+        if (
+          submission.platform === AppPlatform.Ios &&
+          submission.status === SubmissionStatus.Finished
+        ) {
+          const logMsg = [
+            chalk.bold('Your binary has been successfully uploaded to App Store Connect!'),
+            '- It is now being processed by Apple - you will receive an e-mail when the processing finishes.',
+            '- It usually takes about 5-10 minutes depending on how busy Apple servers are.',
+            // ascAppIdentifier should be always available for ios submissions but check it anyway
+            submission.iosConfig?.ascAppIdentifier &&
+              `- When it’s done, you can see your build here: ${learnMore(
+                `https://appstoreconnect.apple.com/apps/${submission.iosConfig?.ascAppIdentifier}/appstore/ios`,
+                { learnMoreMessage: '' }
+              )}`,
+          ].join('\n');
+          Log.addNewLineIfNone();
+          Log.log(logMsg);
+        }
+        await displayLogsAsync(submission, { verbose: flags.verbose });
+        if (completedSubmissions.length > 1) {
+          Log.newLine();
+        }
+      }
+      this.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
+    }
+  }

-      const ctx = IosSubmitCommand.createContext(projectDir, projectId, options);
-      const command = new IosSubmitCommand(ctx);
-      await command.runAsync();
-    } else {
-      throw new Error(`Unsupported platform: ${platform}!`);
+  private parseFlags(): Flags {
+    const {
+      flags: { platform, profile, verbose, wait, ...archiveFlags },
+    } = this.parse(BuildSubmit);
+
+    return {
+      platform: platform as Platform,
+      profile,
+      verbose,
+      wait,
+      archiveFlags,
+    };
+  }
+
+  private async promptForPlatformAsync(): Promise<AppPlatform> {
+    const { platform } = await promptAsync({
+      type: 'select',
+      message: 'Submit to platform',
+      name: 'platform',
+      choices: [
+        {
+          title: 'iOS',
+          value: AppPlatform.Ios,
+        },
+        {
+          title: 'Android',
+          value: AppPlatform.Android,
+        },
+      ],
+    });
+    return platform;
+  }
+
+  private exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(submissions: SubmissionFragment[]): void {
+    const nonFinishedSubmissions = submissions.filter(
+      ({ status }) => status !== SubmissionStatus.Finished
+    );
+    if (nonFinishedSubmissions.length > 0) {
+      exit(1);
    }
  }
 }
-
-async function promptForPlatformAsync(): Promise<AppPlatform> {
-  const { platform } = await promptAsync({
-    type: 'select',
-    message: 'Submit to platform',
-    name: 'platform',
-    choices: [
-      {
-        title: 'iOS',
-        value: AppPlatform.Ios,
-      },
-      {
-        title: 'Android',
-        value: AppPlatform.Android,
-      },
-    ],
-  });
-  return platform;
-}
@@ -15,6 +15,8 @@ import {
  testPKCS12KeystoreEmptyPasswordBase64,
 } from './fixtures-base64-data';

+const now = new Date();
+
 export const testKeystore: Keystore = {
  keystore: testKeystoreBase64,
  keystorePassword: 'ae6777e9444a436dbe533d2be46c83ba',
@@ -61,8 +63,8 @@ export const testLegacyAndroidFcmFragment: AndroidFcmFragment = {
  },
  credential: 'abcdxxxxxxefgh',
  version: AndroidFcmVersion.Legacy,
-  createdAt: new Date(),
-  updatedAt: new Date(),
+  createdAt: now,
+  updatedAt: now,
 };

 export const testJksAndroidKeystoreFragment: AndroidKeystoreFragment = {
@@ -75,8 +77,8 @@ export const testJksAndroidKeystoreFragment: AndroidKeystoreFragment = {
  md5CertificateFingerprint: 'test-md5',
  sha1CertificateFingerprint: 'test-sha1',
  sha256CertificateFingerprint: 'test-sha256',
-  createdAt: new Date(),
-  updatedAt: new Date(),
+  createdAt: now,
+  updatedAt: now,
 };

 export const testLegacyAndroidBuildCredentialsFragment: AndroidAppBuildCredentialsFragment = {
@@ -13,6 +13,8 @@ import { DistributionCertificate, ProvisioningProfile } from '../ios/appstore/Cr
 import { Target } from '../ios/types';
 import { testProvisioningProfileBase64 } from './fixtures-base64-data';

+const now = new Date();
+
 export const testProvisioningProfile: ProvisioningProfile = {
  provisioningProfileId: 'test-id',
  provisioningProfile: testProvisioningProfileBase64,
@@ -39,7 +41,7 @@ export const testPushKey: ApplePushKeyFragment = {
  id: 'test-push-key-id',
  keyIdentifier: 'test-key-identifier',
  appleTeam: { ...testAppleTeamFragment },
-  updatedAt: new Date(),
+  updatedAt: now,
  iosAppCredentialsList: [],
 };

@@ -47,10 +49,10 @@ export const testTargets: Target[] = [{ targetName: 'testapp', bundleIdentifier:

 export const testProvisioningProfileFragment: AppleProvisioningProfileFragment = {
  id: 'test-prov-prof-id-1',
-  expiration: new Date(),
+  expiration: now,
  developerPortalIdentifier: 'test-developer-identifier',
  provisioningProfile: testProvisioningProfileBase64,
-  updatedAt: new Date(),
+  updatedAt: now,
  status: 'Active',
  appleTeam: { ...testAppleTeamFragment },
  appleDevices: [],
@@ -62,9 +64,9 @@ export const testDistCertFragmentNoDependencies: AppleDistributionCertificateFra
  certificatePassword: 'test-password',
  serialNumber: 'test-serial',
  developerPortalIdentifier: 'test-developer-identifier',
-  validityNotAfter: new Date(),
-  validityNotBefore: new Date(),
-  updatedAt: new Date(),
+  validityNotAfter: now,
+  validityNotBefore: now,
+  updatedAt: now,
  appleTeam: { ...testAppleTeamFragment },
  iosAppBuildCredentialsList: [],
 };
@@ -75,9 +77,9 @@ export const testDistCertFragmentOneDependency: AppleDistributionCertificateFrag
  certificatePassword: 'test-password',
  serialNumber: 'test-serial',
  developerPortalIdentifier: 'test-developer-identifier',
-  validityNotAfter: new Date(),
-  validityNotBefore: new Date(),
-  updatedAt: new Date(),
+  validityNotAfter: now,
+  validityNotBefore: now,
+  updatedAt: now,
  appleTeam: { ...testAppleTeamFragment },
  iosAppBuildCredentialsList: [
    {
@@ -13,9 +13,8 @@ export class AssignFcm {
    ctx: Context,
    fcm: AndroidFcmFragment
  ): Promise<CommonAndroidAppCredentialsFragment> {
-    const appCredentials = await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
-      this.app
-    );
+    const appCredentials =
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(this.app);
    const updatedAppCredentials = await ctx.android.updateAndroidAppCredentialsAsync(
      appCredentials,
      {
@@ -23,9 +23,8 @@ export async function canCopyLegacyCredentialsAsync(
    return false; // modern credentials already exist
  }

-  const legacyAppCredentials = await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(
-    app
-  );
+  const legacyAppCredentials =
+    await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(app);
  return !!legacyAppCredentials; // user has some legacy credentials
 }

@@ -41,16 +40,14 @@ export async function promptUserAndCopyLegacyCredentialsAsync(
  const spinner = ora('Classic credentials detected, copying to EAS...').start();

  try {
-    const legacyAppCredentials = await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(
-      app
-    );
+    const legacyAppCredentials =
+      await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(app);
    if (!legacyAppCredentials) {
      return;
    }

-    const appCredentials = await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
-      app
-    );
+    const appCredentials =
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(app);
    const legacyFcm = legacyAppCredentials.androidFcm;
    if (legacyFcm) {
      const clonedFcm = await ctx.android.createFcmAsync(
@@ -120,9 +117,8 @@ export async function createOrUpdateDefaultAndroidAppBuildCredentialsAsync(
    !ctx.nonInteractive,
    'createOrUpdateDefaultAndroidAppBuildCredentialsAsync must be run in interactive mode'
  );
-  const existingDefaultBuildCredentials = await ctx.android.getDefaultAndroidAppBuildCredentialsAsync(
-    appLookupParams
-  );
+  const existingDefaultBuildCredentials =
+    await ctx.android.getDefaultAndroidAppBuildCredentialsAsync(appLookupParams);
  if (existingDefaultBuildCredentials) {
    return await ctx.android.updateAndroidAppBuildCredentialsAsync(
      existingDefaultBuildCredentials,
@@ -1,5 +1,6 @@
 import { AndroidKeystoreFragment } from '../../../graphql/generated';
 import Log from '../../../log';
+import { getProjectIdAsync } from '../../../project/projectUtils';
 import { Account } from '../../../user/Account';
 import { Context } from '../../context';
 import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
@@ -14,18 +15,21 @@ export class CreateKeystore {
    if (ctx.nonInteractive) {
      throw new Error(`New keystore cannot be created in non-interactive mode.`);
    }
-    const keystore = await this.provideOrGenerateAsync();
+
+    const projectId = await getProjectIdAsync(ctx.exp);
+    const keystore = await this.provideOrGenerateAsync(projectId);
    const keystoreFragment = await ctx.android.createKeystoreAsync(this.account, keystore);
    Log.succeed('Created keystore');
    return keystoreFragment;
  }

-  private async provideOrGenerateAsync(): Promise<KeystoreWithType> {
+  private async provideOrGenerateAsync(projectId: string): Promise<KeystoreWithType> {
    const providedKeystore = await askForUserProvidedAsync(keystoreSchema);
    if (providedKeystore) {
      const providedKeystoreWithType = getKeystoreWithType(providedKeystore);
      validateKeystore(providedKeystoreWithType);
+      return providedKeystoreWithType;
    }
-    return await generateRandomKeystoreAsync();
+    return await generateRandomKeystoreAsync(projectId);
  }
 }
@@ -54,7 +54,7 @@ export class RemoveKeystore {
      )
    );
    Log.warn(
-      'Please read https://docs.expo.io/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.'
+      'Please read https://docs.expo.dev/distribution/building-standalone-apps/#if-you-choose-to-build-for-android for more info before proceeding.'
    );
    Log.newLine();
    Log.warn(
@@ -1,10 +1,15 @@
-import { confirmAsync } from '../../../../prompts';
+import { asMock } from '../../../../__tests__/utils';
+import { jester as mockJester } from '../../../../credentials/__tests__/fixtures-constants';
+import { testKeystore } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { askForUserProvidedAsync } from '../../../utils/promptForCredentials';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateKeystore } from '../CreateKeystore';

-jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+jest.mock('../../../utils/promptForCredentials');
+jest.mock('../../../../project/ensureProjectExists');
+jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
+jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));

 describe('CreateKeystore', () => {
  it('creates a keystore in Interactive Mode', async () => {
@@ -16,6 +21,20 @@ describe('CreateKeystore', () => {
    // expect keystore to be created on expo servers
    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
  });
+  it('creates a keystore by uploading', async () => {
+    asMock(askForUserProvidedAsync).mockImplementationOnce(() => testKeystore);
+    const ctx = createCtxMock({ nonInteractive: false });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const createKeystoreAction = new CreateKeystore(appLookupParams.account);
+    await createKeystoreAction.runAsync(ctx);
+
+    // expect keystore to be created on expo servers
+    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledWith(
+      appLookupParams.account,
+      expect.objectContaining(testKeystore)
+    );
+  });
  it('errors in Non-Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: true });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
@@ -1,16 +1,17 @@
-import { confirmAsync, promptAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
  testAndroidBuildCredentialsFragment,
  testJksAndroidKeystoreFragment,
 } from '../../../__tests__/fixtures-android';
+import { jester as mockJester } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetupBuildCredentials } from '../SetupBuildCredentials';

-jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+jest.mock('../../../../project/ensureProjectExists');
+jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
+jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));

 describe('SetupBuildCredentials', () => {
  it('skips setup when there are prior credentials', async () => {
@@ -31,7 +32,6 @@ describe('SetupBuildCredentials', () => {
    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(0);
  });
  it('sets up credentials when there are no prior credentials', async () => {
-    (promptAsync as jest.Mock).mockImplementation(() => ({ providedName: 'test-provided-name' }));
    const ctx = createCtxMock({
      nonInteractive: false,
      android: {
@@ -47,7 +47,6 @@ describe('SetupBuildCredentials', () => {
    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
  });
  it('errors in Non-Interactive Mode', async () => {
-    (promptAsync as jest.Mock).mockImplementation(() => ({ providedName: 'test-provided-name' }));
    const ctx = createCtxMock({
      nonInteractive: true,
      android: {
@@ -120,9 +120,8 @@ export async function createAndroidAppBuildCredentialsAsync(
    androidKeystoreId: string;
  }
 ): Promise<AndroidAppBuildCredentialsFragment> {
-  const androidAppCredentials = await createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
-    appLookupParams
-  );
+  const androidAppCredentials =
+    await createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(appLookupParams);
  const buildCredentialsList = androidAppCredentials.androidAppBuildCredentialsList;
  const existingDefaultBuildCredentials =
    buildCredentialsList.find(buildCredentials => buildCredentials.isDefault) ?? null;
@@ -1,4 +1,2 @@
 export const keytoolCommandExistsAsync = jest.fn();
-export const exportCertificateAsync = jest.fn();
-export const logKeystoreHashesAsync = jest.fn();
 export const generateRandomKeystoreAsync = jest.fn();
@@ -1,7 +1,10 @@
 import mockdate from 'mockdate';

 import Log from '../../../../log';
-import { testAndroidAppCredentialsFragment } from '../../../__tests__/fixtures-android';
+import {
+  testAndroidAppCredentialsFragment,
+  testLegacyAndroidFcmFragment,
+} from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../../actions/BuildCredentialsUtils';
 import { displayAndroidAppCredentials } from '../printCredentials';
@@ -9,7 +12,7 @@ import { displayAndroidAppCredentials } from '../printCredentials';
 jest.mock('../../../../log');
 jest.mock('chalk', () => ({ bold: jest.fn(log => log) }));

-mockdate.set(new Date('4/20/2021'));
+mockdate.set(testLegacyAndroidFcmFragment.updatedAt);

 describe('print credentials', () => {
  it('prints the AndroidAppCredentials fragment', async () => {
@@ -2,13 +2,13 @@ import spawnAsync from '@expo/spawn-async';
 import crypto from 'crypto';
 import fs from 'fs-extra';
 import path from 'path';
-import tempy from 'tempy';
 import { v4 as uuidv4 } from 'uuid';

+import Analytics, { Event } from '../../../build/utils/analytics';
 import { AndroidKeystoreType } from '../../../graphql/generated';
 import Log from '../../../log';
 import { getTmpDirectory } from '../../../utils/paths';
-import { Keystore, KeystoreWithType } from '../credentials';
+import { KeystoreWithType } from '../credentials';

 export async function keytoolCommandExistsAsync(): Promise<boolean> {
  try {
@@ -28,63 +28,47 @@ async function ensureKeytoolCommandExistsAsync(): Promise<void> {
  }
 }

-async function writeFileToTmpAsync(base64Data: string, nameSuffix: string = ''): Promise<string> {
-  await fs.mkdirp(getTmpDirectory());
-  const filePath = path.join(getTmpDirectory(), `${uuidv4()}${nameSuffix}`);
-  await fs.writeFile(filePath, base64Data, 'base64');
-  return filePath;
+enum KeystoreCreateStep {
+  Attempt = 'attempt',
+  Fail = 'fail',
+  Success = 'success',
 }

-export async function exportCertificateAsync(
-  keystore: Keystore,
-  options?: { rfcFormat: boolean }
-): Promise<string> {
-  await ensureKeytoolCommandExistsAsync();
-  const keystorePath = await writeFileToTmpAsync(keystore.keystore, '-keystore.jks');
-  const certPath = path.join(getTmpDirectory(), `${uuidv4()}.cer`);
+export async function generateRandomKeystoreAsync(projectId: string): Promise<KeystoreWithType> {
+  const keystoreData = {
+    keystorePassword: crypto.randomBytes(16).toString('hex'),
+    keyPassword: crypto.randomBytes(16).toString('hex'),
+    keyAlias: crypto.randomBytes(16).toString('hex'),
+  };
+  return await createKeystoreAsync(keystoreData, projectId);
+}
+
+async function createKeystoreAsync(
+  credentials: {
+    keystorePassword: string;
+    keyAlias: string;
+    keyPassword: string;
+  },
+  projectId: string
+): Promise<KeystoreWithType> {
+  Analytics.logEvent(Event.ANDROID_KEYSTORE_CREATE, {
+    project_id: projectId,
+    step: KeystoreCreateStep.Attempt,
+    type: AndroidKeystoreType.Jks,
+  });
+
  try {
-    await spawnAsync('keytool', [
-      '-exportcert',
-      ...(options?.rfcFormat ? ['-rfc'] : []),
-      '-keystore',
-      keystorePath,
-      '-storepass',
-      keystore.keystorePassword,
-      '-alias',
-      keystore.keyAlias,
-      '-file',
-      certPath,
-      '-noprompt',
-      '-storetype',
-      'JKS',
-    ]);
-    return await fs.readFile(certPath, 'base64');
-  } finally {
-    await fs.remove(keystorePath);
-    await fs.remove(certPath);
+    await ensureKeytoolCommandExistsAsync();
+  } catch (error: any) {
+    Analytics.logEvent(Event.ANDROID_KEYSTORE_CREATE, {
+      project_id: projectId,
+      step: KeystoreCreateStep.Fail,
+      reason: error.message,
+      type: AndroidKeystoreType.Jks,
+    });
+    throw error;
  }
-}

-export async function logKeystoreHashesAsync(keystore: Keystore, linePrefix: string = '') {
-  const base64Cert = await exportCertificateAsync(keystore);
-  const data = Buffer.from(base64Cert, 'base64');
-  const googleHash = crypto.createHash('sha1').update(data).digest('hex').toUpperCase();
-  const googleHash256 = crypto.createHash('sha256').update(data).digest('hex').toUpperCase();
-  const fbHash = crypto.createHash('sha1').update(data).digest('base64');
-  Log.log(
-    `${linePrefix}Google Certificate Fingerprint:     ${googleHash.replace(/(.{2}(?!$))/g, '$1:')}`
-  );
-  Log.log(`${linePrefix}Google Certificate Hash (SHA-1):    ${googleHash}`);
-  Log.log(`${linePrefix}Google Certificate Hash (SHA-256):  ${googleHash256}`);
-  Log.log(`${linePrefix}Facebook Key Hash:                  ${fbHash}`);
-}
-
-async function createKeystoreAsync(credentials: {
-  keystorePassword: string;
-  keyAlias: string;
-  keyPassword: string;
-}): Promise<KeystoreWithType> {
-  await ensureKeytoolCommandExistsAsync();
  await fs.mkdirp(getTmpDirectory());
  const keystorePath = path.join(getTmpDirectory(), `${uuidv4()}-keystore.jks`);
  try {
@@ -110,42 +94,27 @@ async function createKeystoreAsync(credentials: {
      '-dname',
      `CN=,OU=,O=,L=,S=,C=US`,
    ]);
+
+    Analytics.logEvent(Event.ANDROID_KEYSTORE_CREATE, {
+      project_id: projectId,
+      step: KeystoreCreateStep.Success,
+      type: AndroidKeystoreType.Jks,
+    });
+
    return {
      ...credentials,
      keystore: await fs.readFile(keystorePath, 'base64'),
      type: AndroidKeystoreType.Jks,
    };
+  } catch (error: any) {
+    Analytics.logEvent(Event.ANDROID_KEYSTORE_CREATE, {
+      project_id: projectId,
+      step: KeystoreCreateStep.Fail,
+      reason: error.message,
+      type: AndroidKeystoreType.Jks,
+    });
+    throw error;
  } finally {
    await fs.remove(keystorePath);
  }
 }
-
-export async function generateRandomKeystoreAsync(): Promise<KeystoreWithType> {
-  const keystoreData = {
-    keystorePassword: crypto.randomBytes(16).toString('hex'),
-    keyPassword: crypto.randomBytes(16).toString('hex'),
-    keyAlias: crypto.randomBytes(16).toString('hex'),
-  };
-  return await createKeystoreAsync(keystoreData);
-}
-
-export async function validateKeystoreAsync(keystore: Keystore): Promise<void> {
-  await ensureKeytoolCommandExistsAsync();
-  try {
-    await tempy.write.task(Buffer.from(keystore.keystore, 'base64'), async keystorePath => {
-      await spawnAsync('keytool', [
-        '-list',
-        '-keystore',
-        keystorePath,
-        '-storepass',
-        keystore.keystorePassword,
-        '-alias',
-        keystore.keyAlias,
-      ]);
-    });
-  } catch (e) {
-    throw new Error(
-      `An error occurred when validating the Android keystore: ${e.stdout ?? e.message}`
-    );
-  }
-}
@@ -65,7 +65,7 @@ function getPemFromJksKeystore(keystore: Keystore): string {
  const { protectedPrivateKey } = keystoreEntry;
  try {
    return jks.decrypt(protectedPrivateKey, keystore.keyPassword);
-  } catch (e) {
+  } catch (e: any) {
    throw new Error(`${e.message}: Check that your key password is correct`);
  }
 }
@@ -79,7 +79,7 @@ function getX509Asn1FromPKCS12Keystore(
  try {
    const p12 = parsePKCS12(p12BufferOrBase64String, maybePassword);
    x509Asn1 = getX509Asn1ByFriendlyName(p12, keyAlias);
-  } catch (e) {
+  } catch (e: any) {
    throw new Error(`Invalid PKCS#12 (.p12) keystore: ${e.message}`);
  }
  if (!x509Asn1) {
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import pick from 'lodash/pick';

 import Log from '../log';
+import { getExpoConfig } from '../project/expoConfig';
 import { getProjectAccountName } from '../project/projectUtils';
 import { confirmAsync } from '../prompts';
 import { Actor, getActorDisplayName } from '../user/User';
@@ -23,6 +24,7 @@ interface AppleCtxOptions {

 interface Options extends AppleCtxOptions {
  nonInteractive?: boolean;
+  exp?: ExpoConfig;
 }

 export interface Context {
@@ -45,12 +47,13 @@ export async function createCredentialsContextAsync(
 ): Promise<Context> {
  const user = await ensureLoggedInAsync();

-  let expoConfig: ExpoConfig | undefined;
-  try {
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    expoConfig = exp;
-  } catch (error) {
-    // ignore error, context might be created outside of expo project
+  let expoConfig: ExpoConfig | undefined = options.exp;
+  if (!expoConfig) {
+    try {
+      expoConfig = getExpoConfig(projectDir);
+    } catch (error) {
+      // ignore error, context might be created outside of expo project
+    }
  }

  return new CredentialsContext(projectDir, user, expoConfig, options);
@@ -22,15 +22,15 @@ import { updateAndroidCredentialsAsync, updateIosCredentialsAsync } from '../upd
 jest.mock('fs');
 jest.mock('prompts');

-beforeEach(() => {
-  vol.reset();
-  asMock(prompts).mockReset();
-  asMock(prompts).mockImplementation(() => {
-    throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
-  });
-});
-
 describe('update credentials.json', () => {
+  beforeEach(() => {
+    vol.reset();
+    asMock(prompts).mockReset();
+    asMock(prompts).mockImplementation(() => {
+      throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
+    });
+  });
+
  describe(updateAndroidCredentialsAsync, () => {
    it('should update keystore in credentials.json if www returns valid credentials', async () => {
      const ctx = createCtxMock();
@@ -102,7 +102,7 @@ describe('update credentials.json', () => {
        delete buildCredentialsNoKeystore.androidKeystore;
        await updateAndroidCredentialsAsync(ctx, buildCredentialsNoKeystore);
        throw new Error('updateAndroidCredentialsAsync should throw an error');
-      } catch (e) {
+      } catch (e: any) {
        expect(e.message).toMatch(
          'There are no credentials configured for this project on EAS servers'
        );
@@ -278,7 +278,7 @@ describe('update credentials.json', () => {
      try {
        await updateIosCredentialsAsync(ctx, app, targets, IosDistributionType.AppStore);
        throw new Error('updateIosCredentialsAsync should throw na error');
-      } catch (e) {
+      } catch (e: any) {
        expect(e.message).toMatch('There are no credentials configured');
      }
      const certP12 = await fs.readFile('./cert.p12', 'base64');
@@ -1,4 +1,4 @@
-import Joi from '@hapi/joi';
+import Joi from 'joi';

 import { Keystore } from '../android/credentials';

@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { CredentialsSource, IosDistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
+import { CredentialsSource, DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';

 import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
 import Log from '../../log';
@@ -18,7 +18,7 @@ import { isAdHocProfile } from './utils/provisioningProfile';
 interface Options {
  app: App;
  targets: Target[];
-  distribution: IosDistributionType;
+  distribution: DistributionType;
  enterpriseProvisioning?: IosEnterpriseProvisioning;
  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
@@ -67,12 +67,8 @@ export class ConfigureProvisioningProfile {
    app: AppLookupParams,
    profileFromApple: ProvisioningProfileStoreInfo
  ): Promise<AppleProvisioningProfileMutationResult> {
-    const {
-      developerPortalIdentifier,
-      certificateP12,
-      certificatePassword,
-      serialNumber,
-    } = this.distributionCertificate;
+    const { developerPortalIdentifier, certificateP12, certificatePassword, serialNumber } =
+      this.distributionCertificate;
    assert(
      certificateP12 && certificatePassword,
      'Distribution Certificate P12 and Password is required'
@@ -221,7 +221,7 @@ async function generateDistributionCertificateAsync(
          `✅  Distribution Certificates can be revoked with no side effects for App Store builds.`
        )
      );
-      Log.log(learnMore('https://docs.expo.io/distribution/app-signing/#summary'));
+      Log.log(learnMore('https://docs.expo.dev/distribution/app-signing/#summary'));
      Log.newLine();

      const { distCertsToRevoke } = await promptAsync({
@@ -67,7 +67,7 @@ async function generatePushKeyAsync(ctx: Context, accountName: string): Promise<
  await ctx.appStore.ensureAuthenticatedAsync();
  try {
    return await ctx.appStore.createPushKeyAsync();
-  } catch (e) {
+  } catch (e: any) {
    if (e.message === APPLE_KEYS_TOO_MANY_GENERATED_ERROR) {
      const pushKeys = await ctx.appStore.listPushKeysAsync();
      Log.warn('Maximum number of Push Notifications Keys generated on Apple Developer Portal.');
@@ -80,7 +80,7 @@ async function generatePushKeyAsync(ctx: Context, accountName: string): Promise<
      }

      Log.log(chalk.grey(`⚠️  Revoking a Push Key will affect other apps that rely on it`));
-      Log.log(learnMore('https://docs.expo.io/distribution/app-signing/#push-notification-keys'));
+      Log.log(learnMore('https://docs.expo.dev/distribution/app-signing/#push-notification-keys'));
      Log.log();

      const { pushKeysToRevoke } = await promptAsync({
@@ -101,11 +101,12 @@ export class SetupAdhocProvisioningProfile {
    const chosenDevices = await chooseDevices(registeredAppleDevices, provisionedDeviceIdentifiers);

    // 4. Reuse or create the profile on Apple Developer Portal
-    const provisioningProfileStoreInfo = await ctx.appStore.createOrReuseAdhocProvisioningProfileAsync(
-      chosenDevices.map(({ identifier }) => identifier),
-      this.app.bundleIdentifier,
-      distCert.serialNumber
-    );
+    const provisioningProfileStoreInfo =
+      await ctx.appStore.createOrReuseAdhocProvisioningProfileAsync(
+        chosenDevices.map(({ identifier }) => identifier),
+        this.app.bundleIdentifier,
+        distCert.serialNumber
+      );

    // 5. Create or update the profile on servers
    const appleAppIdentifier = await ctx.ios.createOrGetExistingAppleAppIdentifierAsync(
@@ -1,4 +1,4 @@
-import { IosDistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
+import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

@@ -12,7 +12,7 @@ import { SetupTargetBuildCredentials } from './SetupTargetBuildCredentials';
 interface Options {
  app: App;
  targets: Target[];
-  distribution: IosDistributionType;
+  distribution: DistributionType;
  enterpriseProvisioning?: IosEnterpriseProvisioning;
  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
@@ -1,4 +1,4 @@
-import { IosDistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
+import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';

 import {
  IosDistributionType as GraphQLIosDistributionType,
@@ -14,7 +14,7 @@ import { SetupProvisioningProfile } from './SetupProvisioningProfile';

 interface Options {
  app: GraphQLAppLookupParams;
-  distribution: IosDistributionType;
+  distribution: DistributionType;
  enterpriseProvisioning?: IosEnterpriseProvisioning;
  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
@@ -5,6 +5,7 @@ import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testTargets } from '../../../__tests__/fixtures-ios';
 import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { CreatePushKey } from '../CreatePushKey';
+
 jest.mock('../../../../prompts');
 (confirmAsync as jest.Mock).mockImplementation(() => true);

@@ -52,11 +52,12 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupBuildCredentialsFromCredentialsJsonAction = new SetupTargetBuildCredentialsFromCredentialsJson(
-      appLookupParams,
-      IosDistributionType.AppStore,
-      targetCredentials
-    );
+    const setupBuildCredentialsFromCredentialsJsonAction =
+      new SetupTargetBuildCredentialsFromCredentialsJson(
+        appLookupParams,
+        IosDistributionType.AppStore,
+        targetCredentials
+      );
    await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);

    // expect build credentials not to be created or updated on expo servers
@@ -80,11 +81,12 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupBuildCredentialsFromCredentialsJsonAction = new SetupTargetBuildCredentialsFromCredentialsJson(
-      appLookupParams,
-      IosDistributionType.AppStore,
-      targetCredentials
-    );
+    const setupBuildCredentialsFromCredentialsJsonAction =
+      new SetupTargetBuildCredentialsFromCredentialsJson(
+        appLookupParams,
+        IosDistributionType.AppStore,
+        targetCredentials
+      );
    await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);

    // expect build credentials to be created or updated on expo servers
@@ -112,11 +114,12 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupBuildCredentialsFromCredentialsJsonAction = new SetupTargetBuildCredentialsFromCredentialsJson(
-      appLookupParams,
-      IosDistributionType.AppStore,
-      targetCredentials
-    );
+    const setupBuildCredentialsFromCredentialsJsonAction =
+      new SetupTargetBuildCredentialsFromCredentialsJson(
+        appLookupParams,
+        IosDistributionType.AppStore,
+        targetCredentials
+      );
    await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);

    // expect build credentials to be created or updated on expo servers
@@ -145,11 +148,12 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupBuildCredentialsFromCredentialsJsonAction = new SetupTargetBuildCredentialsFromCredentialsJson(
-      appLookupParams,
-      IosDistributionType.AppStore,
-      targetCredentials
-    );
+    const setupBuildCredentialsFromCredentialsJsonAction =
+      new SetupTargetBuildCredentialsFromCredentialsJson(
+        appLookupParams,
+        IosDistributionType.AppStore,
+        targetCredentials
+      );
    await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);

    // expect no prompts to be called
@@ -3,7 +3,7 @@
 exports[`select credentials select an AppleDistributionCertificate fragment 1`] = `
 "Cert ID: 5URSS525PL, Serial number: 3F9CDD6CFC6E52C1, Team ID: 77KQ969CHE
    Created: 6 months ago, Updated: 10 months ago,
-    Expires: Wed, 13 Oct 2021 18:28:44 GMT+0000Cert ID: JRH7292L8R, Serial number: 5544BE191B9F949E, Team ID: 77KQ969CHE
+    Expires: Wed, 13 Oct 2021 18:28:44 UTCCert ID: JRH7292L8R, Serial number: 5544BE191B9F949E, Team ID: 77KQ969CHE
    Created: 10 months ago, Updated: 10 months ago,
-    Expires: Tue, 22 Jun 2021 20:46:07 GMT+0000"
+    Expires: Tue, 22 Jun 2021 20:46:07 UTC"
 `;
@@ -32,7 +32,7 @@ const IosAppCredentialsQuery = {
      },
      appSpecificPassword: {
        id: '64bdd007-da7b-4190-a571-edb87e9324a1',
-        appleIdUsername: 'quin@expo.io',
+        appleIdUsername: 'quin@expo.dev',
        passwordLabel: 'description for super secret password',
        updatedAt: '2020-10-13T18:39:04.463Z',
        __typename: 'AppleAppSpecificPassword',
@@ -1,6 +1,21 @@
 import { BundleIdCapability, CapabilityType } from '@expo/apple-utils';

-import { syncCapabilitiesForEntitlementsAsync } from '../bundleIdCapabilities';
+import {
+  CapabilityMapping,
+  assertValidOptions,
+  syncCapabilitiesForEntitlementsAsync,
+} from '../bundleIdCapabilities';
+
+describe(assertValidOptions, () => {
+  it(`adds a reason for asserting capability identifiers`, () => {
+    const classifier = CapabilityMapping.find(
+      ({ capabilityIdPrefix }) => capabilityIdPrefix === 'merchant.'
+    )!;
+    expect(() => assertValidOptions(classifier, ['foobar'])).toThrowError(
+      /Expected an array of strings, where each string is prefixed with "merchant."/
+    );
+  });
+});

 describe(syncCapabilitiesForEntitlementsAsync, () => {
  it('enables all capabilities', async () => {
@@ -33,6 +48,10 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      'com.apple.developer.applesignin': ['Default'],
      'com.apple.developer.siri': true,
      'com.apple.developer.networking.wifi-info': true,
+      'com.apple.developer.usernotifications.communication': true,
+      'com.apple.developer.usernotifications.time-sensitive': true,
+      'com.apple.developer.group-session': true,
+      'com.apple.developer.family-controls': true,
      'com.apple.developer.authentication-services.autofill-credential-provider': true,
      //   'com.apple.developer.game-center': true,
      'com.apple.security.application-groups': [
@@ -61,6 +80,22 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      { capabilityType: 'APPLE_ID_AUTH', option: 'ON' },
      { capabilityType: 'SIRIKIT', option: 'ON' },
      { capabilityType: 'ACCESS_WIFI_INFORMATION', option: 'ON' },
+      {
+        capabilityType: 'USERNOTIFICATIONS_COMMUNICATION',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'USERNOTIFICATIONS_TIMESENSITIVE',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'GROUP_ACTIVITIES',
+        option: 'ON',
+      },
+      {
+        capabilityType: 'FAMILY_CONTROLS',
+        option: 'ON',
+      },
      { capabilityType: 'AUTOFILL_CREDENTIAL_PROVIDER', option: 'ON' },
      { capabilityType: 'APP_GROUPS', option: 'ON' },
    ]);
@@ -86,6 +121,10 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      'Sign In with Apple',
      'SiriKit',
      'Access WiFi Information',
+      'Communication Notifications',
+      'Time Sensitive Notifications',
+      'Group Activities',
+      'Family Controls',
      'AutoFill Credential Provider',
      'App Groups',
    ]);
@@ -0,0 +1,170 @@
+import { syncCapabilityIdentifiersForEntitlementsAsync } from '../capabilityIdentifiers';
+
+function mockCapabilities(Apple: any) {
+  Apple.MerchantId.getAsync = jest.fn(() => [
+    {
+      id: 'XXX-merch-1',
+      attributes: {
+        identifier: 'merchant.expo',
+      },
+    },
+  ]);
+
+  Apple.MerchantId.createAsync = jest.fn((ctx, { identifier }) => ({
+    id: 'XXX-merch-2',
+    attributes: {
+      identifier,
+    },
+  }));
+
+  Apple.AppGroup.getAsync = jest.fn(() => [
+    {
+      id: 'XXX-group-1',
+      attributes: {
+        identifier: 'group.expo',
+      },
+    },
+  ]);
+  Apple.AppGroup.createAsync = jest.fn((ctx, { identifier }) => ({
+    id: 'XXX-group-2',
+    attributes: {
+      identifier,
+    },
+  }));
+
+  Apple.CloudContainer.getAsync = jest.fn(() => [
+    {
+      id: 'XXX-icloud-1',
+      attributes: {
+        identifier: 'iCloud.expo',
+      },
+    },
+  ]);
+
+  Apple.CloudContainer.createAsync = jest.fn((ctx, { identifier }) => ({
+    id: 'XXX-icloud-2',
+    attributes: {
+      identifier,
+    },
+  }));
+}
+
+describe(syncCapabilityIdentifiersForEntitlementsAsync, () => {
+  it(`creates missing capability identifiers`, async () => {
+    const Apple = require('@expo/apple-utils');
+    mockCapabilities(Apple);
+
+    const bundleId = {
+      context: {},
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    await syncCapabilityIdentifiersForEntitlementsAsync(bundleId, {
+      'com.apple.developer.in-app-payments': ['merchant.bacon'],
+      'com.apple.security.application-groups': ['group.bacon'],
+      'com.apple.developer.icloud-container-identifiers': ['iCloud.bacon'],
+    });
+
+    // Ensure we create missing ids
+    expect(Apple.MerchantId.createAsync).toHaveBeenLastCalledWith(
+      // auth context
+      {},
+      // props
+      { identifier: 'merchant.bacon' }
+    );
+    // Ensure we create missing ids
+    expect(Apple.AppGroup.createAsync).toHaveBeenLastCalledWith(
+      // auth context
+      {},
+      // props
+      { identifier: 'group.bacon' }
+    );
+    // Ensure we create missing ids
+    expect(Apple.CloudContainer.createAsync).toHaveBeenLastCalledWith(
+      // auth context
+      {},
+      // props
+      { identifier: 'iCloud.bacon' }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
+      {
+        capabilityType: 'APP_GROUPS',
+        option: 'ON',
+        relationships: {
+          appGroups: ['XXX-group-2'],
+        },
+      },
+      {
+        capabilityType: 'APPLE_PAY',
+        option: 'ON',
+        relationships: {
+          merchantIds: ['XXX-merch-2'],
+        },
+      },
+      {
+        capabilityType: 'ICLOUD',
+        option: 'ON',
+        relationships: {
+          cloudContainers: ['XXX-icloud-2'],
+        },
+      },
+    ]);
+  });
+
+  it(`removes local duplicates`, async () => {
+    const Apple = require('@expo/apple-utils');
+    mockCapabilities(Apple);
+    const bundleId = {
+      context: {},
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    await syncCapabilityIdentifiersForEntitlementsAsync(bundleId, {
+      'com.apple.developer.in-app-payments': ['merchant.expo', 'merchant.expo'],
+    });
+
+    // Only called once because we remove local duplicates to minimize network requests.
+    expect(Apple.MerchantId.getAsync).toBeCalledTimes(1);
+  });
+
+  it(`creates missing capability identifiers`, async () => {
+    const Apple = require('@expo/apple-utils');
+    mockCapabilities(Apple);
+    const bundleId = {
+      context: {},
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    await syncCapabilityIdentifiersForEntitlementsAsync(bundleId, {
+      'com.apple.developer.in-app-payments': ['merchant.expo'],
+    });
+
+    expect(Apple.MerchantId.createAsync).not.toBeCalled();
+  });
+
+  it(`throws when creating a missing capability that is reserved`, async () => {
+    const Apple = require('@expo/apple-utils');
+    mockCapabilities(Apple);
+    Apple.MerchantId.createAsync = jest.fn((ctx: any, { identifier }: { identifier: string }) => {
+      // e2e test with: merchant.expodemo
+      throw new Error(
+        `There is a problem with the request entity - A Merchant ID with Identifier '${identifier}' is not available. Please enter a different string.`
+      );
+    });
+    const bundleId = {
+      context: {},
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    await expect(
+      syncCapabilityIdentifiersForEntitlementsAsync(bundleId, {
+        'com.apple.developer.in-app-payments': ['merchant.bacon'],
+      })
+    ).rejects.toThrow(/is not available. Please enter a different string/);
+  });
+});
@@ -178,7 +178,7 @@ export async function authenticateAsync(options: Options = {}): Promise<AuthCtx>
      // Defined for legacy usage in Turtle V1 or any other places where Fastlane is used in the servers.
      fastlaneSession,
    };
-  } catch (error) {
+  } catch (error: any) {
    if (error.message === 'ABORTED') {
      process.exit(1);
    }
@@ -25,7 +25,7 @@ export async function getProfilesForBundleIdAsync(
      try {
        await profile.getBundleIdAsync();
        validProfileIds.add(profile.id);
-      } catch (e) {
+      } catch (e: any) {
        if (
          e.name === 'UnexpectedAppleResponse' &&
          e.message.includes('The specified resource does not exist - There is no resource of type')
@@ -1,17 +1,20 @@
 import {
+  AppGroup,
  BundleId,
  BundleIdCapability,
  CapabilityOptionMap,
  CapabilityType,
  CapabilityTypeDataProtectionOption,
  CapabilityTypeOption,
+  CloudContainer,
+  MerchantId,
 } from '@expo/apple-utils';
 import { JSONObject, JSONValue } from '@expo/json-file';
 import getenv from 'getenv';

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

-const EXPO_NO_CAPABILITY_SYNC = getenv.boolish('EXPO_NO_CAPABILITY_SYNC', false);
+export const EXPO_NO_CAPABILITY_SYNC = getenv.boolish('EXPO_NO_CAPABILITY_SYNC', false);

 type GetOptionsMethod<T extends CapabilityType = any> = (
  entitlement: JSONValue,
@@ -22,17 +25,30 @@ const validateBooleanOptions = (options: any): boolean => {
  return typeof options === 'boolean';
 };

+const validatePrefixedStringArrayOptions =
+  (prefix: string) =>
+  (options: any): boolean => {
+    return (
+      Array.isArray(options) &&
+      options.every(option => typeof option === 'string' && option.startsWith(prefix))
+    );
+  };
+
 const validateStringArrayOptions = (options: any): boolean => {
  return Array.isArray(options) && options.every(option => typeof option === 'string');
 };

-const createValidateStringOptions = (allowed: string[]) => (options: any): boolean => {
-  return allowed.includes(options);
-};
+const createValidateStringOptions =
+  (allowed: string[]) =>
+  (options: any): boolean => {
+    return allowed.includes(options);
+  };

-const createValidateStringArrayOptions = (allowed: string[]) => (options: any): boolean => {
-  return Array.isArray(options) && options.every(option => allowed.includes(option));
-};
+const createValidateStringArrayOptions =
+  (allowed: string[]) =>
+  (options: any): boolean => {
+    return Array.isArray(options) && options.every(option => allowed.includes(option));
+  };

 const validateDevProdString = createValidateStringOptions(['development', 'production']);

@@ -63,7 +79,9 @@ export async function syncCapabilitiesForEntitlementsAsync(
  bundleId: BundleId,
  entitlements: JSONObject = {}
 ): Promise<{ enabled: string[]; disabled: string[] }> {
-  if (EXPO_NO_CAPABILITY_SYNC) return { enabled: [], disabled: [] };
+  if (EXPO_NO_CAPABILITY_SYNC) {
+    return { enabled: [], disabled: [] };
+  }
  const currentCapabilities = await bundleId.getBundleIdCapabilitiesAsync();
  if (Log.isDebug) {
    Log.log(`Current remote capabilities:\n${JSON.stringify(currentCapabilities, null, 2)}`);
@@ -107,7 +125,7 @@ function getCapabilitiesToEnable(
      continue;
    }

-    const existingIndex = currentCapabilities.findIndex(existing =>
+    const existingIndex = remainingCapabilities.findIndex(existing =>
      existing.isType(staticCapabilityInfo.capability)
    );
    const existing = existingIndex > -1 ? remainingCapabilities[existingIndex] : null;
@@ -120,16 +138,19 @@ function getCapabilitiesToEnable(
      remainingCapabilities.splice(existingIndex, 1);
      if (Log.isDebug) {
        Log.log(`Skipping existing capability: ${key} (${staticCapabilityInfo.name})`);
+        Log.log(
+          `Remaining to remove: `,
+          remainingCapabilities.map(({ id }) => id)
+        );
      }
      continue;
    }

-    if (!staticCapabilityInfo.validateOptions(value)) {
-      throw new Error(`iOS entitlement "${key}" has invalid value "${value}".`);
-    }
+    assertValidOptions(staticCapabilityInfo, value);
+
    enabledCapabilityNames.push(staticCapabilityInfo.name);

-    const option = staticCapabilityInfo.getOptions(value!, entitlements);
+    const option = staticCapabilityInfo.getOptions(value, entitlements);

    request.push({
      capabilityType: staticCapabilityInfo.capability,
@@ -140,11 +161,30 @@ function getCapabilitiesToEnable(
  return { enabledCapabilityNames, request, remainingCapabilities };
 }

+export function assertValidOptions(classifier: CapabilityClassifier, value: any): asserts value {
+  if (!classifier.validateOptions(value)) {
+    let reason = '';
+    if (classifier.capabilityIdPrefix) {
+      // Assert string array matching prefix. ASC will throw if the IDs are invalid, this just saves some time.
+      reason = ` Expected an array of strings, where each string is prefixed with "${classifier.capabilityIdPrefix}", ex: ["${classifier.capabilityIdPrefix}myapp"]`;
+    }
+    throw new Error(
+      `iOS entitlement "${classifier.entitlement}" has invalid value "${value}".${reason}`
+    );
+  }
+}
+
 function getCapabilitiesToDisable(
  bundleId: BundleId,
  currentCapabilities: BundleIdCapability[],
  request: { capabilityType: CapabilityType; option: any }[]
 ) {
+  if (Log.isDebug) {
+    Log.log(
+      `Existing to disable: `,
+      currentCapabilities.map(({ id }) => id)
+    );
+  }
  const disabledCapabilityNames: string[] = [];

  // Disable any extras that aren't present, this functionality is kinda unreliable because managed apps
@@ -192,17 +232,21 @@ function getCapabilitiesToDisable(
  return { disabledCapabilityNames, request };
 }

-// NOTE(Bacon): From manually toggling values in Xcode and checking the git diff and network requests.
-// Last Updated: May 5th, 2021
-// https://developer.apple.com/documentation/bundleresources/entitlements
-export const CapabilityMapping: {
+type CapabilityClassifier = {
  name: string;
  entitlement: string;
  capability: CapabilityType;
  validateOptions: (options: any) => boolean;
  getOptions: GetOptionsMethod;
+  capabilityIdModel?: typeof MerchantId;
+  capabilityIdPrefix?: string;
  options?: undefined;
-}[] = [
+};
+
+// NOTE(Bacon): From manually toggling values in Xcode and checking the git diff and network requests.
+// Last Updated: July 22nd, 2021
+// https://developer.apple.com/documentation/bundleresources/entitlements
+export const CapabilityMapping: CapabilityClassifier[] = [
  {
    name: 'HomeKit',
    entitlement: 'com.apple.developer.homekit',
@@ -287,24 +331,30 @@ export const CapabilityMapping: {
    entitlement: 'com.apple.security.application-groups',
    capability: CapabilityType.APP_GROUP,
    // Ex: ['group.CY-A5149AC2-49FC-11E7-B3F3-0335A16FFB8D.com.cydia.Extender']
-    validateOptions: validateStringArrayOptions,
+    validateOptions: validatePrefixedStringArrayOptions('group.'),
    getOptions: getDefinedOptions,
+    capabilityIdModel: AppGroup,
+    capabilityIdPrefix: 'group.',
  },
  {
    name: 'Apple Pay Payment Processing',
    entitlement: 'com.apple.developer.in-app-payments',
    capability: CapabilityType.APPLE_PAY,
    // Ex: ['merchant.com.example.development']
-    validateOptions: validateStringArrayOptions,
+    validateOptions: validatePrefixedStringArrayOptions('merchant.'),
    getOptions: getDefinedOptions,
+    capabilityIdModel: MerchantId,
+    capabilityIdPrefix: 'merchant.',
  },
  {
    name: 'iCloud',
    entitlement: 'com.apple.developer.icloud-container-identifiers',
    capability: CapabilityType.ICLOUD,
-    validateOptions: validateStringArrayOptions,
+    validateOptions: validatePrefixedStringArrayOptions('iCloud.'),
    // Only supports Xcode +6, 5 could be added if needed.
    getOptions: getDefinedOptions,
+    capabilityIdModel: CloudContainer,
+    capabilityIdPrefix: 'iCloud.',
  },
  {
    name: 'ClassKit',
@@ -313,6 +363,34 @@ export const CapabilityMapping: {
    validateOptions: validateDevProdString,
    getOptions: getDefinedOptions,
  },
+  {
+    name: 'Communication Notifications',
+    entitlement: 'com.apple.developer.usernotifications.communication',
+    capability: CapabilityType.USER_NOTIFICATIONS_COMMUNICATION,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    name: 'Time Sensitive Notifications',
+    entitlement: 'com.apple.developer.usernotifications.time-sensitive',
+    capability: CapabilityType.USER_NOTIFICATIONS_TIME_SENSITIVE,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    name: 'Group Activities',
+    entitlement: 'com.apple.developer.group-session',
+    capability: CapabilityType.GROUP_ACTIVITIES,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    name: 'Family Controls',
+    entitlement: 'com.apple.developer.family-controls',
+    capability: CapabilityType.FAMILY_CONTROLS,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
  {
    // https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_default-data-protection
    name: 'Data Protection',
Author	SHA1	Message	Date
Dominik Sokal	0c94f80f68	v0.26.0	2021-09-08 09:50:50 +02:00
Wojciech Kozyra	95f308737e	[eas-cli] support for names with unicode only characters (#596 ) * [eas-cli] support for names with unicode only characters * update CHANGELOG	2021-09-08 09:46:12 +02:00
Dominik Sokal	2a2a0392cd	[ENG-755] drop support for `eas submit` CLI configuration params (#590 ) * drop submit flags in favor of profiles * use platform-specific mutations * update CHANGELOG * update asc app id log * address PR feedback * use release as default submit profile only when eas.json exists * address more PR feedback * add link to docs * address even more PR feedback * fix detecting release submit profile	2021-09-07 16:14:19 +02:00
Dominik Sokal	bcbdae8278	upgrade axios to 0.21.4	2021-09-07 10:05:24 +02:00
Dominik Sokal	805aee67ee	add `eas diagnostics` + github issue templates (#594 ) * add 'eas diagnostics' command * add issue templates * update CHANGELOG	2021-09-06 16:03:51 +02:00
Dominik Sokal	0477984d7a	add CODE_OF_CONDUCT.md	2021-09-06 15:58:39 +02:00
Wojciech Kozyra	4e96196e07	remove @babel/core from package.json (#593 )	2021-09-06 15:46:28 +02:00
Mike Willbanks	25ee2abdaa	[eas-cli] git config --get core.ignorecase exits with code 1 (#592 ) When `git config --get core.ignorecase` is run and the variable is not currently set, it will return with an exit code of 1 thus causing the `eas build` command to stop running. To solve this, we try/catch and then return undefined to allow for the default behavior.	2021-09-06 14:44:06 +02:00
kgc00	75b71ae457	[eas-cli] Adds Keystore Create Tracking (#579 ) - Converts credentials command to an `EASCommand` - Adds analytics for android keystore create commands	2021-09-03 09:36:22 -07:00
Dominik Sokal	7548fc35fd	update CHANGELOG	2021-09-01 10:12:33 +02:00
Dominik Sokal	5bc14b5b30	v0.25.0	2021-09-01 10:00:39 +02:00
L	bee98ce25e	[eas-cli] Update metro config check to support Windows (#588 ) * Update metro config check to support Windows Since Windows use backtick, the added regex address this issue. * Update CHANGELOG.md * Update CHANGELOG.md * Fix eslint error	2021-09-01 09:54:29 +02:00
Dominik Sokal	0e6a5315ab	clean up repo deps + use volta (#589 ) * move eslint-plugin-graphql from root to eas-cli * install @babel/core to suppress yarn install warning * use volta * fix lint warning in .eslintrc.js * address PR feedback * bump @types/node to 16.7.8	2021-08-31 17:11:52 +02:00
Wojciech KozyraandDominik Sokal	91b51528ef	[eas-cli] detect case inconsistencies on macos (#570 ) * [eas-cli] detect case inconsistencies on macos * update CHANGELOG * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]> * add explanatiion to undefined value * add better error message + fyi page Co-authored-by: Dominik Sokal <[email protected]>	2021-08-31 16:56:36 +02:00
Wojciech KozyraandDominik Sokal	5e3962afc2	[eas-cli] fix detecting `googleServicesFile` with `EAS_NO_VCS=1` (#583 ) * [eas-cli] fix detecting services file with * update CHANGELOG * Update packages/eas-cli/src/vcs/vcs.ts Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-08-31 16:30:29 +02:00
Dominik Sokal	f07c52d2fb	[ENG-755] add `--no-wait` support for `eas submit` (#578 ) * support --no-wait in eas submit * update CHANGELOG	2021-08-31 14:49:15 +02:00
Dominik Sokal	50846a1a96	Use `ts-jest` instead of `babel-jest` (#585 ) * run tests with ts-jest * remove babel from dependencies * update CHANGELOG	2021-08-31 12:18:20 +02:00
Dominik Sokal	4cb726f374	bump typescript target to ES2019 (#584 ) * bump typescript target to ES2019 * update CHANGELOG	2021-08-30 15:32:48 +02:00
Dominik Sokal	da9d1b4984	replace @hapi/joi with joi + upgrade dependencies (#582 ) * replace @hapi/joi with joi * upgrade fs-extra to 10.0.0 * upgrade typescript to 4.4.2 * upgrade other eas-cli dependencies * update repo deps * fix typos * add ': any' to every catch statement * downgrade some deps as they require ts project to output ESM * fix fs mock * update snapshots * downgrade indent-string (esm issue) * update CHANGELOG	2021-08-30 14:07:25 +02:00
Dominik Sokal	64ad52dc45	drop support for node < 12 (#581 ) * drop support for node < 12 * run CI workflows on node 16 * update CHANGELOG	2021-08-30 09:57:59 +02:00
Bartłomiej Klocek	6169e5ff5b	Add ESLint rule to prevent relative package imports (#576 )	2021-08-25 14:43:12 +02:00
Dominik Sokal	ef33973f7f	update CHANGELOG	2021-08-25 11:57:34 +02:00
Dominik Sokal	33a5254f2a	v0.24.1	2021-08-25 11:48:08 +02:00
Dominik Sokal	0d737ecf6d	update CHANGELOG	2021-08-25 11:39:46 +02:00
Dominik Sokal	951eea2396	fix EasJsonReader import	2021-08-25 11:37:04 +02:00
Dominik Sokal	75968bf449	update CHANGELOG	2021-08-25 11:25:43 +02:00
Dominik Sokal	32aa46ac69	v0.24.0	2021-08-25 11:15:02 +02:00
Evan Bacon Evan Bacon Dominik Sokal	339cae2532	Bump apple-utils to v25 (#574 ) * Bump apple-utils to v25 * Update CHANGELOG.md * Apply suggestions from code review Co-authored-by: Evan Bacon <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-08-25 09:48:03 +02:00
Axel DelafosseandDominik Sokal	e6ec3bfe6a	[eas-cli] update QR code url for Android internal distribution build and generate smaller QR code (#573 ) * [eas-cli] update qr code url and generate smaller qr code * [eas-cli] update changelog * [eas-cli] fix prettier * [eas-cli] update changelog Co-authored-by: Dominik Sokal <[email protected]> * [eas-cli] update changelog Co-authored-by: Dominik Sokal <[email protected]> * [eas-cli] clean code Co-authored-by: Dominik Sokal <[email protected]>	2021-08-24 17:45:32 +02:00
Juwan Wheatley	012518c375	Update expo.io references to expo.dev (#568 ) * Update expo.io references to expo.dev * fix snapshot	2021-08-23 19:48:37 -04:00
Brent Vatne	cc8c8584d9	[eas-cli] Link to project page and add archive FYI link to build command output (#562 )	2021-08-20 13:58:53 -07:00
jkh	d1910b3c42	[eas-cli] add ability to double publish (#566 )	2021-08-20 11:16:43 -07:00
Wojciech KozyraandDominik Sokal	4a1fa3d4fa	[eas-cli] warn if NODE_ENV or googleServicesFile is missing (#569 ) * [eas-cli] warn if NODE_ENV or googleServicesFile is missing * update CHANGELOG * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-08-20 12:31:46 +02:00
Wojciech Kozyra	61178c9d06	add `changesNotSentForReview` option to android submissions (#560 ) * add changesNotSentForReview option to android submits * update CHANGELOG * fix types in tests * review feedback	2021-08-19 15:01:14 +02:00
Wojciech KozyraandDominik Sokal	094c04c7f0	[eas-cli] support --json flag for build commands (#567 ) * [eas-cli] support --json flag for build commands * sanitize json object * update CHANGELOG * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-08-19 14:58:19 +02:00
kgc00	37cca4878d	[eas-cli] Introduce RudderStack (#563 ) - adds RudderStack to the analytics file - reworks some of the existing amplitude tracking event structure to properly record data	2021-08-18 10:46:19 -07:00
Wojciech Kozyra	2b40e1ec05	[eas-cli] support submit profiles (#555 ) * [eas-cli] support submit profiles * Update CHANGELOG * review feedback	2021-08-13 11:53:58 +02:00
Bartłomiej Klocek	6e95d3afcc	[eas cli] Fix SKU not being applied to App Store Connect (#559 ) * [eas submit] Fix SKU not being applied to App Store Connect * Update CHANGELOG	2021-08-13 10:36:09 +02:00
Wojciech Kozyra	6b9b9f0be2	[eas-cli] fix metadata for simulator builds (#556 ) * [eas-cli] fix metadata for simulator builds * Update CHANGELOG	2021-08-13 10:08:27 +02:00
Brent Vatne	f14b963b29	[eas-cli] Stop using project name in build details URL (#554 )	2021-08-12 21:53:47 -07:00
andy	ddd2814e8f	[submit] log submissions link at end of eas-submit (#553 )	2021-08-11 11:00:22 -07:00
jkh	36f15a81a9	[changelog] fix formatting (#552 )	2021-08-06 07:47:31 -07:00
jkh	ece93dac20	[eas-cli] add --auto flag to publish (#549 )	2021-08-06 05:58:04 -07:00
Brent Vatne	0226dbba5a	Update CHANGELOG and README	2021-08-05 15:34:16 -07:00
Brent Vatne	e773e77185	v0.23.0	2021-08-05 15:19:01 -07:00
Brent Vatne	893cbb2ec5	[eas-cli] Pass through build settings metadata context to app version resolver (#550 )	2021-08-05 15:17:30 -07:00
jkh	1898de2609	[eas-cli] add type to generated manifest fragment (#535 )	2021-08-05 06:50:20 -07:00
jkh	fe03cc28c4	[eas-cli] stop sending deprecated storageBucket field (#547 )	2021-08-03 13:55:00 -07:00
Wojciech Kozyra	5309b7b6ce	Update CHANGELOG	2021-08-02 13:23:20 +02:00
Wojciech Kozyra	bc9b8442d7	v0.22.4	2021-08-02 13:07:52 +02:00
Wojciech Kozyra	a84762b00d	[eas-cli] override distribution when building for simulator	2021-08-02 12:57:59 +02:00
Wojciech Kozyra	2d117e1d7e	v0.22.3	2021-08-02 12:49:51 +02:00
Sallar	986674942d	[eas-json][eas-cli] add simulator key to build profile json validator (#546 ) * Add simulator to build profile json validator * Update CHANGELOG.md * Fix PR number * Change the order of simulator key	2021-08-02 12:46:21 +02:00
Wojciech Kozyra	13c224589b	Update CHANGELOG	2021-08-02 10:57:16 +02:00
Wojciech Kozyra	20b091fbfa	v0.22.2	2021-08-02 10:35:08 +02:00
Wojciech Kozyra	168b6afdfa	[eas-cli] do not read BuildSettings on managed project	2021-08-02 10:10:03 +02:00
Dominik Sokal	3c6320b929	Update CHANGELOG.md	2021-07-30 14:03:18 +02:00
Dominik Sokal	4f1dc582bd	[ENG-1570] evaluate interpolated iOS version strings (#541 ) * evaluate interpolated ios version strings * update CHANGELOG	2021-07-30 14:00:31 +02:00
Wojciech Kozyra	daf2ef1e30	[eas-cli] fix unknown state error (#543 ) * [eas-cli] fix unknown state error * update CHANGELOG	2021-07-30 13:32:22 +02:00
Wojciech Kozyra	f703bd8b5a	[eas-cli] validate metadata in build request (#542 ) * [eas-cli] validate metadata in build request * Update CHANGELOG	2021-07-30 13:23:47 +02:00
Dominik Sokal	997cd7058a	[ENG-1475] Additional filters for eas build:list (#540 ) * generate graphql code * use new App.builds api * add more filters to build:list * update CHANGELOG	2021-07-30 10:31:51 +02:00
Wojciech Kozyra	e896c2f6c5	Update CHANGELOG	2021-07-29 14:55:04 +02:00
Wojciech Kozyra	3d723ca426	Use new eas.json format + auto migrate from old format (#537 ) * Use new eas.json format + aot migrate old format * review feedback * review feedback 2 * fix	2021-07-29 14:50:08 +02:00
Dominik Sokal	c17e1b3fa2	[ENG-1600] warn when building managed project that does not extend @expo/metro-config in metro.config.js (#534 ) * warn when building managed project that does not extend @expo/metro-config in metro.config.js * update CHANGELOG * address PR feedback * fix lint warnings/errors	2021-07-29 09:33:37 +02:00
Quinlan Jung	d70fc36485	update changelog	2021-07-28 15:48:22 -07:00
Quinlan Jung	47784ca6d3	v0.22.1	2021-07-28 14:58:33 -07:00
Quinlan Jung	3e5a3aca27	[eas-cli] fix keystore upload bug (#538 ) * [eas-cli] fix upload bug * changelog	2021-07-28 14:55:36 -07:00
Dominik Sokal	89b0227594	[chore] upgrade: eslint, prettier, etc. (#536 ) * upgrade: eslint, prettier, etc. * run prettier	2021-07-28 11:12:06 +02:00
Dominik Sokal	b98a30e7c6	install missing dep: fast-glob	2021-07-27 13:16:23 +02:00
Dominik Sokal	5c7862a685	upgrade typescript + clean up deps (#533 ) * upgrade typescript to 4.3.5 * remove unused dependencies * upgrade tslib * update CHANGELOG	2021-07-27 12:22:39 +02:00
Bartłomiej KlocekandDominik Sokal	82833a9eb4	[eas submit][android] Autodetect google-services JSON key path (#520 ) * foundation * detection logic * add tests * Update CHANGELOG, ignore `node_modules` * Display a chooser for multiple files * Improve tests * move `filterAsync` to a separate file * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]> * Fix indent Co-authored-by: Dominik Sokal <[email protected]>	2021-07-27 12:22:25 +02:00
Dominik Sokal	66171c3c4b	[ENG-1524] use envs from eas.json when resolving app config (#532 ) * use envs from eas.json when resolving app config * update CHANGELOG * address PR feedback	2021-07-26 15:38:42 +02:00
Wojciech KozyraandDominik Sokal	179def91c7	[eas-cli] use .pbxproj file to check if native Xcode project is present (#531 ) * [eas-cli] use .pbxproj file to check if native Xcode project is present * Update CHANGELOG.md * Update packages/eas-cli/src/project/ios/scheme.ts Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-07-26 15:33:44 +02:00
Dominik Sokal	9f63ad4527	update CHANGELOG	2021-07-23 10:33:19 +02:00
Dominik Sokal	878028271a	v0.22.0	2021-07-23 10:25:00 +02:00
Dominik Sokal	d4e15bbcbf	add `iosEnterpriseProvisioning` to build metadata (#522 ) * generate graphql code * add iosEnterpriseProvisioning to build metadata * update CHANGELOG * upgrade @expo/eas-build-job to 0.2.44	2021-07-23 10:09:19 +02:00
Evan Bacon	13bb056df1	Create and link capability identifiers automatically (#524 ) * Create and link capability identifiers automatically * changelog * Update capabilityIdentifiers.ts * Update capabilityIdentifiers.ts * Added better assertion errors	2021-07-22 18:50:51 -06:00
Will Schurman	14d56904d2	[eas-cli] Upload exp config in extra when publishing or republishing (#514 )	2021-07-22 10:30:23 -07:00
Dominik Sokal	c2ffd05763	fall back to APK when building for internal distribution (#527 ) * fall back to APK when building for internal distribution * update CHANGELOG * address PR feedback	2021-07-22 16:21:20 +02:00
Dominik Sokal	46e394fbef	use default version code when it's not defined for managed project in app.json (#526 ) * use default version code when it's not defined for managed project in app.json * update CHANGELOG	2021-07-22 13:36:26 +02:00
Dominik Sokal	2613f0c2f9	enable lint rule for curly braces around blocks (#525 )	2021-07-22 11:49:12 +02:00
Bartłomiej KlocekandWojciech Kozyra	e5fd7c01f4	[eas submit] propagate build id to submission mutation (#518 ) * Propagate build id * Display build details in submission summary * Update tests * Add test for build id * Unify build fragment naming * Apply suggestion Co-authored-by: Wojciech Kozyra <[email protected]> Co-authored-by: Wojciech Kozyra <[email protected]>	2021-07-22 11:21:57 +02:00
Evan Bacon	73a0dd6e23	Fix capability syncing (#521 ) * Update bundleIdCapabilities.ts * Update CHANGELOG.md	2021-07-21 12:22:43 -06:00
Dominik Sokal	a9dc7f9eeb	don't show diff for generated files (yarn.lock, graphql files)	2021-07-21 10:43:22 +02:00
Bartłomiej KlocekandBrent Vatne	c3836f23d1	[eas submit] Pretty-print iPad multitasking error message (#517 ) * [eas submit] Pretty-print iPad multitasking error message * Apply suggestion Co-authored-by: Brent Vatne <[email protected]> Co-authored-by: Brent Vatne <[email protected]>	2021-07-21 08:00:21 +02:00
Cedric van Putten	bfd73cbb19	[eas-cli] Add force option to overwrite existing secrets (#513 ) * [eas-cli] Add force option to overwrite existing secrets * Add changelog entry	2021-07-15 17:15:29 +02:00
Wojciech Kozyra	6a1753edaa	[eas-cli] handle blocked amplitude domains (#512 ) * [eas-cli] handle blocked amplitude domains * update CHANGELOG	2021-07-14 13:28:17 +02:00
Wojciech KozyraandBrent Vatne	558a73086d	[eas-cli] add error message when free tier is disabled (#509 ) * [eas-cli] add error message when free tier is disabled * Update packages/eas-cli/src/build/build.ts Co-authored-by: Brent Vatne <[email protected]> Co-authored-by: Brent Vatne <[email protected]>	2021-07-13 12:36:20 +02:00
jkh	15966fbd26	[eas-cli] un-hide project:* (#500 )	2021-07-12 13:57:36 -07:00
Dominik Sokal	1e8b55383e	update CHANGELOG	2021-07-12 10:51:57 +02:00
Dominik Sokal	6920ebb0ba	v0.21.0	2021-07-12 10:43:10 +02:00
Dominik Sokal	55f35949e1	build:list / build:view - print runtime version (#508 ) * build:list / build:view - print runtime version * update CHANGELOG	2021-07-12 10:38:17 +02:00
Dominik Sokal	ccb998a221	[ENG-1460] add runtime version to build metadata (#493 ) * add runtime version to build metadata * update CHANGELOG * upgrade @expo/eas-build-job to 0.2.43	2021-07-12 09:46:00 +02:00
Dominik Sokal	30bc27b4c4	[ENG-1474] build:list / build:view: print more metadata (#504 ) * build:list / build:view: print more metadata * update CHANGELOG	2021-07-12 09:36:58 +02:00
Evan Bacon	da3c95ccaf	Added iOS 15 capabilities (#499 ) * Added iOS 15 capabilities * Update CHANGELOG.md	2021-07-09 14:18:52 -06:00
Dominik Sokal	bbcbe1dceb	update CHANGELOG	2021-07-09 10:41:01 +02:00