v0.40.0

* [eas-cli] change eas update:publish to eas update

* update CHANGELOG.md

* grammar

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   extends: ['universe/node'],
-  plugins: ['async-protect'],
+  plugins: ['async-protect', 'node'],
   rules: {
     'no-console': 'warn',
     'no-constant-condition': ['warn', { checkLoops: false }],
@@ -11,7 +11,6 @@ module.exports = {
         ignoreDeclarationSort: true,
       },
     ],
-    'flowtype/no-types-missing-file-annotation': 'off',
     curly: 'warn',
     'import/no-cycle': 'error',
     'import/no-extraneous-dependencies': [
@@ -34,6 +33,7 @@ module.exports = {
         ],
       },
     ],
+    'no-underscore-dangle': ['error', { allow: ['__typename'] }],
     '@typescript-eslint/explicit-function-return-type': [
       'warn',
       {
@@ -41,6 +41,7 @@ module.exports = {
       },
     ],
     'async-protect/async-suffix': 'error',
+    'node/no-sync': 'error',
   },
   overrides: [
     {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -21,6 +21,13 @@ body:
       label: Summary
       description: Describe the issue in 1 or 2 sentences
       placeholder: Clearly describe what the expected behavior is vs. what is actually happening. This should be as short as possible, while still communicating all the necessary information. If your summary is just 'X library/method isn't working', then you need to continue debugging yourself and provide more information.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Managed or bare?
+      description: See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
+      placeholder: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project.
   - type: textarea
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE

@@ -2,8 +2,7 @@
 
 # Checklist
 
-- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary.
-- [ ] I've tagged the changelog entry with `[EAS BUILD API]` if it's a part of a breaking change to EAS Build API (only possible when updating `@expo/eas-build-job` package).
+- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.
 
 # Why
 

.github/workflows/changelog.yml

@@ -0,0 +1,46 @@
+on:
+  issue_comment:
+    types: [created]
+
+name: Changelog
+
+jobs:
+  pr-commented:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           draft: true
@@ -25,7 +25,7 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
@@ -58,7 +58,7 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
@@ -81,7 +81,7 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
@@ -113,3 +113,70 @@ jobs:
           asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
           asset_name: ${{ steps.x86.outputs.filename }}
           asset_content_type: application/gzip
+  publish-to-npm:
+    name: Publish to npm
+    runs-on: ubuntu-latest
+    needs: [build-linux, build-mac, build-windows]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          registry-url: 'https://registry.npmjs.org/'
+          scope: 'expo'
+          node-version: '16'
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --check-files
+      - name: Build
+        run: yarn build
+      - name: Publish packages to npm
+        run: yarn lerna publish from-package --yes --no-verify-access
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+  release-changelog:
+    name: Update changelog and publish release
+    runs-on: ubuntu-latest
+    needs: publish-to-npm
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Resolve version
+        run: echo "EAS_CLI_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+      - name: Update changelog
+        working-directory: ./scripts
+        run: yarn --silent release-changelog $EAS_CLI_VERSION > /tmp/current-changelog
+      - name: Publish release
+        run: hub release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit and push
+        run: |
+          git fetch
+          git checkout main
+          git config --global user.email "[email protected]"
+          git config --global user.name "Expo CI"
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push
+      - name: Prepare changelog for Slack
+        run: |
+          tail -n +3 /tmp/current-changelog > /tmp/changelog.md
+          npx slackmd /tmp/changelog.md
+          echo 'SLACK_CHANGELOG<<EOF' >> $GITHUB_ENV
+          cat /tmp/changelog.slack.md >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: eas-cli
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_ICON: https://github.com/expo-ci.png?size=48
+          SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
+          SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
+          SLACK_USERNAME: 'Expo CI'
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_FOOTER: ''

.github/workflows/size.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - uses: preactjs/compressed-size-action@v2

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files

.gitignore

@@ -1,14 +1,18 @@
+# Build directories
+packages/*/build
+packages/eas-cli/dist
+
+# Code editors
+.idea
+.history
+
+# macOS
+.DS_Store
+
+# Node
+node_modules
 *-debug.log
 *-error.log
 
-**/build/**
-!packages/eas-cli/src/commands/build/**
-!packages/eas-cli/src/build/**
-
-dist
-/package-lock.json
-tmp
-node_modules
+# Tests
 coverage
-.history
-.DS_Store

.prettierrc

@@ -2,7 +2,7 @@
   "printWidth": 100,
   "tabWidth": 2,
   "singleQuote": true,
-  "jsxBracketSameLine": true,
+  "bracketSameLine": true,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

CHANGELOG.md

@@ -6,10 +6,311 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
+- [eas-cli] change eas update:publish to eas update. ([#830](https://github.com/expo/eas-cli/pull/830) by [@jkhales](https://github.com/jkhales))
+
 ### 🎉 New features
 
 ### 🐛 Bug fixes
 
+- Pass build profile environment to credentials command. ([#828](https://github.com/expo/eas-cli/pull/828) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+## [0.39.0](https://github.com/expo/eas-cli/releases/tag/v0.39.0) - 2021-12-06
+
+### 🎉 New features
+
+- Set runtime version in `eas update:configure`. ([#811](https://github.com/expo/eas-cli/pull/811) by [@jkhales](https://github.com/jkhales))
+- Print project workflow in `eas diagnostics`. ([#822](https://github.com/expo/eas-cli/pull/822) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Improve error message for missing ascAppId. ([#813](https://github.com/expo/eas-cli/pull/813) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `react-native` version to metadata. ([#823](https://github.com/expo/eas-cli/pull/823) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.38.3](https://github.com/expo/eas-cli/releases/tag/v0.38.3) - 2021-11-29
+
+### 🐛 Bug fixes
+
+- Print warning about outdated version to stderr. ([#805](https://github.com/expo/eas-cli/pull/805) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix Apple sign in capabilities. ([#806](https://github.com/expo/eas-cli/pull/806) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.2](https://github.com/expo/eas-cli/releases/tag/v0.38.2) - 2021-11-26
+
+### 🎉 New features
+
+- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
+- Add command: `eas update:configure`. ([#800](https://github.com/expo/eas-cli/pull/800) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
+- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
+
+### 🐛 Bug fixes
+
+- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
+
+## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
+
+### 🎉 New features
+
+- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
+- Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Compute runtime version policies. ([#783](https://github.com/expo/eas-cli/pull/783), [#785](https://github.com/expo/eas-cli/pull/785) by [@jkhales](https://github.com/jkhales))
+- Fix local builds with npm < 7. ([#787](https://github.com/expo/eas-cli/pull/787) by [@dsokal](https://github.com/dsokal))
+- Override `applicationId`/`bundleIdentifier` when auto-submitting after build. ([#780](https://github.com/expo/eas-cli/pull/780) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Upgrade `typescript` to 4.5.2. Upgrade oclif dependencies. ([#781](https://github.com/expo/eas-cli/pull/781) by [@dsokal](https://github.com/dsokal))
+- Make missing `git` command error message more descriptive. ([#784](https://github.com/expo/eas-cli/pull/784) by [@dsokal](https://github.com/dsokal))
+
+## [0.37.0](https://github.com/expo/eas-cli/releases/tag/v0.37.0) - 2021-11-18
+
+### 🛠 Breaking changes
+
+- Require explicitly defined applicationId/bundleIdentifier for EAS Submit in case of bare projects consisting of multiple product flavors on Android or multiple schemes/targets on iOS. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- Auto create channel on publish. ([#766](https://github.com/expo/eas-cli/pull/766) by [@jkhales](https://github.com/jkhales))
+- Interactively configure Git `user.name` and `user.email`. ([#772](https://github.com/expo/eas-cli/pull/772) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Validate release channel in eas.json. ([#764](https://github.com/expo/eas-cli/pull/764) by [@dsokal](https://github.com/dsokal))
+- Make the missing profile error message more descriptive. ([#761](https://github.com/expo/eas-cli/pull/761) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Better error message when missing eas.json. ([#770](https://github.com/expo/eas-cli/pull/770) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.36.1](https://github.com/expo/eas-cli/releases/tag/v0.36.1) - 2021-11-15
+
+### 🐛 Bug fixes
+
+- Fix `dateformat` import issue when building with `--local` flag. ([a520d](https://github.com/expo/eas-cli/commit/a520d1750736d61d6489da6487879f35ed3deb23) by [@dsokal](https://github.com/dsokal))
+
+## [0.36.0](https://github.com/expo/eas-cli/releases/tag/v0.36.0) - 2021-11-15
+
+### 🛠 Breaking changes
+
+- Do not require manual `eas-cli-local-build-plugin` installation. An existing global installation (either with `yarn global add` or `npm install -g`) will not be used anymore. ([#753](https://github.com/expo/eas-cli/pull/753) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Use Keystore Service when `keytool` is not installed. ([#754](https://github.com/expo/eas-cli/pull/754) by [@dsokal](https://github.com/dsokal))
+- Add applicationId/bundleIdentifier fields to the submit profile. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix auto-submitting with `--auto-submit-with-profile`. ([#748](https://github.com/expo/eas-cli/pull/748) by [@dsokal](https://github.com/dsokal))
+- Pass env from build profile when resolving entitlements. ([#751](https://github.com/expo/eas-cli/pull/751) by [@wkozyra95](https://github.com/wkozyra95))
+- Only prompt for Apple Id username if authenticating with an App Specific Password. ([#745](https://github.com/expo/eas-cli/pull/745) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Use same URL paths for local development of EAS CLI as production. ([#750](https://github.com/expo/eas-cli/pull/750) by [@ide](https://github.com/ide))
+- Grammar: Api -> API. ([#755](https://github.com/expo/eas-cli/pull/755) by [@quinlanj](https://github.com/quinlanj))
+- Add analytics for EAS Submit. ([#752](https://github.com/expo/eas-cli/pull/752) by [@quinlanj](https://github.com/quinlanj))
+- Add an 'attempt' event to build and submit analytics. ([#757](https://github.com/expo/eas-cli/pull/757) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.35.0](https://github.com/expo/eas-cli/releases/tag/v0.35.0) - 2021-11-08
+
+### 🎉 New features
+
+- Add ASC API Key generation workflow. ([#718](https://github.com/expo/eas-cli/pull/718) by [@quinlanj](https://github.com/quinlanj))
+- Add support for removal of ASC API Keys. ([#721](https://github.com/expo/eas-cli/pull/721) by [@quinlanj](https://github.com/quinlanj))
+- Allow users to assign an ASC API Key to their project. ([#719](https://github.com/expo/eas-cli/pull/719) by [@quinlanj](https://github.com/quinlanj))
+- Add setup support for ASC API Keys. ([#733](https://github.com/expo/eas-cli/pull/733) by [@quinlanj](https://github.com/quinlanj))
+- Show initiating user display name when selecting a build to submit. ([#730](https://github.com/expo/eas-cli/pull/730) by [@barthap](https://github.com/barthap))
+- Handle Apple servers maintenance error in `eas submit`. ([#738](https://github.com/expo/eas-cli/pull/738) by [@barthap](https://github.com/barthap))
+- Integrate ASC API Key with submissions workflow. ([#737](https://github.com/expo/eas-cli/pull/737) by [@quinlanj](https://github.com/quinlanj))
+- Change EAS API server domain. ([#744](https://github.com/expo/eas-cli/pull/744) by [@ide](https://github.com/ide))
+
+### 🧹 Chores
+
+- Clean up credentials prompt method. ([#728](https://github.com/expo/eas-cli/pull/728) by [@quinlanj](https://github.com/quinlanj))
+- Bump `@expo/apple-utils` to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
+- Grammar: replace setup with set up. ([#735](https://github.com/expo/eas-cli/pull/735) by [@quinlanj](https://github.com/quinlanj))
+- Improve VCS workflow migration experience. ([#732](https://github.com/expo/eas-cli/pull/732) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.34.1](https://github.com/expo/eas-cli/releases/tag/v0.34.1) - 2021-11-02
+
+### 🐛 Bug fixes
+
+- Don't show commit prompt in no-commit workflow after installing `expo-dev-client`. ([#722](https://github.com/expo/eas-cli/pull/722) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add App Store Connect API Key graphql type and print support. ([#717](https://github.com/expo/eas-cli/pull/717) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.34.0](https://github.com/expo/eas-cli/releases/tag/v0.34.0) - 2021-11-01
+
+### 🛠 Breaking changes
+
+- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
+- Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
+- Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
+- Implement no-commit build workflow. Add required `cli` field in root of `eas.json`. ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Better error message when eas.json is invalid. ([#707](https://github.com/expo/eas-cli/pull/707) by [@dsokal](https://github.com/dsokal))
+- Fix credentials workflow for new users: add additionalTypenames for credentials. ([#703](https://github.com/expo/eas-cli/pull/703) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Add additionalTypenames for other queries. ([#704](https://github.com/expo/eas-cli/pull/704) by [@quinlanj](https://github.com/quinlanj))
+- Fix errors after pulling down most recent graphql schema changes. ([#713](https://github.com/expo/eas-cli/pull/713) by [@quinlanj](https://github.com/quinlanj))
+- Refactor credentials manager. ([#712](https://github.com/expo/eas-cli/pull/712) by [@quinlanj](https://github.com/quinlanj))
+- Remove unneeded parameters. ([#710](https://github.com/expo/eas-cli/pull/710) by [@quinlanj](https://github.com/quinlanj))
+- Enforce additionalTypenames for graphql queries. ([#709](https://github.com/expo/eas-cli/pull/709) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.33.1](https://github.com/expo/eas-cli/releases/tag/v0.33.1) - 2021-10-22
+
+### 🎉 New features
+
+- Compute runtime version using config-plugins. ([#697](https://github.com/expo/eas-cli/pull/697) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ ([#706](https://github.com/expo/eas-cli/pull/706) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.33.0](https://github.com/expo/eas-cli/releases/tag/v0.33.0) - 2021-10-20
+
+### 🎉 New features
+
+- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
+  - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
+  - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
+    ```json
+      {
+        "build": {
+          "production": { ... }
+        },
+        "submit": {
+          "production": { ... }
+        }
+      }
+    ```
+
+### 🐛 Bug fixes
+
+- Skip the second prompt for Apple ID if the user is already signed in with Apple. ([#691](https://github.com/expo/eas-cli/pull/691) by [@dsokal](https://github.com/dsokal))
+- Unify reading `app.json`. ([#692](https://github.com/expo/eas-cli/pull/692) by [@dsokal](https://github.com/dsokal))
+
+## [0.32.0](https://github.com/expo/eas-cli/releases/tag/v0.32.0) - 2021-10-15
+
+### 🎉 New features
+
+- Add App Store Connect API Key support to iOS submissions. ([#678](https://github.com/expo/eas-cli/pull/678) by [@quinlanj](https://github.com/quinlanj))
+- Create/list/revoke App Store Connect Api keys via Apple apis. ([#687](https://github.com/expo/eas-cli/pull/687) by [@quinlanj](https://github.com/quinlanj))
+- Add ability to select a build from a list in `eas submit` interactive mode. ([#688](https://github.com/expo/eas-cli/pull/688) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix printing App Store Connect URL after submission. ([#683](https://github.com/expo/eas-cli/pull/683) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Add App Store Connect API Key fields to `eas.json`. ([#684](https://github.com/expo/eas-cli/pull/684) by [@quinlanj](https://github.com/quinlanj))
+- Enable no-underscore-dangle eslint rule. ([#686](https://github.com/expo/eas-cli/pull/686) by [@dsokal](https://github.com/dsokal))
+
+## [0.31.1](https://github.com/expo/eas-cli/releases/tag/v0.31.1) - 2021-10-08
+
+### 🐛 Bug fixes
+
+- Google Service Account Keys: Fix non-interactive bug in credentials service workflow ([#682](https://github.com/expo/eas-cli/pull/682) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.31.0](https://github.com/expo/eas-cli/releases/tag/v0.31.0) - 2021-10-08
+
+### 🛠 Breaking changes
+
+- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95) + [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Integrate credentials service with Android submissions. ([#664](https://github.com/expo/eas-cli/pull/664) by [@quinlanj](https://github.com/quinlanj))
+- Add option to review ad-hoc devices when reusing provisioning profile. ([#673](https://github.com/expo/eas-cli/pull/673) by [@dsokal](https://github.com/dsokal))
+
+## [0.30.1](https://github.com/expo/eas-cli/releases/tag/v0.30.1) - 2021-10-06
+
+### 🐛 Bug fixes
+
+- Fix `--json` flag when running EAS CLI on GitHub actions. ([#669](https://github.com/expo/eas-cli/pull/669) by [@dsokal](https://github.com/dsokal))
+- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project.([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
+- Fix building monorepo projects on Windows. ([#671](https://github.com/expo/eas-cli/pull/671) by [@dsokal](https://github.com/dsokal))
+
+## [0.30.0](https://github.com/expo/eas-cli/releases/tag/v0.30.0) - 2021-10-05
+
+### 🛠 Breaking changes
+
+- Enable auto-incrementing on Android. ([#645](https://github.com/expo/eas-cli/pull/645) by [@jkhales](https://github.com/jkhales))
+
+### 🧹 Chores
+
+- Ports detection for Google Service Account Keys into the credentials service. ([#660](https://github.com/expo/eas-cli/pull/660) by [@quinlanj](https://github.com/quinlanj))
+- Improve iOS credentials printing. ([#657](https://github.com/expo/eas-cli/pull/657) by [@quinlanj](https://github.com/quinlanj))
+- Automate `eas-cli` releases. ([#668](https://github.com/expo/eas-cli/pull/668) by [@dsokal](https://github.com/dsokal))
+
+## [0.29.1](https://github.com/expo/eas-cli/releases/tag/v0.29.1) - 2021-09-29
+
+### 🎉 New features
+
+- More upload support for Google Service Account Keys. ([#649](https://github.com/expo/eas-cli/pull/649) by [@quinlanj](https://github.com/quinlanj))
+- Allow the user to assign an existing Google Service Account Key to their project. ([#650](https://github.com/expo/eas-cli/pull/650) by [@quinlanj](https://github.com/quinlanj))
+- Allow the user to remove a Google Service Account Key from their account. ([#658](https://github.com/expo/eas-cli/pull/658) by [@quinlanj](https://github.com/quinlanj))
+- Adds setup support for Google Service Account Keys. ([#659](https://github.com/expo/eas-cli/pull/659) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix double prompt for Apple credentials when running `eas build --auto-submit`. ([#654](https://github.com/expo/eas-cli/pull/654) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Always use async `fs` functions. ([#652](https://github.com/expo/eas-cli/pull/652) by [@dsokal](https://github.com/dsokal))
+- Improve Android credentials printing. ([#656](https://github.com/expo/eas-cli/pull/656) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.29.0](https://github.com/expo/eas-cli/releases/tag/v0.29.0) - 2021-09-28
+
+### 🎉 New features
+
+- Added upload support for Google Service Account Keys. ([#642](https://github.com/expo/eas-cli/pull/642) by [@quinlanj](https://github.com/quinlanj))
+- Add Xcode 13 image. ([#651](https://github.com/expo/eas-cli/pull/651) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Credentials manager: stop prompting for an Android build profile every iteration. ([#641](https://github.com/expo/eas-cli/pull/641) by [@quinlanj](https://github.com/quinlanj))
+- Don't display prompt in non-interactive mode when the metro config seems invalid. ([#644](https://github.com/expo/eas-cli/pull/644) by [@dsokal](https://github.com/dsokal))
+- Read versions from correct `Info.plist`. ([#635](https://github.com/expo/eas-cli/pull/635) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Move away from weird convention of exports. ([#647](https://github.com/expo/eas-cli/pull/647) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.28.2](https://github.com/expo/eas-cli/releases/tag/v0.28.2) - 2021-09-23
+
+### 🐛 Bug fixes
+
+- Use `log-symbols` to unify green ticks style. ([#639](https://github.com/expo/eas-cli/pull/639) by [@dsokal](https://github.com/dsokal))
+- Fix `eas build --auto-submit` in fresh projects. ([#640](https://github.com/expo/eas-cli/pull/640) by [@dsokal](https://github.com/dsokal))
+
+## [0.28.1](https://github.com/expo/eas-cli/releases/tag/v0.28.1) - 2021-09-22
+
+### 🐛 Bug fixes
+
 - Prevent ora spinners breaking when debug logs are enabled. ([#575](https://github.com/expo/eas-cli/pull/575) by [@EvanBacon](https://github.com/EvanBacon))
 - Do not fail `eas build` when transient network errors occur. ([#638](https://github.com/expo/eas-cli/pull/638) by [@dsokal](https://github.com/dsokal))
 
@@ -18,7 +319,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add GraphQL support for GoogleServiceAccountKey. ([#632](https://github.com/expo/eas-cli/pull/632) by [@quinlanj](https://github.com/quinlanj))
 - Remove GraphQL support for the App Specific Password. ([#633](https://github.com/expo/eas-cli/pull/633) by [@quinlanj](https://github.com/quinlanj))
 
-## [0.28.0](https://github.com/expo/eas-cli/releases/tag/v0.28.0) - 2021-09-10
+## [0.28.0](https://github.com/expo/eas-cli/releases/tag/v0.28.0) - 2021-09-20
 
 ### 🎉 New features
 
@@ -323,7 +624,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- `[EAS BUILD API]` Remove "Auto" option for `schemeBuildConfiguration` and make the old "Auto" behaviour the default. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
+- Remove "Auto" option for `schemeBuildConfiguration` and make the old "Auto" behaviour the default. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
 - Remove `experimental.disableIosBundleIdentifierValidation` flag from eas.json. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
 - Deprecate `android.package` and `ios.bundleIdentifier` in app config for generic projects. EAS CLI depends on the values in native code now. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
 - Remove application id synchronization (`android.package` and `ios.bundleIdentifier`) between app.json and native code when running builds. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))

CONTRIBUTING.md

@@ -1,39 +1,4 @@
 ## Releasing a new version
 
-1. Run `yarn release` in the repository root folder. This will create a new tag like `v1.0.0`.
-1. **Wait until the `release` GitHub workflow has finished.**
-   ![Wait for all three jobs to complete](./.gh-assets/release-workflow.png)
-1. Run `yarn lerna publish from-git` in the repository root folder. This will publish the packages to npm.
-
-   - This command works only if `HEAD` is on the release commit, e.g. when `git log -1` prints:
-
-     ```
-     commit cbb2de9e118bfbcb5a597b261d2dbef0bb5d4b0b (tag: v0.11.1)
-     Author: Brent Vatne <[email protected]>
-     Date:   Tue Apr 20 15:00:15 2021 -0700
-
-         v0.11.1
-     ```
-
-   - If you run `yarn lerna publish from-git` on any other commit, it'll print something like:
-
-     ```
-     lerna notice from-git No tagged release found
-     lerna success No changed packages to publish
-     ```
-
-   - If you ever run into the above issue, use `git checkout RELEASE_COMMIT_HASH` to checkout to the release commit. Later, when you've published the packages to npm, run `git checkout main` to go back to the latest commit.
-
-1. Update `CHANGELOG.md`.
-   - Add the new section with the release version in the title.
-   - Leave the `main` section empty (without any changelog entries).
-1. Once the release is ready to go, you can go to https://github.com/expo/eas-cli/releases and mark it as not draft.
-   - Remember to copy the changelog entries from `CHANGELOG.md`.
-   - Before hitting the submit button, make sure there are 5 assets available under the release entry.
-     ![There are 5 assets for each release](./.gh-assets/draft-release.png)
-1. If any of the changelog entries have been tagged with `[EAS BUILD API]`
-   - Open `package.json` and note the version of `@expo/eas-build-job` used in the eas-cli.
-   - Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commit/) for that version. In most cases, it will be the latest `Publish` commit.
-   - Find the `eas-cli-local-build-plugin` version published in that commit.
-     ![example publish commit](./.gh-assets/eas-build-publish-commit.png)
-   - Run `npm dist-tags add eas-cli-local-build-plugin@VERSION latest` with the version from the previous step.
+1. Run `yarn release` in the repository root folder.
+2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.28.1"
+  "version": "0.40.0"
 }

package.json

@@ -10,9 +10,10 @@
     "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint . --ext .ts --ext .js",
-    "release": "lerna version",
-    "test": "jest"
+    "lint": "eslint .",
+    "release": "./scripts/bin/run update-local-plugin && lerna version",
+    "test": "jest",
+    "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
     "@expo/oclif-dev-cli": "1.24.0-expo",
@@ -21,15 +22,16 @@
     "eslint": "7.32.0",
     "eslint-config-universe": "8.0.0",
     "eslint-plugin-async-protect": "1.1.0",
+    "eslint-plugin-node": "11.1.0",
     "jest": "27.1.0",
     "jest-watch-typeahead": "0.6.4",
     "lerna": "4.0.0",
-    "prettier": "2.3.2",
+    "prettier": "2.4.1",
     "ts-jest": "27.0.5",
-    "typescript": "4.4.2"
+    "typescript": "4.5.2"
   },
   "volta": {
-    "node": "16.8.0",
-    "yarn": "1.22.11"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
   }
 }

packages/eas-cli/README.md

@@ -7,9 +7,9 @@ EAS command line tool
 [![Downloads/week](https://img.shields.io/npm/dw/eas-cli.svg)](https://npmjs.org/package/eas-cli)
 [![License](https://img.shields.io/npm/l/eas-cli.svg)](https://github.com/expo/eas-cli/blob/main/package.json)
 
-* [Installation](#installation)
-* [Usage](#usage)
-* [Commands](#commands)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Commands](#commands)
 
 # Installation
 
@@ -73,7 +73,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/account/login.js)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -87,7 +87,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/account/logout.js)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -101,7 +101,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/account/view.js)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -112,11 +112,11 @@ USAGE
   $ eas analytics [STATUS]
 ```
 
-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas build`
 
-start a build
+Start a build
 
 ```
 USAGE
@@ -138,14 +138,15 @@ OPTIONS
 
   --non-interactive                        Run command in non-interactive mode
 
-  --profile=PROFILE_NAME                   [default: release] Name of the build profile from eas.json
+  --profile=PROFILE_NAME                   Name of the build profile from eas.json. Defaults to "production" if defined
+                                           in eas.json.
 
   --skip-project-configuration             Skip project configuration
 
   --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/build/index.js)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -156,7 +157,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/build/cancel.js)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -170,7 +171,7 @@ OPTIONS
   -p, --platform=(android|ios|all)  Platform to configure
 ```
 
-_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/build/configure.js)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:list`
 
@@ -203,7 +204,7 @@ OPTIONS
   --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```
 
-_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/build/list.js)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -217,7 +218,7 @@ OPTIONS
   --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```
 
-_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/build/view.js)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas config`
 
@@ -232,7 +233,7 @@ OPTIONS
   --profile=profile
 ```
 
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -243,7 +244,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -254,7 +255,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:list`
 
@@ -268,7 +269,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/device/list.js)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -279,7 +280,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/device/view.js)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -290,7 +291,7 @@ USAGE
   $ eas diagnostics
 ```
 
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -307,7 +308,7 @@ OPTIONS
   --all  see all commands in CLI
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.3/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.5/src/commands/help.ts)_
 
 ## `eas project:info`
 
@@ -318,7 +319,7 @@ USAGE
   $ eas project:info
 ```
 
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/project/info.js)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -332,7 +333,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/project/init.js)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -349,7 +350,7 @@ OPTIONS
   --value=value              Value of the secret
 ```
 
-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -363,10 +364,10 @@ OPTIONS
   --id=id  ID of the secret to delete
 
 DESCRIPTION
-  Unsure where to find the secret's ID? Run eas secrets:list
+  Unsure where to find the secret's ID? Run eas secret:list
 ```
 
-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/secret/delete.js)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -377,11 +378,11 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/secret/list.js)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
-submit build archive to app store
+Submit build archive to App Store Connect
 
 ```
 USAGE
@@ -394,7 +395,7 @@ OPTIONS
   --non-interactive                 Run command in non-interactive mode
   --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
+  --profile=profile                 Name of the submit profile from eas.json. Defaults to "production" if defined in
                                     eas.json.
 
   --url=url                         App archive url
@@ -404,13 +405,14 @@ OPTIONS
   --[no-]wait                       Wait for submission to complete
 
 DESCRIPTION
-  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
+  See how to configure submits with eas.json: 
+  https://docs.expo.dev/submit/eas-json/
 
 ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas webhook:create`
 
@@ -421,15 +423,15 @@ USAGE
   $ eas webhook:create
 
 OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
 
-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
+  --secret=secret         Secret used to create a hash signature of the request payload, provided in the
+                          'Expo-Signature' header.
 
-  --url=url        Webhook URL
+  --url=url               Webhook URL
 ```
 
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/webhook/create.js)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -443,7 +445,7 @@ ARGUMENTS
   ID  ID of the webhook to delete
 ```
 
-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/webhook/delete.js)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -454,10 +456,10 @@ USAGE
   $ eas webhook:list
 
 OPTIONS
-  --event=(BUILD)  Event type that triggers the webhook
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
 ```
 
-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/webhook/list.js)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -468,16 +470,16 @@ USAGE
   $ eas webhook:update
 
 OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
-  --id=id          (required) Webhook ID
+  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
+  --id=id                 (required) Webhook ID
 
-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
+  --secret=secret         Secret used to create a hash signature of the request payload, provided in the
+                          'Expo-Signature' header.
 
-  --url=url        Webhook URL
+  --url=url               Webhook URL
 ```
 
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/webhook/update.js)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -491,5 +493,5 @@ ARGUMENTS
   ID  ID of the webhook to view
 ```
 
-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.28.1/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/view.ts)_
 <!-- commandsstop -->

packages/eas-cli/__mocks__/fs.ts

@@ -1,8 +1,10 @@
 import { fs } from 'memfs';
 
 // needed because of a weird bug with tempy (dependency of @expo/config-plugins)
+// eslint-disable-next-line node/no-sync
 fs.mkdirSync('/tmp');
 if (process.env.TMPDIR) {
+  // eslint-disable-next-line node/no-sync
   fs.mkdirSync(process.env.TMPDIR, { recursive: true });
 }
 

packages/eas-cli/graphql-codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://staging.exp.host/--/graphql'
+schema: 'https://staging-api.expo.dev/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'

packages/eas-cli/package.json

@@ -1,32 +1,31 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.28.1",
+  "version": "0.40.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.25",
-    "@expo/config": "5.0.9",
-    "@expo/config-plugins": "3.1.0",
-    "@expo/eas-build-job": "0.2.46",
-    "@expo/eas-json": "^0.28.0",
-    "@expo/json-file": "8.2.33",
-    "@expo/pkcs12": "0.0.4",
-    "@expo/plist": "0.0.14",
-    "@expo/plugin-warn-if-update-available": "1.7.0",
-    "@expo/prebuild-config": "2.1.0",
+    "@expo/apple-utils": "0.0.0-alpha.26",
+    "@expo/config": "6.0.11",
+    "@expo/config-plugins": "4.0.11",
+    "@expo/eas-build-job": "0.2.61",
+    "@expo/eas-json": "^0.40.0",
+    "@expo/json-file": "8.2.34",
+    "@expo/pkcs12": "0.0.6",
+    "@expo/plist": "0.0.16",
+    "@expo/plugin-warn-if-update-available": "1.7.1",
+    "@expo/prebuild-config": "3.0.11",
     "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.0.7",
-    "@expo/sdk-runtime-versions": "1.0.0",
+    "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.5.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/command": "1.8.0",
-    "@oclif/config": "1.17.0",
+    "@oclif/command": "1.8.3",
+    "@oclif/config": "1.17.1",
     "@oclif/errors": "1.3.5",
-    "@oclif/plugin-help": "3.2.3",
+    "@oclif/plugin-help": "3.2.5",
     "@urql/core": "2.3.1",
     "@urql/exchange-retry": "0.3.0",
     "chalk": "4.1.2",
@@ -48,6 +47,7 @@
     "jks-js": "1.0.1",
     "joi": "17.4.2",
     "keychain": "1.3.0",
+    "log-symbols": "4.1.0",
     "mime": "2.5.2",
     "minimatch": "3.0.4",
     "nanoid": "3.1.25",
@@ -60,6 +60,7 @@
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
     "semver": "7.3.5",
+    "slash": "3.0.0",
     "strip-ansi": "6.0.0",
     "tar": "6.1.11",
     "terminal-link": "2.1.1",
@@ -94,7 +95,8 @@
     "mockdate": "^3.0.2",
     "nock": "^13.0.5",
     "tempy": "0.7.0",
-    "ts-deepmerge": "1.0.8"
+    "ts-deepmerge": "1.0.8",
+    "typescript": "4.5.2"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -111,7 +113,6 @@
     "cli"
   ],
   "license": "MIT",
-  "main": "build/index.js",
   "oclif": {
     "bin": "eas",
     "commands": "./build/commands",
@@ -175,6 +176,7 @@
     "typecheck": "tsc",
     "test": "jest",
     "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
-    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
+    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
+    "clean": "rm -rf dist build node_modules yarn-error.log"
   }
 }

packages/eas-cli/patch-readme.js

@@ -1,10 +1,12 @@
-const fs = require('fs');
+const { promises: fs } = require('fs');
 
-// Patch `oclif-dev readme` path and link generation
-let readmeContent = fs.readFileSync('README.md', 'utf8');
-readmeContent = readmeContent.replace(/\[build\//g, '[src/');
-readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
-fs.writeFileSync('README.md', readmeContent);
+(async () => {
+  // Patch `oclif-dev readme` path and link generation
+  let readmeContent = await fs.readFile('README.md', 'utf8');
+  readmeContent = readmeContent.replace(/\[build\//g, '[src/');
+  readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
+  await fs.writeFile('README.md', readmeContent);
 
-// eslint-disable-next-line no-console
-console.log('Patched README path generation');
+  // eslint-disable-next-line no-console
+  console.log('Patched README path generation');
+})();

packages/eas-cli/src/__mocks__/ora.ts

@@ -1,4 +1,4 @@
-export default jest.fn().mockReturnValue({
+export const ora = jest.fn().mockReturnValue({
   start: jest.fn().mockReturnValue({
     fail: jest.fn(),
     succeed: jest.fn(),

packages/eas-cli/src/__tests__/api-test.ts

@@ -8,7 +8,7 @@ import { apiClient, getExpoApiBaseUrl } from '../api';
 describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl())
-      .post('/--/api/v2/test')
+      .post('/v2/test')
       .reply(400, {
         errors: [
           {
@@ -39,7 +39,7 @@ describe('apiClient', () => {
   });
 
   it('does not convert non-APIv2 error to ApiV2Error', async () => {
-    nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong');
+    nock(getExpoApiBaseUrl()).post('/v2/test').reply(500, 'Something went wrong');
 
     let error: Error | null = null;
     try {

packages/eas-cli/src/__tests__/project-utils.ts

@@ -25,7 +25,7 @@ interface AppJSON {
   };
 }
 
-function createTestProject(
+export function createTestProject(
   user: Actor,
   appJSONExtraData?: Record<string, object | string>
 ): MockProject {
@@ -58,5 +58,3 @@ function createTestProject(
     },
   };
 }
-
-export { createTestProject };

packages/eas-cli/src/analytics/common.ts

@@ -0,0 +1,25 @@
+import { Analytics, Event } from './events';
+
+export type TrackingContext = Record<string, string | number | boolean>;
+
+export async function withAnalyticsAsync<Result>(
+  fn: () => Promise<Result>,
+  analytics: {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+    trackingCtx: TrackingContext;
+  }
+): Promise<Result> {
+  try {
+    const result = await fn();
+    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+    return result;
+  } catch (error: any) {
+    Analytics.logEvent(analytics.failureEvent, {
+      ...analytics.trackingCtx,
+      reason: error.message,
+    });
+    throw error;
+  }
+}

packages/eas-cli/src/analytics/events.ts

@@ -0,0 +1,52 @@
+import { logEvent } from './rudderstackClient';
+export type Event = BuildEvent | SubmissionEvent;
+
+export enum SubmissionEvent {
+  SUBMIT_COMMAND = 'submit cli submit command',
+  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
+  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
+  SUBMIT_COMMAND_FAIL = 'submit cli fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
+  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
+  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
+  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
+  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
+  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
+  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
+}
+
+export enum BuildEvent {
+  BUILD_COMMAND = 'build cli build command',
+  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
+  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
+  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
+  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
+  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
+  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
+  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
+  BUILD_REQUEST_SUCCESS = 'build cli build request success',
+  BUILD_REQUEST_FAIL = 'build cli build request fail',
+
+  BUILD_STATUS_COMMAND = 'build cli build status',
+
+  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
+  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 class Analytics {
+  static logEvent(name: Event, properties: Record<string, any>): void {
+    logEvent(name, properties);
+  }
+}

packages/eas-cli/src/analytics/rudderstackClient.ts

@@ -3,14 +3,8 @@ import os from 'os';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import UserSettings from './user/UserSettings';
-
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../package.json');
+import UserSettings from '../user/UserSettings';
+import { easCliVersion } from '../utils/easCli';
 
 const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   darwin: 'Mac',
@@ -65,7 +59,6 @@ export async function initAsync(): Promise<void> {
         flushInterval: 300,
       }
     );
-    rudderstackClient.logger.silent = true;
   }
 }
 
@@ -87,7 +80,7 @@ export async function setUserDataAsync(userId: string, traits: Record<string, an
 
 export async function flushAsync(): Promise<void> {
   if (rudderstackClient) {
-    rudderstackClient.flush();
+    await rudderstackClient.flush();
   }
 }
 
@@ -98,7 +91,7 @@ export function logEvent(name: string, properties: Record<string, any> = {}): vo
   ensureUserIdentified();
 
   const { userId, deviceId } = identifyData ?? {};
-  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
+  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
 
   const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
   rudderstackClient.track({
@@ -114,13 +107,11 @@ function ensureUserIdentified(): void {
     return;
   }
 
-  if (rudderstackClient) {
-    rudderstackClient.identify({
-      userId: identifyData.userId,
-      anonymousId: identifyData.deviceId,
-      traits: identifyData.traits,
-    });
-  }
+  rudderstackClient.identify({
+    userId: identifyData.userId,
+    anonymousId: identifyData.deviceId,
+    traits: identifyData.traits,
+  });
   userIdentified = true;
 }
 
@@ -129,7 +120,7 @@ function getRudderStackContext(): Record<string, any> {
   return {
     os: { name: platform, version: os.release() },
     device: { type: platform, model: platform },
-    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
+    app: { name: 'eas cli', version: easCliVersion ?? undefined },
   };
 }
 

packages/eas-cli/src/api.ts

@@ -4,7 +4,7 @@ import ApiV2Error from './ApiV2Error';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';
 
 export const apiClient = got.extend({
-  prefixUrl: getExpoApiBaseUrl() + '/--/api/v2/',
+  prefixUrl: getExpoApiBaseUrl() + '/v2/',
   hooks: {
     beforeRequest: [
       (options: NormalizedOptions) => {
@@ -40,11 +40,11 @@ export const apiClient = got.extend({
 
 export function getExpoApiBaseUrl(): string {
   if (process.env.EXPO_STAGING) {
-    return `https://staging.exp.host`;
+    return `https://staging-api.expo.dev`;
   } else if (process.env.EXPO_LOCAL) {
     return `http://127.0.0.1:3000`;
   } else {
-    return `https://exp.host`;
+    return `https://api.expo.dev`;
   }
 }
 

packages/eas-cli/src/build/android/UpdatesModule.ts

@@ -1,6 +1,5 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
-import fs from 'fs-extra';
 
 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
@@ -10,17 +9,6 @@ import { ensureValidVersions } from '../utils/updates';
 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
-
-  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const updatedBuildGradleContents =
-      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
-        projectDir,
-        buildGradleContents
-      );
-    await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
-  }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
   const androidManifest = await getAndroidManifestAsync(projectDir);
@@ -39,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
   try {
-    await ensureUpdatesConfiguredAsync(projectDir, exp);
+    await ensureUpdatesConfiguredAsync(projectDir);
   } catch (error) {
     Log.error(
       'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -62,15 +50,9 @@ export async function syncUpdatesConfigurationAsync(
   }
 }
 
-async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
-
-  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const gradleScriptApply = AndroidConfig.Updates.formatApplyLineForBuildGradle(projectDir);
-    throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
-  }
-
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
   const androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {

packages/eas-cli/src/build/android/__tests__/UpdatesModule-test.ts

@@ -6,17 +6,17 @@ import { readChannelSafelyAsync } from '../UpdatesModule';
 
 jest.mock('fs');
 
-afterAll(() => {
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
 });
 
 const testChannel = 'test-channel';

packages/eas-cli/src/build/android/__tests__/version-test.ts

@@ -1,42 +1,204 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import assert from 'assert';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import path from 'path';
 
-import { maybeResolveVersionsAsync } from '../version';
+import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
+import {
+  BumpStrategy,
+  bumpVersionAsync,
+  bumpVersionInAppJsonAsync,
+  maybeResolveVersionsAsync,
+} from '../version';
 
+const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
 
-afterAll(() => {
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
+});
+
+// bare workflow
+describe(bumpVersionAsync, () => {
+  it('throws an informative error when multiple flavors are detected in the android project', async () => {
+    await initProjectWithGradleFileAsync(
+      /*buildGradlePath*/ path.join(
+        __dirname,
+        '../../../project/android/__tests__/fixtures/multiflavor-build.gradle'
+      )
+    );
+    await expect(
+      bumpVersionAsync({
+        bumpStrategy: BumpStrategy.VERSION_CODE,
+        projectDir: '/multiflavor',
+        exp: {} as any,
+      })
+    ).rejects.toThrow(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  });
+  it('throws an informative error when multiple flavor dimensions are defined in an android project', async () => {
+    await initProjectWithGradleFileAsync(
+      /*buildGradlePath*/ path.join(
+        __dirname,
+        '../../../project/android/__tests__/fixtures/multiflavor-with-dimensions-build.gradle'
+      )
+    );
+    await expect(
+      bumpVersionAsync({
+        bumpStrategy: BumpStrategy.VERSION_CODE,
+        projectDir: '/multiflavor',
+        exp: {} as any,
+      })
+    ).rejects.toThrow(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  });
+  it('bumps expo.android.versionCode and buildGradle versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
+    const nativeVersionCode = 100; // this should be overwritten by bumpVersionAsync
+    const fakeExp = initBareWorkflowProject({ versionCode: nativeVersionCode });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.VERSION_CODE,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.0');
+    expect(fakeExp.android?.versionCode).toBe(124);
+    expect(appJSON.expo.version).toBe('3.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(124);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
+  });
+
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
+    const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
+    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.1');
+    expect(fakeExp.android?.versionCode).toBe(123);
+    expect(appJSON.expo.version).toBe('3.0.1');
+    expect(appJSON.expo.android.versionCode).toBe(123);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
+  });
+
+  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
+    const fakeExp = initBareWorkflowProject();
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.NOOP,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.0');
+    expect(fakeExp.android?.versionCode).toBe(123);
+    expect(appJSON.expo.version).toBe('3.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(123);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
+  });
+});
+
+// managed workflow
+describe(bumpVersionInAppJsonAsync, () => {
+  it('bumps expo.android.versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.VERSION_CODE,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.0');
+    expect(fakeExp.android?.versionCode).toBe(127);
+    expect(appJSON.expo.version).toBe('5.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(127);
+  });
+
+  it('bumps expo.version when strategy = BumpStrategy.SHORT_VERSION', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.1');
+    expect(fakeExp.android?.versionCode).toBe(126);
+    expect(appJSON.expo.version).toBe('5.0.1');
+    expect(appJSON.expo.android.versionCode).toBe(126);
+  });
+
+  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.NOOP,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.0');
+    expect(fakeExp.android?.versionCode).toBe(126);
+    expect(appJSON.expo.version).toBe('5.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(126);
+  });
 });
 
 describe(maybeResolveVersionsAsync, () => {
-  describe('generic project', () => {
-    it('reads the version code from native code', async () => {
-      const exp = initGenericProject();
+  describe('bare project', () => {
+    it('reads the versions from native code', async () => {
+      const exp = initBareWorkflowProject();
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/repo',
         exp,
         {} as BuildProfile<Platform.ANDROID>
       );
-      expect(appVersion).toBe('2.0');
+      expect(appVersion).toBe('3.0.0');
       expect(appBuildVersion).toBe('123');
     });
   });
   describe('managed project', () => {
-    it('reads the version code from expo config', async () => {
+    it('reads the versions from expo config', async () => {
       const exp = initManagedProject();
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/repo',
@@ -49,22 +211,31 @@ describe(maybeResolveVersionsAsync, () => {
   });
 });
 
-function initGenericProject(): ExpoConfig {
+function initBareWorkflowProject({
+  versionCode = 123,
+  versionName = '3.0.0',
+}: {
+  versionCode?: number;
+  versionName?: string;
+} = {}): ExpoConfig {
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '3.0.0',
+    android: {
+      versionCode: 123,
+    },
+  };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          android: {
-            versionCode: 1,
-          },
-        },
+        expo: fakeExp,
       }),
       './android/app/build.gradle': `android {
   defaultConfig {
     applicationId "com.expo.testapp"
-    versionCode 123
-    versionName "2.0"
+    versionCode ${versionCode}
+    versionName "${versionName}"
   }
 }`,
       './android/app/src/main/AndroidManifest.xml': 'fake',
@@ -72,32 +243,10 @@ function initGenericProject(): ExpoConfig {
     '/repo'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '3.0.0',
-    android: {
-      versionCode: 124,
-    },
-  };
   return fakeExp;
 }
 
 function initManagedProject(): ExpoConfig {
-  vol.fromJSON(
-    {
-      './app.json': JSON.stringify({
-        expo: {
-          version: '4.0.0',
-          android: {
-            versionCode: 125,
-          },
-        },
-      }),
-    },
-    '/repo'
-  );
-
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -106,5 +255,26 @@ function initManagedProject(): ExpoConfig {
       versionCode: 126,
     },
   };
+  vol.fromJSON(
+    {
+      './app.json': JSON.stringify({
+        expo: fakeExp,
+      }),
+    },
+    '/repo'
+  );
+
   return fakeExp;
 }
+
+async function initProjectWithGradleFileAsync(gradleFilePath: string): Promise<void> {
+  vol.fromJSON(
+    {
+      'android/app/build.gradle': await fsReal.readFile(gradleFilePath, 'utf-8'),
+      './app.json': JSON.stringify({
+        expo: {} as any,
+      }),
+    },
+    '/multiflavor'
+  );
+}

packages/eas-cli/src/build/android/build.ts

@@ -5,14 +5,13 @@ import nullthrows from 'nullthrows';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
-import { createCredentialsContextAsync } from '../../credentials/context';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
 } from '../../project/android/applicationId';
-import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import {
@@ -21,7 +20,7 @@ import {
   JobData,
   prepareBuildRequestForPlatformAsync,
 } from '../build';
-import { BuildContext } from '../context';
+import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
@@ -29,9 +28,9 @@ import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
-export async function prepareAndroidBuildAsync(
-  ctx: BuildContext<Platform.ANDROID>
-): Promise<BuildRequestSender> {
+export async function createAndroidContextAsync(
+  ctx: CommonContext<Platform.ANDROID>
+): Promise<AndroidBuildContext> {
   const { buildProfile } = ctx;
 
   if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
@@ -59,19 +58,26 @@ This means that it will most likely produce an AAB and you will not be able to i
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
+  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
+
+  return { applicationId, gradleContext };
+}
+
+export async function prepareAndroidBuildAsync(
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
-      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
+      return await ensureAndroidCredentialsAsync(ctx);
     },
     ensureProjectConfiguredAsync: async () => {
-      if (ctx.workflow === Workflow.GENERIC) {
-        await validateAndSyncProjectConfigurationAsync(ctx.projectDir, ctx.exp);
-      }
+      await validateAndSyncProjectConfigurationAsync({
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
+        buildProfile: ctx.buildProfile,
+      });
     },
-    getMetadataContext: () => ({
-      gradleContext,
-    }),
     prepareJobAsync: async (
       ctx: BuildContext<Platform.ANDROID>,
       jobData: JobData<AndroidCredentials>
@@ -99,8 +105,7 @@ function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>,
-  gradleContext?: GradleBuildContext
+  ctx: BuildContext<Platform.ANDROID>
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
@@ -108,24 +113,18 @@ async function ensureAndroidCredentialsAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    gradleContext
-  );
-  const provider = new AndroidCredentialsProvider(
-    await createCredentialsContextAsync(ctx.projectDir, {
-      exp: ctx.exp,
-      nonInteractive: ctx.nonInteractive,
-    }),
-    {
-      app: {
-        account: nullthrows(
-          findAccountByName(ctx.user.accounts, ctx.accountName),
-          `You do not have access to account: ${ctx.accountName}`
-        ),
-        projectName: ctx.projectName,
-        androidApplicationIdentifier,
-      },
-    }
+    ctx.android.gradleContext
   );
+  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
+    app: {
+      account: nullthrows(
+        findAccountByName(ctx.user.accounts, ctx.accountName),
+        `You do not have access to account: ${ctx.accountName}`
+      ),
+      projectName: ctx.projectName,
+      androidApplicationIdentifier,
+    },
+  });
   const { credentialsSource } = ctx.buildProfile;
   logCredentialsSource(credentialsSource, Platform.ANDROID);
   return {

packages/eas-cli/src/build/android/configure.ts

@@ -1,15 +1,19 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
 
 import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
-  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
 } from '../../project/android/applicationId';
-import vcs from '../../vcs';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { getVcsClient } from '../../vcs';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
   if (!ctx.hasAndroidNativeProject) {
@@ -17,12 +21,12 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
     return;
   }
 
-  warnIfAndroidPackageDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
 
   await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
 
   const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await vcs.trackFileAsync(easGradlePath);
+  await getVcsClient().trackFileAsync(easGradlePath);
 
   if (isExpoUpdatesInstalled(ctx.projectDir)) {
     await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -30,16 +34,42 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
   Log.withTick('Android project configured');
 }
 
-export async function validateAndSyncProjectConfigurationAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<void> {
-  if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-    throw new Error(
-      'Project is not configured. Please run "eas build:configure" to configure the project.'
-    );
+export async function validateAndSyncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  buildProfile,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
+      throw new Error(
+        'Project is not configured. Please run "eas build:configure" to configure the project.'
+      );
+    }
+    if (isExpoUpdatesInstalled(projectDir)) {
+      await syncUpdatesConfigurationAsync(projectDir, exp);
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }
-  if (isExpoUpdatesInstalled(projectDir)) {
-    await syncUpdatesConfigurationAsync(projectDir, exp);
+}
+
+function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.VERSION_CODE;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'versionCode') {
+    return BumpStrategy.VERSION_CODE;
+  } else {
+    return BumpStrategy.APP_VERSION;
   }
 }

packages/eas-cli/src/build/android/graphql.ts

@@ -17,15 +17,14 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     artifactPath: job.artifactPath,
     username: job.username,
     buildType: job.buildType && transformBuildType(job.buildType),
+    developmentClient: job.developmentClient,
   };
 }
 
 function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
   if (buildType === Android.BuildType.APK) {
     return AndroidBuildType.Apk;
-  } else if (buildType === Android.BuildType.APP_BUNDLE) {
-    return AndroidBuildType.AppBundle;
   } else {
-    return AndroidBuildType.DevelopmentClient;
+    return AndroidBuildType.AppBundle;
   }
 }

packages/eas-cli/src/build/android/prepareJob.ts

@@ -1,11 +1,12 @@
 import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
-import { AndroidBuildProfile } from '@expo/eas-json';
+import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
+import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -24,8 +25,9 @@ export async function prepareJobAsync(
   jobData: JobData
 ): Promise<Job> {
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
-  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -51,7 +53,7 @@ export async function prepareJobAsync(
     projectRootDirectory,
     projectArchive: jobData.projectArchive,
     builderEnvironment: {
-      image: buildProfile.image ?? 'default',
+      image: buildProfile.image,
       node: buildProfile.node,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
@@ -68,12 +70,11 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
     artifactPath: buildProfile.artifactPath,
-
+    buildType,
     username,
-    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
   };
 
   return sanitizeJob(job);

packages/eas-cli/src/build/android/version.ts

@@ -2,13 +2,89 @@ import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import chalk from 'chalk';
+import fs from 'fs-extra';
 
+import Log from '../../log';
 import {
   getAppBuildGradleAsync,
   parseGradleCommand,
   resolveConfigValue,
 } from '../../project/android/gradleUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
+
+export enum BumpStrategy {
+  APP_VERSION,
+  VERSION_CODE,
+  NOOP,
+}
+
+export async function bumpVersionAsync({
+  bumpStrategy,
+  projectDir,
+  exp,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  bumpStrategy: BumpStrategy;
+}): Promise<void> {
+  if (bumpStrategy === BumpStrategy.NOOP) {
+    return;
+  }
+  ensureStaticConfigExists(projectDir);
+
+  const buildGradle = await getAppBuildGradleAsync(projectDir);
+  const isMultiFlavor =
+    buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
+  if (isMultiFlavor) {
+    throw new Error(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  }
+
+  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
+  Log.log('Updated versions in app.json');
+  await writeVersionsToBuildGradleAsync({
+    projectDir,
+    exp,
+  });
+  Log.log('Synchronized versions with build gradle');
+}
+
+export async function bumpVersionInAppJsonAsync({
+  bumpStrategy,
+  projectDir,
+  exp,
+}: {
+  bumpStrategy: BumpStrategy;
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<void> {
+  if (bumpStrategy === BumpStrategy.NOOP) {
+    return;
+  }
+
+  ensureStaticConfigExists(projectDir);
+  Log.addNewLineIfNone();
+
+  if (bumpStrategy === BumpStrategy.APP_VERSION) {
+    const appVersion = AndroidConfig.Version.getVersionName(exp) ?? '1.0.0';
+    await bumpAppVersionAsync({ appVersion, projectDir, exp });
+  } else {
+    const versionCode = AndroidConfig.Version.getVersionCode(exp);
+    const bumpedVersionCode = versionCode + 1;
+    Log.log(
+      `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
+        versionCode
+      )} to ${chalk.bold(bumpedVersionCode)}`
+    );
+    await updateAppJsonConfigAsync({ projectDir, exp }, config => {
+      config.android = { ...config.android, versionCode: bumpedVersionCode };
+    });
+  }
+}
 
 export async function maybeResolveVersionsAsync(
   projectDir: string,
@@ -39,3 +115,39 @@ export async function maybeResolveVersionsAsync(
     };
   }
 }
+
+async function writeVersionsToBuildGradleAsync({
+  projectDir,
+  exp,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<string> {
+  const buildGradle = await readBuildGradleAsync(projectDir);
+  if (!buildGradle) {
+    throw new Error('This project is missing a build.gradle file.');
+  }
+  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
+  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+  await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
+  return updatedBuildGradle;
+}
+
+async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  if (!(await fs.pathExists(buildGradlePath))) {
+    return undefined;
+  }
+  return await fs.readFile(buildGradlePath, 'utf8');
+}
+
+async function writeBuildGradleAsync({
+  projectDir,
+  buildGradle,
+}: {
+  projectDir: string;
+  buildGradle: string;
+}): Promise<void> {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  await fs.writeFile(buildGradlePath, buildGradle);
+}

packages/eas-cli/src/build/build.ts

@@ -3,6 +3,8 @@ import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
+import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
 import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
@@ -13,12 +15,10 @@ import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
-import vcs from '../vcs';
+import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { MetadataContext, collectMetadataAsync } from './metadata';
-import { TrackingContext } from './types';
-import Analytics, { Event } from './utils/analytics';
+import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
@@ -39,7 +39,6 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
   ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  getMetadataContext: () => MetadataContext<TPlatform>;
   prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
   sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
@@ -55,20 +54,22 @@ export async function prepareBuildRequestForPlatformAsync<
   const credentialsResult = await withAnalyticsAsync(
     async () => await builder.ensureCredentialsAsync(ctx),
     {
-      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
-      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
+      attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
+      successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
+      failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
   if (!ctx.skipProjectConfiguration) {
     await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
+      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
       trackingCtx: ctx.trackingCtx,
     });
   }
 
-  if (await vcs.hasUncommittedChangesAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
       `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
@@ -86,8 +87,7 @@ export async function prepareBuildRequestForPlatformAsync<
         bucketKey: await uploadProjectAsync(ctx),
       } as const);
 
-  const metadataContext = builder.getMetadataContext();
-  const metadata = await collectMetadataAsync(ctx, metadataContext);
+  const metadata = await collectMetadataAsync(ctx);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
@@ -166,8 +166,9 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         return bucketKey;
       },
       {
-        successEvent: Event.PROJECT_UPLOAD_SUCCESS,
-        failureEvent: Event.PROJECT_UPLOAD_FAIL,
+        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
+        successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
+        failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
         trackingCtx: ctx.trackingCtx,
       }
     );
@@ -200,34 +201,14 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       return build;
     },
     {
-      successEvent: Event.BUILD_REQUEST_SUCCESS,
-      failureEvent: Event.BUILD_REQUEST_FAIL,
+      attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
+      successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
+      failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
-async function withAnalyticsAsync<Result>(
-  fn: () => Promise<Result>,
-  analytics: {
-    successEvent: Event;
-    failureEvent: Event;
-    trackingCtx: TrackingContext;
-  }
-): Promise<Result> {
-  try {
-    const result = await fn();
-    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
-    return result;
-  } catch (error: any) {
-    Analytics.logEvent(analytics.failureEvent, {
-      ...analytics.trackingCtx,
-      reason: error.message,
-    });
-    throw error;
-  }
-}
-
 export async function waitForBuildEndAsync(
   buildIds: string[],
   { timeoutSec = 3600, intervalSec = 30 } = {}

packages/eas-cli/src/build/configure.ts

@@ -10,7 +10,8 @@ import { RequestedPlatform } from '../platform';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { confirmAsync, promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
-import vcs from '../vcs';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
 import { configureAndroidAsync } from './android/configure';
 import { ConfigureContext } from './context';
 import { configureIosAsync } from './ios/configure';
@@ -37,7 +38,7 @@ export async function ensureProjectConfiguredAsync(
       projectDir,
       platform: requestedPlatform,
     });
-    if (await vcs.hasUncommittedChangesAsync()) {
+    if (await getVcsClient().isCommitRequiredAsync()) {
       error(
         'Build process requires clean working tree, please commit all your changes and run `eas build` again',
         { exit: 1 }
@@ -57,7 +58,6 @@ export async function configureAsync(options: {
   platform: RequestedPlatform;
   projectDir: string;
 }): Promise<void> {
-  await vcs.ensureRepoExistsAsync();
   await maybeBailOnRepoStatusAsync();
 
   const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
@@ -86,31 +86,39 @@ export async function configureAsync(options: {
     await configureIosAsync(ctx);
   }
 
-  if (await vcs.hasUncommittedChangesAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.newLine();
     await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
-  } else {
+  } else if (!(await getVcsClient().hasUncommittedChangesAsync())) {
     Log.newLine();
     Log.withTick('No changes were necessary, the project is already configured correctly.');
   }
 }
 
 const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
   build: {
-    release: {},
     development: {
       developmentClient: true,
       distribution: 'internal',
     },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
   },
   submit: {
-    release: {},
+    production: {},
   },
 };
 
-const EAS_JSON_GENERIC_DEFAULT: EasJson = {
+const EAS_JSON_BARE_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
   build: {
-    release: {},
     development: {
       distribution: 'internal',
       android: {
@@ -120,9 +128,13 @@ const EAS_JSON_GENERIC_DEFAULT: EasJson = {
         buildConfiguration: 'Debug',
       },
     },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
   },
   submit: {
-    release: {},
+    production: {},
   },
 };
 
@@ -131,7 +143,7 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
 
   if (await fs.pathExists(easJsonPath)) {
     const reader = new EasJsonReader(ctx.projectDir);
-    await reader.readAndValidateAsync();
+    await reader.readAsync();
 
     Log.withTick('Validated eas.json');
     return;
@@ -139,11 +151,11 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
 
   const easJson =
     ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
-      ? EAS_JSON_GENERIC_DEFAULT
+      ? EAS_JSON_BARE_DEFAULT
       : EAS_JSON_MANAGED_DEFAULT;
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await vcs.trackFileAsync(easJsonPath);
+  await getVcsClient().trackFileAsync(easJsonPath);
   Log.withTick('Generated eas.json');
 }
 
@@ -177,7 +189,7 @@ async function reviewAndCommitChangesAsync(
     await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcs.showDiffAsync();
+    await getVcsClient().showDiffAsync();
     await reviewAndCommitChangesAsync(initialCommitMessage, false);
   }
 }

packages/eas-cli/src/build/context.ts

@@ -1,19 +1,15 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
-import JsonFile from '@expo/json-file';
-import resolveFrom from 'resolve-from';
-import { v4 as uuidv4 } from 'uuid';
+import { BuildProfile } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
 
+import { TrackingContext } from '../analytics/common';
+import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
 import { RequestedPlatform } from '../platform';
-import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { ensureLoggedInAsync } from '../user/actions';
-import { TrackingContext } from './types';
-import Analytics, { Event } from './utils/analytics';
 
 export interface ConfigureContext {
   user: Actor;
@@ -26,11 +22,27 @@ export interface ConfigureContext {
   hasIosNativeProject: boolean;
 }
 
+export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
+
+export interface AndroidBuildContext {
+  applicationId: string;
+  gradleContext?: GradleBuildContext;
+}
+
+export interface IosBuildContext {
+  bundleIdentifier: string;
+  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
+  applicationTarget: Target;
+  targets: Target[];
+  xcodeBuildContext: XcodeBuildContext;
+}
+
 export interface BuildContext<T extends Platform> {
   accountName: string;
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
   clearCache: boolean;
+  credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
   local: boolean;
   nonInteractive: boolean;
@@ -42,103 +54,6 @@ export interface BuildContext<T extends Platform> {
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;
-}
-
-export async function createBuildContextAsync<T extends Platform>({
-  buildProfileName,
-  buildProfile,
-  clearCache = false,
-  local,
-  nonInteractive = false,
-  platform,
-  projectDir,
-  skipProjectConfiguration = false,
-}: {
-  buildProfileName: string;
-  buildProfile: BuildProfile<T>;
-  clearCache: boolean;
-  local: boolean;
-  nonInteractive: boolean;
-  platform: T;
-  projectDir: string;
-  skipProjectConfiguration: boolean;
-}): Promise<BuildContext<T>> {
-  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
-
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
-
-  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
-  const devClientProperties = getDevClientEventProperties({
-    platform,
-    projectDir,
-    buildProfile,
-  });
-  const trackingCtx = {
-    tracking_id: uuidv4(),
-    platform,
-    ...(accountId && { account_id: accountId }),
-    account_name: accountName,
-    project_id: projectId,
-    project_type: workflow,
-    ...devClientProperties,
-  };
-  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
-  return {
-    accountName,
-    buildProfile,
-    buildProfileName,
-    clearCache,
-    exp,
-    local,
-    nonInteractive,
-    platform,
-    projectDir,
-    projectId,
-    projectName,
-    skipProjectConfiguration,
-    trackingCtx,
-    user,
-    workflow,
-  };
-}
-
-function getDevClientEventProperties({
-  platform,
-  projectDir,
-  buildProfile,
-}: {
-  platform: Platform;
-  projectDir: string;
-  buildProfile: AndroidBuildProfile | IosBuildProfile;
-}): Partial<TrackingContext> {
-  let includesDevClient;
-  const version = tryGetDevClientVersion(projectDir);
-  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
-  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
-  } else if (buildProfile.developmentClient) {
-    includesDevClient = true;
-  } else {
-    includesDevClient = false;
-  }
-
-  if (version) {
-    return { dev_client: includesDevClient, dev_client_version: version };
-  } else {
-    return { dev_client: includesDevClient };
-  }
-}
-
-function tryGetDevClientVersion(projectDir: string): string | null {
-  try {
-    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
-    return pkg.version?.toString() ?? null;
-  } catch {
-    return null;
-  }
+  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
+  ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }

packages/eas-cli/src/build/createContext.ts

@@ -0,0 +1,138 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import resolveFrom from 'resolve-from';
+import { v4 as uuidv4 } from 'uuid';
+
+import { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
+import { CredentialsContext } from '../credentials/context';
+import { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { findAccountByName } from '../user/Account';
+import { ensureLoggedInAsync } from '../user/actions';
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
+  platform,
+  projectDir,
+  skipProjectConfiguration = false,
+}: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
+  platform: T;
+  projectDir: string;
+  skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
+  const user = await ensureLoggedInAsync();
+  const accountName = getProjectAccountName(exp, user);
+  const projectName = exp.slug;
+  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const accountId = findAccountByName(user.accounts, accountName)?.id;
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+    env: buildProfile.env,
+  });
+
+  const devClientProperties = getDevClientEventProperties({
+    platform,
+    projectDir,
+    buildProfile,
+  });
+  const trackingCtx = {
+    tracking_id: uuidv4(),
+    platform,
+    ...(accountId && { account_id: accountId }),
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
+  };
+  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
+
+  const commonContext: CommonContext<T> = {
+    accountName,
+    buildProfile,
+    buildProfileName,
+    clearCache,
+    credentialsCtx,
+    exp,
+    local,
+    nonInteractive,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    skipProjectConfiguration,
+    trackingCtx,
+    user,
+    workflow,
+  };
+  if (platform === Platform.ANDROID) {
+    const common = commonContext as CommonContext<Platform.ANDROID>;
+    return {
+      ...common,
+      android: await createAndroidContextAsync(common),
+    } as BuildContext<T>;
+  } else {
+    const common = commonContext as CommonContext<Platform.IOS>;
+    return {
+      ...common,
+      ios: await createIosContextAsync(common),
+    } as BuildContext<T>;
+  }
+}
+
+function getDevClientEventProperties({
+  platform,
+  projectDir,
+  buildProfile,
+}: {
+  platform: Platform;
+  projectDir: string;
+  buildProfile: BuildProfile;
+}): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(projectDir);
+  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
+  } else {
+    includesDevClient = false;
+  }
+
+  if (version) {
+    return { dev_client: includesDevClient, dev_client_version: version };
+  } else {
+    return { dev_client: includesDevClient };
+  }
+}
+
+function tryGetDevClientVersion(projectDir: string): string | null {
+  try {
+    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
+    return pkg.version?.toString() ?? null;
+  } catch {
+    return null;
+  }
+}

packages/eas-cli/src/build/ios/UpdatesModule.ts

@@ -1,26 +1,16 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
-import fs from 'fs-extra';
 
 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
+import { getVcsClient } from '../../vcs';
 import { ensureValidVersions } from '../utils/updates';
-import { readPlistAsync, writePlistAsync } from './plist';
 
 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  let xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    xcodeProject = IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(
-      projectDir,
-      xcodeProject
-    );
-    await fs.writeFile(IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
-  }
 
   let expoPlist = await readExpoPlistAsync(projectDir);
   if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
@@ -37,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
   try {
-    await ensureUpdatesConfiguredAsync(projectDir, exp);
+    await ensureUpdatesConfiguredAsync(projectDir);
   } catch (error) {
     Log.error(
       'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -58,15 +48,9 @@ export async function syncUpdatesConfigurationAsync(
   }
 }
 
-async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    const script = 'expo-updates/scripts/create-manifest-ios.sh';
-    const buildPhase = '"Bundle React Native code and images"';
-    throw new Error(`Path to ${script} is missing in a ${buildPhase} build phase.`);
-  }
-
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
   const expoPlist = await readExpoPlistAsync(projectDir);
   if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
     throw new Error('Missing values in Expo.plist');
@@ -75,7 +59,7 @@ async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig)
 
 async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
   const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  return (await readPlistAsync(expoPlistPath)) as IOSConfig.ExpoPlist;
+  return ((await readPlistAsync(expoPlistPath)) ?? {}) as IOSConfig.ExpoPlist;
 }
 
 async function writeExpoPlistAsync(
@@ -84,7 +68,7 @@ async function writeExpoPlistAsync(
 ): Promise<void> {
   const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
   await writePlistAsync(expoPlistPath, expoPlist);
-  await vcs.trackFileAsync(expoPlistPath);
+  await getVcsClient().trackFileAsync(expoPlistPath);
 }
 
 export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {

packages/eas-cli/src/build/ios/__tests__/UpdatesModule-test.ts

@@ -6,17 +6,17 @@ import { readChannelSafelyAsync } from '../UpdatesModule';
 
 jest.mock('fs');
 
-afterAll(() => {
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
 });
 
 const testChannel = 'test-channel';

packages/eas-cli/src/build/ios/__tests__/version-test.ts

@@ -4,46 +4,61 @@ import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { readPlistAsync } from '../plist';
+import { readPlistAsync } from '../../../utils/plist';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   evaluateTemplateString,
+  getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
 } from '../version';
 
 jest.mock('fs');
 
-afterAll(() => {
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
 });
 
 describe(evaluateTemplateString, () => {
-  it('evaluates the template string', () => {
+  it('evaluates the template string when value is a number', () => {
     expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: 123 })).toBe('123');
   });
+  it('evaluates the template string when value is a string', () => {
+    expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: '123' })).toBe('123');
+  });
+  it('evaluates the template string when template is not the only element', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '123' })).toBe(
+      'before123after'
+    );
+  });
+  it('evaluates the template string when template value is double quoted', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '"123"' })).toBe(
+      'before123after'
+    );
+  });
 });
 
-// generic workflow
+// bare workflow
 describe(bumpVersionAsync, () => {
   it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -58,13 +73,38 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
-    const fakeExp = initGenericProject();
+  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
+    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });
 
     await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {
+        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+      },
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info2.plist'
+    )) as IOSConfig.InfoPlist;
+    expect(fakeExp.version).toBe('1.0.0');
+    expect(fakeExp.ios?.buildNumber).toBe('2');
+    expect(appJSON.expo.version).toBe('1.0.0');
+    expect(appJSON.expo.ios.buildNumber).toBe('2');
+    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
+    expect(infoPlist['CFBundleVersion']).toBe('2');
+  });
+
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
+    const fakeExp = initBareWorkflowProject();
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -80,12 +120,13 @@ describe(bumpVersionAsync, () => {
   });
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -123,7 +164,7 @@ describe(bumpVersionInAppJsonAsync, () => {
     const fakeExp = initManagedProject();
 
     await bumpVersionInAppJsonAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
     });
@@ -153,9 +194,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });
 
 describe(readBuildNumberAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
     it('reads the build number from native code', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
       const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
@@ -171,15 +212,15 @@ describe(readBuildNumberAsync, () => {
 });
 
 describe(readShortVersionAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
     it('reads the short version from native code', async () => {
-      const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp, {});
-      expect(shortVersion).toBe('1.0.0');
+      const exp = initBareWorkflowProject();
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
-      const exp = initGenericProject({
-        shortVersion: '$(CURRENT_PROJECT_VERSION)',
+      const exp = initBareWorkflowProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
       const buildNumber = await readShortVersionAsync('/repo', exp, {
         CURRENT_PROJECT_VERSION: '1.0.0',
@@ -190,33 +231,85 @@ describe(readShortVersionAsync, () => {
 
   describe('managed project', () => {
     it('reads the version from app config', async () => {
-      const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp, {});
-      expect(shortVersion).toBe('1.0.0');
+      const exp = initBareWorkflowProject();
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
   });
 });
 
-function initGenericProject({
-  shortVersion = '1.0.0',
+describe(getInfoPlistPath, () => {
+  it('returns default path if INFOPLIST_FILE is not specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {});
+    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
+  });
+  it('returns INFOPLIST_FILE if specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates SRCROOT in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates BuildSettings in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
+      TARGET_NAME: 'NotInfo',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+});
+
+function initBareWorkflowProject({
+  appVersion = '1.0.0',
   version = '1',
-}: { shortVersion?: string; version?: string } = {}): ExpoConfig {
+  infoPlistName = 'Info.plist',
+}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '1.0.0',
+    ios: {
+      buildNumber: '1',
+    },
+  };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          ios: {
-            buildNumber: '1',
-          },
-        },
+        expo: fakeExp,
       }),
-      './ios/myproject/Info.plist': `<?xml version="1.0" encoding="UTF-8"?>
+      [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
   <key>CFBundleShortVersionString</key>
-  <string>${shortVersion}</string>
+  <string>${appVersion}</string>
   <key>CFBundleVersion</key>
   <string>${version}</string>
 </dict>
@@ -225,6 +318,10 @@ function initGenericProject({
     '/repo'
   );
 
+  return fakeExp;
+}
+
+function initManagedProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -233,31 +330,15 @@ function initGenericProject({
       buildNumber: '1',
     },
   };
-  return fakeExp;
-}
 
-function initManagedProject(): ExpoConfig {
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          ios: {
-            buildNumber: '1',
-          },
-        },
+        expo: fakeExp,
       }),
     },
     '/repo'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '1.0.0',
-    ios: {
-      buildNumber: '1',
-    },
-  };
   return fakeExp;
 }

packages/eas-cli/src/build/ios/build.ts

@@ -1,24 +1,24 @@
 import { IOSConfig } from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials } from '../../credentials/ios/types';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext } from '../context';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { IosMetadataContext } from '../metadata';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
-export async function prepareIosBuildAsync(
-  ctx: BuildContext<Platform.IOS>
-): Promise<BuildRequestSender> {
+export async function createIosContextAsync(
+  ctx: CommonContext<Platform.IOS>
+): Promise<IosBuildContext> {
   const { buildProfile } = ctx;
 
   if (ctx.workflow === Workflow.MANAGED) {
@@ -43,41 +43,42 @@ export async function prepareIosBuildAsync(
     },
     xcodeBuildContext
   );
+  const applicationTarget = findApplicationTarget(targets);
+  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
 
+  return {
+    bundleIdentifier: applicationTarget.bundleIdentifier,
+    applicationTarget,
+    applicationTargetBuildSettings,
+    targets,
+    xcodeBuildContext,
+  };
+}
+
+export async function prepareIosBuildAsync(
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
-      return ensureIosCredentialsAsync(ctx, targets);
+      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
     ensureProjectConfiguredAsync: async () => {
       await validateAndSyncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
-        buildProfile,
+        buildProfile: ctx.buildProfile,
+        buildSettings: ctx.ios.applicationTargetBuildSettings,
       });
     },
-    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,
-        targetName: applicationTarget.targetName,
-        buildConfiguration: applicationTarget.buildConfiguration,
-      };
-    },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
       jobData: JobData<IosCredentials>
     ): Promise<Job> => {
-      return await prepareJobAsync(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
+      return await prepareJobAsync(ctx, {
+        ...jobData,
+        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
+      });
     },
     sendBuildRequestAsync: async (
       appId: string,
@@ -94,3 +95,18 @@ export async function prepareIosBuildAsync(
     },
   });
 }
+
+function resolveBuildSettings(
+  ctx: CommonContext<Platform.IOS>,
+  applicationTarget: Target
+): XCBuildConfiguration['buildSettings'] {
+  if (ctx.workflow === Workflow.MANAGED) {
+    return {};
+  }
+  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
+  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  });
+  return xcBuildConfiguration?.buildSettings ?? {};
+}

packages/eas-cli/src/build/ios/configure.ts

@@ -1,11 +1,12 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
+import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
 import {
   ensureBundleIdentifierIsDefinedForManagedProjectAsync,
-  warnIfBundleIdentifierDefinedInAppConfigForGenericProject,
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject,
 } from '../../project/ios/bundleIdentifier';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { ConfigureContext } from '../context';
@@ -19,7 +20,7 @@ export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
     return;
   }
 
-  warnIfBundleIdentifierDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
 
   if (isExpoUpdatesInstalled(ctx.projectDir)) {
     await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -31,10 +32,12 @@ export async function validateAndSyncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
-  buildProfile: IosBuildProfile;
+  buildProfile: BuildProfile<Platform.IOS>;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const { autoIncrement } = buildProfile;
@@ -44,13 +47,13 @@ export async function validateAndSyncProjectConfigurationAsync({
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }
 }
 
-function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpStrategy {
+function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
   if (autoIncrement === true) {
     return BumpStrategy.BUILD_NUMBER;
   } else if (autoIncrement === false) {
@@ -58,6 +61,6 @@ function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpSt
   } else if (autoIncrement === 'buildNumber') {
     return BumpStrategy.BUILD_NUMBER;
   } else {
-    return BumpStrategy.SHORT_VERSION;
+    return BumpStrategy.APP_VERSION;
   }
 }

packages/eas-cli/src/build/ios/credentials.ts

@@ -1,6 +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';
 import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
@@ -17,16 +16,15 @@ export async function ensureIosCredentialsAsync(
     return;
   }
 
-  const credentialsCtx = await createCredentialsContextAsync(buildCtx.projectDir, {
-    exp: buildCtx.exp,
-    nonInteractive: buildCtx.nonInteractive,
-  });
-
-  const provider = new IosCredentialsProvider(credentialsCtx, {
-    app: getAppFromContext(credentialsCtx),
+  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
+    app: getAppFromContext(buildCtx.credentialsCtx),
     targets,
     iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
+      entitlements: await resolveEntitlementsJsonAsync(
+        buildCtx.projectDir,
+        buildCtx.workflow,
+        buildCtx.buildProfile.env ?? {}
+      ),
     },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,

packages/eas-cli/src/build/ios/graphql.ts

@@ -1,12 +1,7 @@
 import { Env, Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
-import {
-  DistributionType,
-  IosBuildType,
-  IosJobInput,
-  IosJobSecretsInput,
-} from '../../graphql/generated';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
 import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
@@ -16,30 +11,18 @@ export function transformJob(job: Ios.Job): IosJobInput {
     projectRootDirectory: job.projectRootDirectory,
     releaseChannel: job.releaseChannel,
     updates: job.updates,
-    distribution: job.distribution && transformDistributionType(job.distribution),
     secrets: transformIosSecrets(job.secrets),
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
-
     scheme: job.scheme,
     buildConfiguration: job.buildConfiguration,
     artifactPath: job.artifactPath,
-
-    buildType: job.buildType && transformBuildType(job.buildType),
     username: job.username,
+    developmentClient: job.developmentClient,
+    simulator: job.simulator,
   };
 }
 
-function transformDistributionType(distributionType: Ios.DistributionType): DistributionType {
-  if (distributionType === 'store') {
-    return DistributionType.Store;
-  } else if (distributionType === 'internal') {
-    return DistributionType.Internal;
-  } else {
-    return DistributionType.Simulator;
-  }
-}
-
 function transformIosSecrets(secrets: {
   buildCredentials?: Ios.BuildCredentials;
   env?: Env;
@@ -61,11 +44,3 @@ function transformIosSecrets(secrets: {
     environmentSecrets: secrets.env,
   };
 }
-
-function transformBuildType(buildType: Ios.BuildType): IosBuildType {
-  if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
-    return IosBuildType.DevelopmentClient;
-  } else {
-    return IosBuildType.Release;
-  }
-}

packages/eas-cli/src/build/ios/prepareJob.ts

@@ -1,11 +1,11 @@
 import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
-import semver from 'semver';
+import slash from 'slash';
 
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -24,7 +24,8 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
   const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
@@ -39,9 +40,8 @@ export async function prepareJobAsync(
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
-    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
     builderEnvironment: {
-      image: resolveImage(ctx),
+      image: ctx.buildProfile.image,
       node: ctx.buildProfile.node,
       yarn: ctx.buildProfile.yarn,
       bundler: ctx.buildProfile.bundler,
@@ -60,30 +60,16 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: ctx.buildProfile.developmentClient,
+    simulator: ctx.buildProfile.simulator,
     scheme: jobData.buildScheme,
     buildConfiguration: ctx.buildProfile.buildConfiguration,
     artifactPath: ctx.buildProfile.artifactPath,
-
-    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.exp.sdkVersion) {
-    const majorSdkVersion = semver.major(ctx.exp.sdkVersion);
-    if (majorSdkVersion <= 41) {
-      return 'macos-catalina-10.15-xcode-12.4';
-    }
-  }
-  return ctx.buildProfile.image ?? 'default';
-}
-
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
   return {
     provisioningProfileBase64: targetCredentials.provisioningProfile,

packages/eas-cli/src/build/ios/version.ts

@@ -2,18 +2,18 @@ import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import semver from 'semver';
+import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { readPlistAsync, writePlistAsync } from './plist';
+import { bumpAppVersionAsync } from '../utils/version';
 
 export enum BumpStrategy {
-  SHORT_VERSION,
+  APP_VERSION,
   BUILD_NUMBER,
   NOOP,
 }
@@ -22,19 +22,21 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir);
+  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist });
+  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -52,29 +54,9 @@ export async function bumpVersionInAppJsonAsync({
   }
   ensureStaticConfigExists(projectDir);
   Log.addNewLineIfNone();
-  if (bumpStrategy === BumpStrategy.SHORT_VERSION) {
-    const shortVersion = IOSConfig.Version.getVersion(exp);
-    if (semver.valid(shortVersion)) {
-      const bumpedShortVersion = nullthrows(semver.inc(shortVersion, 'patch'));
-      Log.log(
-        `Bumping ${chalk.bold('expo.version')} from ${chalk.bold(shortVersion)} to ${chalk.bold(
-          bumpedShortVersion
-        )}`
-      );
-      await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-        config.version = bumpedShortVersion;
-      });
-    } else {
-      Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(shortVersion)} is not a valid semver`);
-      const { bumpedShortVersion } = await promptAsync({
-        type: 'text',
-        name: 'bumpedShortVersion',
-        message: 'What is the next version?',
-      });
-      await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-        config.version = bumpedShortVersion;
-      });
-    }
+  if (bumpStrategy === BumpStrategy.APP_VERSION) {
+    const appVersion = IOSConfig.Version.getVersion(exp);
+    await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const buildNumber = IOSConfig.Version.getBuildNumber(exp);
     if (buildNumber.match(/^\d+(\.\d+)*$/)) {
@@ -110,7 +92,7 @@ export async function readShortVersionAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
       infoPlist.CFBundleShortVersionString &&
       evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
@@ -127,7 +109,7 @@ export async function readBuildNumberAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
       infoPlist.CFBundleVersion && evaluateTemplateString(infoPlist.CFBundleVersion, buildSettings)
     );
@@ -146,7 +128,11 @@ export async function maybeResolveVersionsAsync(
       appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
       appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
     };
-  } catch {
+  } catch (err: any) {
+    Log.warn('Failed to read app versions.');
+    Log.debug(err);
+    Log.warn(err.message);
+    Log.warn('Proceeding anyway...');
     return {};
   }
 }
@@ -155,30 +141,56 @@ async function writeVersionsToInfoPlistAsync({
   projectDir,
   exp,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<IOSConfig.InfoPlist> {
   let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
   updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist });
+  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
   return updatedInfoPlist;
 }
 
-async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
-  return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+export function getInfoPlistPath(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  if (buildSettings.INFOPLIST_FILE) {
+    const infoPlistFile = buildSettings.INFOPLIST_FILE.startsWith('"')
+      ? buildSettings.INFOPLIST_FILE.slice(1, -1)
+      : buildSettings.INFOPLIST_FILE;
+    const iosDir = path.join(projectDir, 'ios');
+    const plistPath = evaluateTemplateString(infoPlistFile, {
+      ...buildSettings,
+      SRCROOT: iosDir,
+    });
+    return path.isAbsolute(plistPath) ? plistPath : path.resolve(iosDir, plistPath);
+  } else {
+    return IOSConfig.Paths.getInfoPlistPath(projectDir);
+  }
+}
+
+async function readInfoPlistAsync(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): Promise<IOSConfig.InfoPlist> {
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
+  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }
 
 async function writeInfoPlistAsync({
   projectDir,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
   await writePlistAsync(infoPlistPath, infoPlist);
 }
 
@@ -189,6 +201,18 @@ function ensureStaticConfigExists(projectDir: string): void {
   }
 }
 
-export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
-  return s.replace(/\$\((\w+)\)/g, (match, key) => (vars.hasOwnProperty(key) ? vars[key] : match));
+export function evaluateTemplateString(
+  s: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
+  const vars = { ...buildSettings };
+  return s.replace(/\$\((\w+)\)/g, (match, key) => {
+    if (vars.hasOwnProperty(key)) {
+      const value = String(vars[key]);
+      return value.startsWith('"') ? value.slice(1, -1) : value;
+    } else {
+      return match;
+    }
+  });
 }

packages/eas-cli/src/build/local.ts

@@ -1,45 +1,39 @@
 import { Job } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import Log from '../log';
+import semver from 'semver';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+const PLUGIN_PACKAGE_VERSION = '0.0.54';
 
 export async function runLocalBuildAsync(job: Job): Promise<void> {
-  const execNameOrPath =
-    process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
-    (await findWithNodeResolutionAsync()) ??
-    PLUGIN_PACKAGE_NAME;
-  try {
-    const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
-    await spawnAsync(execNameOrPath, [arg], {
-      stdio: 'inherit',
-    });
-  } catch (err: any) {
-    if (err.code === 'ENOENT') {
-      Log.warn(`Could not resolve executable ${execNameOrPath}.`);
-      Log.warn(
-        `Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk.bold(
-          `npm install -g ${PLUGIN_PACKAGE_NAME}`
-        )} and make sure it's in PATH.`
-      );
-      throw err;
+  const { command, args } = await getCommandAndArgsAsync(job);
+  await spawnAsync(command, args, {
+    stdio: 'inherit',
+  });
+}
+
+async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
+  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
+    return {
+      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
+      args: [jobBase64],
+    };
+  } else {
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+    if (await isAtLeastNpm7Async()) {
+      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
+      // prompting the user to install a package that is used for the first time
+      args.unshift('-y');
     }
+    return {
+      command: 'npx',
+      args,
+    };
   }
 }
 
-async function findWithNodeResolutionAsync(): Promise<string | undefined> {
-  try {
-    const resolvedPath = path.resolve(
-      path.dirname(require.resolve(PLUGIN_PACKAGE_NAME)),
-      '../bin/run'
-    );
-    if (await fs.pathExists(resolvedPath)) {
-      return resolvedPath;
-    }
-  } catch {}
-  return undefined;
+async function isAtLeastNpm7Async(): Promise<boolean> {
+  const version = (await spawnAsync('npm', ['--version'])).stdout.trim();
+  return semver.gte(version, '7.0.0');
 }

packages/eas-cli/src/build/metadata.ts

@@ -1,13 +1,14 @@
+import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import fs from 'fs-extra';
+import resolveFrom from 'resolve-from';
 
-import { getApplicationIdAsync } from '../project/android/applicationId';
-import { GradleBuildContext } from '../project/android/gradle';
-import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
+import Log from '../log';
 import { getUsername } from '../project/projectUtils';
 import { ensureLoggedInAsync } from '../user/actions';
-import vcs from '../vcs';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -21,29 +22,20 @@ import {
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { isExpoUpdatesInstalled } from './utils/updates';
 
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../../package.json');
-
-export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
-  ? AndroidMetadataContext
-  : IosMetadataContext;
-
-export interface AndroidMetadataContext {
-  gradleContext?: GradleBuildContext;
-}
-export interface IosMetadataContext {
-  buildSettings: XCBuildConfiguration['buildSettings'];
-  targetName?: string;
-  buildConfiguration?: string;
+// TODO(JJ): Replace this with the getRuntimeVersionNullable function in @expo/config-plugins
+function getRuntimeVersionNullable(
+  ...[config, platform]: Parameters<typeof Updates.getRuntimeVersion>
+): string | null {
+  try {
+    return Updates.getRuntimeVersion(config, platform);
+  } catch (e) {
+    Log.debug(e);
+    return null;
+  }
 }
 
 export async function collectMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext: MetadataContext<T>
+  ctx: BuildContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
@@ -52,18 +44,20 @@ export async function collectMetadataAsync<T extends Platform>(
       : ctx.buildProfile.distribution) ?? 'store';
   const metadata = {
     trackingContext: ctx.trackingCtx,
-    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
-    cliVersion: packageJSON.version,
+    ...(await maybeResolveVersionsAsync(ctx)),
+    cliVersion: easCliVersion,
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: ctx.exp.runtimeVersion,
+    runtimeVersion: getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    reactNativeVersion: await getReactNativeVersionAsync(ctx),
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
-    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
+    appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcs.getCommitHashAsync(),
+    gitCommitHash: await getVcsClient().getCommitHashAsync(),
+    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
     username: getUsername(ctx.exp, await ensureLoggedInAsync()),
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -75,15 +69,14 @@ export async function collectMetadataAsync<T extends Platform>(
 }
 
 async function maybeResolveVersionsAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext: MetadataContext<T>
+  ctx: BuildContext<T>
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext;
+    const iosContext = ctx as BuildContext<Platform.IOS>;
     return await maybeResolveIosVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      iosContext?.buildSettings ?? {}
+      iosContext.ios.applicationTargetBuildSettings
     );
   } else if (ctx.platform === Platform.ANDROID) {
     const androidCtx = ctx as BuildContext<Platform.ANDROID>;
@@ -93,19 +86,11 @@ async function maybeResolveVersionsAsync<T extends Platform>(
   }
 }
 
-async function resolveAppIdentifierAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext: MetadataContext<T>
-): Promise<string> {
+function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
   if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext;
-    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp, {
-      targetName: iosContext.targetName,
-      buildConfiguration: iosContext.buildConfiguration,
-    });
+    return (ctx as BuildContext<Platform.IOS>).ios.bundleIdentifier;
   } else {
-    const androidContext = platformContext as AndroidMetadataContext;
-    return await getApplicationIdAsync(ctx.projectDir, ctx.exp, androidContext.gradleContext);
+    return (ctx as BuildContext<Platform.ANDROID>).android.applicationId;
   }
 }
 
@@ -159,6 +144,19 @@ async function getNativeChannelAsync<T extends Platform>(
   return undefined;
 }
 
+async function getReactNativeVersionAsync(
+  ctx: BuildContext<Platform>
+): Promise<string | undefined> {
+  try {
+    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
+    return (await fs.readJson(reactNativePackageJsonPath)).version;
+  } catch (err) {
+    Log.debug('Failed to resolve react-native version:');
+    Log.debug(err);
+    return undefined;
+  }
+}
+
 function resolveIosEnterpriseProvisioning(
   ctx: BuildContext<Platform.IOS>
 ): IosEnterpriseProvisioning | undefined {

packages/eas-cli/src/build/types.ts

@@ -12,5 +12,3 @@ export enum BuildDistributionType {
   INTERNAL = 'internal',
   SIMULATOR = 'simulator',
 }
-
-export type TrackingContext = Record<string, string | number | boolean>;

packages/eas-cli/src/build/utils/analytics.ts

@@ -1,29 +0,0 @@
-import { logEvent } from '../../analytics';
-
-export enum Event {
-  BUILD_COMMAND = 'build cli build command',
-  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
-  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
-  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
-  BUILD_REQUEST_SUCCESS = 'build cli build request success',
-  BUILD_REQUEST_FAIL = 'build cli build request fail',
-
-  BUILD_STATUS_COMMAND = 'build cli build status',
-
-  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
-  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 {
-  logEvent(name: Event, properties: Record<string, any>) {
-    logEvent(name, properties);
-  },
-};

packages/eas-cli/src/build/utils/appJson.ts

@@ -1,6 +1,6 @@
 import * as ExpoConfig from '@expo/config';
+import JsonFile from '@expo/json-file';
 import assert from 'assert';
-import fs from 'fs-extra';
 
 export async function updateAppJsonConfigAsync(
   {
@@ -15,10 +15,19 @@ export async function updateAppJsonConfigAsync(
   const paths = ExpoConfig.getConfigFilePaths(projectDir);
   assert(paths.staticConfigPath, "can't update dynamic config");
 
-  const rawStaticConfig = await fs.readJSON(paths.staticConfigPath);
+  const rawStaticConfig = readAppJson(paths.staticConfigPath);
   rawStaticConfig.expo = rawStaticConfig.expo ?? {};
   modifyConfig(rawStaticConfig.expo);
-  await fs.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
+  await JsonFile.writeAsync(paths.staticConfigPath, rawStaticConfig, { json5: false });
 
   modifyConfig(exp);
 }
+
+// TODO: remove this once @expo/config exports getStaticConfig
+export function readAppJson(appJsonPath: string): any {
+  const config = JsonFile.read(appJsonPath, { json5: true });
+  if (config) {
+    return config as any;
+  }
+  throw new Error(`Failed to read app.json`);
+}

packages/eas-cli/src/build/utils/devClient.ts

@@ -1,5 +1,4 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJsonReader } from '@expo/eas-json';
+import { Workflow } from '@expo/eas-build-job';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
@@ -9,40 +8,38 @@ import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
-import { expoCommandAsync } from '../../utils/expoCommand';
-import zipObject from '../../utils/expodash/zipObject';
+import { expoCommandAsync } from '../../utils/expoCli';
+import { ProfileData } from '../../utils/profiles';
+import { getVcsClient } from '../../vcs';
 import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
-  platforms,
-  profile,
   nonInteractive = false,
+  buildProfiles = [],
 }: {
   projectDir: string;
-  platforms: Platform[];
-  profile: string;
   nonInteractive?: boolean;
+  buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
   if (await isExpoDevClientInstalledAsync(projectDir)) {
     return;
   }
 
-  const easJsonReader = new EasJsonReader(projectDir);
-  const devClientPerPlatformList = await Promise.all(
-    platforms.map(async platform => {
-      const buildProfile = await easJsonReader.readBuildProfileAsync(platform, profile);
-      return buildProfile.developmentClient ?? false;
-    })
+  const buildProfilesWithDevelopmentClientRequired = buildProfiles.filter(
+    buildProfile => buildProfile.profile.developmentClient
   );
 
-  const isDevClientRequired = devClientPerPlatformList.some(i => i);
-  if (!isDevClientRequired) {
+  const isDevelopmentClientRequired = buildProfilesWithDevelopmentClientRequired.some(Boolean);
+
+  if (!isDevelopmentClientRequired) {
     return;
   }
 
-  const devClientPerPlatform = zipObject(platforms, devClientPerPlatformList);
-  const platformsToCheck = platforms.filter(platform => devClientPerPlatform[platform]);
+  const platformsToCheck = buildProfilesWithDevelopmentClientRequired.map(
+    ({ platform }) => platform
+  );
+
   const workflowPerPlatformList = await Promise.all(
     platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
   );
@@ -67,15 +64,15 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
     if (install) {
       await installExpoDevClientAsync(projectDir, { nonInteractive });
     } else {
-      error(`Install ${chalk.bold('expo-dev-client')} on your own and come back later.`, {
+      error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
         exit: 1,
       });
     }
   } else {
-    Log.warn(`Unfortunately, you need to install ${chalk.bold('expo-dev-client')} on your own.`);
+    Log.warn(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
     Log.warn(
       learnMore('https://docs.expo.dev/clients/installation/', {
-        learnMoreMessage: 'See installation instructions on how to do it',
+        learnMoreMessage: 'See installation instructions on how to do it.',
         dim: false,
       })
     );
@@ -110,7 +107,9 @@ async function installExpoDevClientAsync(
   Log.newLine();
   await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
   Log.newLine();
-  await reviewAndCommitChangesAsync('Install expo-dev-client', {
-    nonInteractive,
-  });
+  if (await getVcsClient().isCommitRequiredAsync()) {
+    await reviewAndCommitChangesAsync('Install expo-dev-client', {
+      nonInteractive,
+    });
+  }
 }

packages/eas-cli/src/build/utils/formatBuild.ts

@@ -120,11 +120,5 @@ export function formatGraphQLBuild(build: BuildFragment): string {
 }
 
 const getActorName = (build: BuildFragment): string => {
-  if (!build.initiatingActor) {
-    return 'unknown';
-  } else if (build.initiatingActor.__typename === 'User') {
-    return build.initiatingActor.username;
-  } else {
-    return build.initiatingActor.firstName ?? 'unknown';
-  }
+  return build.initiatingActor?.displayName || 'unknown';
 };

packages/eas-cli/src/build/utils/printBuildInfo.ts

@@ -24,7 +24,9 @@ export function printLogsUrls(builds: BuildFragment[]): void {
     builds.forEach(build => {
       const logsUrl = getBuildLogsUrl(build);
       Log.log(
-        `${appPlatformDisplayNames[build.platform]} build details: ${chalk.underline(logsUrl)}`
+        `${appPlatformEmojis[build.platform]} ${
+          appPlatformDisplayNames[build.platform]
+        } build details: ${chalk.underline(logsUrl)}`
       );
     });
   }

packages/eas-cli/src/build/utils/repository.ts

@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 
 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -33,7 +33,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
 }
 
 export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -70,7 +70,7 @@ export async function commitPromptAsync({
     initial: initialCommitMessage,
     validate: (input: string) => input !== '',
   });
-  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
+  await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
 }
 
 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -95,7 +95,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
   startTimer(compressTimerLabel);
 
   try {
-    await vcs.makeShallowCopyAsync(shallowClonePath);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -133,7 +133,11 @@ export async function reviewAndCommitChangesAsync(
   { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
   if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+    await getVcsClient().commitAsync({
+      commitMessage: initialCommitMessage,
+      commitAllFiles: false,
+      nonInteractive,
+    });
     Log.withTick('Committed changes.');
     return;
   }
@@ -166,7 +170,7 @@ export async function reviewAndCommitChangesAsync(
     await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes.');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcs.showDiffAsync();
+    await getVcsClient().showDiffAsync();
     await reviewAndCommitChangesAsync(initialCommitMessage, {
       nonInteractive,
       askedFirstTime: false,

packages/eas-cli/src/build/utils/updates.ts

@@ -2,7 +2,7 @@ import { ExpoConfig, getPackageJson } from '@expo/config';
 
 export function isExpoUpdatesInstalled(projectDir: string): boolean {
   const packageJson = getPackageJson(projectDir);
-  return packageJson.dependencies && 'expo-updates' in packageJson.dependencies;
+  return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
 }
 
 export function ensureValidVersions(exp: ExpoConfig): void {

packages/eas-cli/src/build/utils/url.ts

@@ -22,7 +22,7 @@ export function getArtifactUrl(artifactId: string): string {
 
 export function getInternalDistributionInstallUrl(build: BuildFragment): string {
   if (build.platform === AppPlatform.Ios) {
-    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/--/api/v2/projects/${
+    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/v2/projects/${
       build.project.id
     }/builds/${build.id}/manifest.plist`;
   }

packages/eas-cli/src/build/utils/version.ts

@@ -0,0 +1,47 @@
+import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+import semver from 'semver';
+
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import { updateAppJsonConfigAsync } from './appJson';
+
+export function ensureStaticConfigExists(projectDir: string): void {
+  const paths = getConfigFilePaths(projectDir);
+  if (!paths.staticConfigPath) {
+    throw new Error('autoIncrement option is not supported when using app.config.js');
+  }
+}
+
+export async function bumpAppVersionAsync({
+  appVersion,
+  projectDir,
+  exp,
+}: {
+  appVersion: string;
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<void> {
+  let bumpedAppVersion: string;
+  if (semver.valid(appVersion)) {
+    bumpedAppVersion = nullthrows(semver.inc(appVersion, 'patch'));
+    Log.log(
+      `Bumping ${chalk.bold('expo.version')} from ${chalk.bold(appVersion)} to ${chalk.bold(
+        bumpedAppVersion
+      )}`
+    );
+  } else {
+    Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(appVersion)} is not a valid semver`);
+    bumpedAppVersion = (
+      await promptAsync({
+        type: 'text',
+        name: 'bumpedAppVersion',
+        message: 'What is the next version?',
+      })
+    ).bumpedAppVersion;
+  }
+  await updateAppJsonConfigAsync({ projectDir, exp }, config => {
+    config.version = bumpedAppVersion;
+  });
+}

packages/eas-cli/src/build/validate.ts

@@ -3,10 +3,10 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import Log, { learnMore } from '../log';
-import vcs from '../vcs';
-import { BuildContext } from './context';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';
 
-export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
+export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {
     Log.warn(
       'You set NODE_ENV=production in the build profile. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
@@ -16,7 +16,7 @@ export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
 }
 
 export async function checkGoogleServicesFileAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: CommonContext<T>
 ): Promise<void> {
   if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
     return;
@@ -25,12 +25,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const rootDir = path.normalize(await vcs.getRootPathAsync());
+  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await vcs.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await getVcsClient().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.`
@@ -41,7 +41,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
       )}`
     );
     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.'
+      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
     );
     Log.newLine();
   }

packages/eas-cli/src/commandUtils/EasCommand.ts

@@ -1,13 +1,19 @@
+import { EasJsonReader } from '@expo/eas-json';
 import { Command } from '@oclif/command';
+import semver from 'semver';
 
 import {
   AnalyticsEvent,
   flushAsync as flushAnalyticsAsync,
   initAsync as initAnalyticsAsync,
   logEvent,
-} from '../analytics';
+} from '../analytics/rudderstackClient';
+import { findProjectRootAsync } from '../project/projectUtils';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { setVcsClient } from '../vcs';
+import GitClient from '../vcs/clients/git';
 
 export default abstract class EasCommand extends Command {
   /**
@@ -21,6 +27,7 @@ export default abstract class EasCommand extends Command {
   // eslint-disable-next-line async-protect/async-suffix
   async run(): Promise<any> {
     await initAnalyticsAsync();
+    await this.applyCliConfigAsync();
 
     if (this.requiresAuthentication) {
       const { flags } = this.parse();
@@ -42,4 +49,18 @@ export default abstract class EasCommand extends Command {
     await flushAnalyticsAsync();
     return super.finally(err);
   }
+
+  private async applyCliConfigAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const easJsonReader = new EasJsonReader(projectDir);
+    const config = await easJsonReader.getCliConfigAsync();
+    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
+      throw new Error(
+        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
+      );
+    }
+    if (config?.requireCommit) {
+      setVcsClient(new GitClient());
+    }
+  }
 }

packages/eas-cli/src/commandUtils/__tests__/EasCommand-test.ts

@@ -1,4 +1,5 @@
-import { flushAsync, initAsync, logEvent } from '../../analytics';
+import { asMock } from '../../__tests__/utils';
+import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
 import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
 import { getUserAsync } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
@@ -9,8 +10,8 @@ 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');
+jest.mock('../../analytics/rudderstackClient', () => {
+  const { AnalyticsEvent } = jest.requireActual('../../analytics/rudderstackClient');
   return {
     AnalyticsEvent,
     logEvent: jest.fn(),
@@ -31,11 +32,15 @@ afterAll(() => {
 });
 
 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();
+  asMock(getUserAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(ensureLoggedInAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(initAsync).mockReset();
+  asMock(flushAsync).mockReset();
+  asMock(logEvent).mockReset();
 });
 
 describe(EasCommand.name, () => {
@@ -54,7 +59,7 @@ describe(EasCommand.name, () => {
     }, 15_000);
 
     it('ensures the user data is read from cache', async () => {
-      (TestEasCommand.prototype.authValue as jest.Mock).mockImplementationOnce(() => false);
+      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
 
       await TestEasCommand.run();
 

packages/eas-cli/src/commands/branch/create.ts

@@ -17,7 +17,7 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 
 export async function createUpdateBranchOnAppAsync({
   appId,
@@ -75,11 +75,7 @@ export default class BranchCreate extends EasCommand {
       flags,
     } = this.parse(BranchCreate);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
@@ -94,7 +90,8 @@ export default class BranchCreate extends EasCommand {
         name: 'name',
         message: 'Please name the branch:',
         initial:
-          (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+          (await getVcsClient().getBranchNameAsync()) ||
+          `branch-${Math.random().toString(36).substr(2, 4)}`,
         validate: value => (value ? true : validationMessage),
       }));
     }

packages/eas-cli/src/commands/branch/delete.ts

@@ -43,7 +43,8 @@ async function getBranchInfoAsync({
         {
           appId,
           name,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch'] }
       )
       .toPromise()
   );
@@ -98,10 +99,7 @@ export default class BranchDelete extends EasCommand {
       flags: { json: jsonFlag },
     } = this.parse(BranchDelete);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);

packages/eas-cli/src/commands/branch/list.ts

@@ -44,7 +44,8 @@ export async function listBranchesAsync({
         {
           appId: projectId,
           limit: BRANCHES_LIMIT,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch'] }
       )
       .toPromise()
   );
@@ -67,10 +68,7 @@ export default class BranchList extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = this.parse(BranchList);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const branches = await listBranchesAsync({ projectId });

packages/eas-cli/src/commands/branch/publish.ts

@@ -1,476 +1,10 @@
-import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
-import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
-import { flags } from '@oclif/command';
-import assert from 'assert';
-import chalk from 'chalk';
-import dateFormat from 'dateformat';
-import gql from 'graphql-tag';
-
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  GetUpdateGroupAsyncQuery,
-  Robot,
-  RootQueryUpdatesByGroupArgs,
-  Update,
-  UpdateInfoGroup,
-  User,
-  ViewBranchQuery,
-} from '../../graphql/generated';
-import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import {
-  PublishPlatform,
-  buildBundlesAsync,
-  buildUnsortedUpdateInfoGroupAsync,
-  collectAssets,
-  uploadAssetsAsync,
-} from '../../project/publish';
-import { promptAsync, selectAsync } from '../../prompts';
-import { formatUpdate } from '../../update/utils';
-import uniqBy from '../../utils/expodash/uniqBy';
-import formatFields from '../../utils/formatFields';
-import vcs from '../../vcs';
-import { createUpdateBranchOnAppAsync } from './create';
-import { listBranchesAsync } from './list';
-import { viewUpdateBranchAsync } from './view';
-
-export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
-type PlatformFlag = PublishPlatform | 'all';
-
-async function getUpdateGroupAsync({
-  group,
-}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
-  const { updatesByGroup } = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
-        gql`
-          query getUpdateGroupAsync($group: ID!) {
-            updatesByGroup(group: $group) {
-              id
-              group
-              runtimeVersion
-              manifestFragment
-              platform
-              message
-            }
-          }
-        `,
-        {
-          group,
-        }
-      )
-      .toPromise()
-  );
-  return updatesByGroup;
-}
-
-async function ensureBranchExistsAsync({
-  appId,
-  name: branchName,
-}: {
-  appId: string;
-  name: string;
-}): Promise<{
-  id: string;
-  updates: Exclude<
-    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'];
-}> {
-  const { app } = await viewUpdateBranchAsync({
-    appId,
-    name: branchName,
-  });
-  const updateBranch = app?.byId.updateBranchByName;
-  if (updateBranch) {
-    const { id, updates } = updateBranch;
-    return { id, updates };
-  }
-
-  const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
-  return { id: newUpdateBranch.id, updates: [] };
-}
 
 export default class BranchPublish extends EasCommand {
+  static description = 'deprecated, use "eas update"';
   static hidden = true;
-  static description = 'Publish an update group to a branch.';
-
-  static args = [
-    {
-      name: 'name',
-      description: 'Name of the branch to publish on',
-    },
-  ];
-
-  static flags = {
-    message: flags.string({
-      description: 'short message describing the updates.',
-      required: false,
-    }),
-    republish: flags.boolean({
-      description: 'republish an update group',
-      exclusive: ['input-dir', 'skip-bundler'],
-    }),
-    group: flags.string({
-      description: 'update group to republish',
-      exclusive: ['input-dir', 'skip-bundler'],
-    }),
-    'input-dir': flags.string({
-      description: 'location of the bundle',
-      default: 'dist',
-      required: false,
-    }),
-    'skip-bundler': flags.boolean({
-      description: `skip running Expo CLI to bundle the app before publishing`,
-      default: false,
-    }),
-    platform: flags.enum({
-      char: 'p',
-      description: `only publish to a single platform`,
-      options: [...defaultPublishPlatforms, 'all'],
-      default: 'all',
-      required: false,
-    }),
-    json: flags.boolean({
-      description: `return a json with the new update group.`,
-      default: false,
-    }),
-    auto: flags.boolean({
-      description:
-        'use the current git branch and commit message for the EAS branch and update message',
-      default: false,
-    }),
-  };
 
   async runAsync(): Promise<void> {
-    let {
-      args: { name: branchName },
-      flags: {
-        json: jsonFlag,
-        auto: autoFlag,
-        message,
-        republish,
-        group,
-        'input-dir': inputDir,
-        'skip-bundler': skipBundler,
-      },
-    } = this.parse(BranchPublish);
-    const platformFlag = this.parse(BranchPublish).flags.platform as PlatformFlag;
-    // If a group was specified, that means we are republishing it.
-    republish = group ? true : republish;
-
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
-    const { exp } = getConfig(projectDir, {
-      skipSDKVersionRequirement: true,
-      isPublicConfig: true,
-    });
-
-    const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
-
-    const projectId = await getProjectIdAsync(exp);
-
-    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 });
-      branchName = await selectAsync<string>(
-        'which branch would you like to publish on?',
-        branches.map(branch => {
-          return {
-            title: `${branch.name} ${chalk.grey(
-              `- current update: ${formatUpdate(branch.updates[0])}`
-            )}`,
-            value: branch.name,
-          };
-        })
-      );
-      assert(branchName, 'branch name must be specified.');
-    }
-
-    const { id: branchId, updates } = await ensureBranchExistsAsync({
-      appId: projectId,
-      name: branchName,
-    });
-
-    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
-    let oldMessage: string, oldRuntimeVersion: string;
-    if (republish) {
-      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
-      // Instead we get the `updateInfoGroup` from the update we wish to republish.
-      let updatesToRepublish: Pick<
-        Update,
-        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
-      >[];
-      if (group) {
-        updatesToRepublish = await getUpdateGroupAsync({ group });
-      } else {
-        // Drop into interactive mode if the user has not specified an update group to republish.
-        if (jsonFlag) {
-          throw new Error('You must specify the update group to republish.');
-        }
-
-        const updateGroups = uniqBy(updates, u => u.group)
-          .filter(update => {
-            // Only show groups that have updates on the specified platform(s).
-            return platformFlag === 'all' || update.platform === platformFlag;
-          })
-          .map(update => ({
-            title: formatUpdateTitle(update),
-            value: update.group,
-          }));
-        if (updateGroups.length === 0) {
-          throw new Error(
-            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
-          );
-        }
-
-        const selectedUpdateGroup = await selectAsync<string>(
-          'which update would you like to republish?',
-          updateGroups
-        );
-        updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
-      }
-      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
-        // Only republish to the specified platforms
-        update => platformFlag === 'all' || update.platform === platformFlag
-      );
-      if (updatesToRepublishFilteredByPlatform.length === 0) {
-        throw new Error(
-          `There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
-            group ? group : updatesToRepublish[0].group
-          }". Did you mean to publish a new update instead?`
-        );
-      }
-
-      let publicationPlatformMessage: string;
-      if (platformFlag === 'all') {
-        if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
-          Log.warn(`You are republishing an update that wasn't published for all platforms.`);
-        }
-        publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
-          .map(update => update.platform)
-          .join(',')}`;
-      } else {
-        publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
-      }
-      Log.withTick(publicationPlatformMessage);
-
-      for (const update of updatesToRepublishFilteredByPlatform) {
-        const { manifestFragment } = update;
-        const platform = update.platform as PublishPlatform;
-
-        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
-      }
-
-      // These are the same for each member of an update group
-      group = updatesToRepublishFilteredByPlatform[0].group;
-      oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
-      oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
-    } else {
-      // build bundle and upload assets for a new publish
-      if (!skipBundler) {
-        await buildBundlesAsync({ projectDir, inputDir });
-      }
-
-      const assetSpinner = ora('Uploading assets...').start();
-      try {
-        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
-        const assets = collectAssets({ inputDir: inputDir!, platforms });
-        await uploadAssetsAsync(assets);
-        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
-        assetSpinner.succeed('Uploaded assets!');
-      } catch (e) {
-        assetSpinner.fail('Failed to upload assets');
-        throw e;
-      }
-    }
-
-    if (!message && autoFlag) {
-      message = (await vcs.getLastCommitMessageAsync())?.trim();
-    }
-
-    if (!message) {
-      const validationMessage = 'publish message may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ publishMessage: message } = await promptAsync({
-        type: 'text',
-        name: 'publishMessage',
-        message: `Please enter a publication message.`,
-        initial: republish
-          ? `Republish "${oldMessage!}" - group: ${group}`
-          : (await vcs.getLastCommitMessageAsync())?.trim(),
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
-
-    const runtimeToPlatformMapping: Record<string, string[]> = {};
-    for (const runtime of new Set(Object.values(runtimeVersions))) {
-      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
-        .filter(pair => pair[1] === runtime)
-        .map(pair => pair[0]);
-    }
-
-    // Sort the updates into different groups based on their platform specific runtime versions
-    const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
-      const localUpdateInfoGroup = Object.fromEntries(
-        platforms.map(platform => [
-          platform,
-          unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
-        ])
-      );
-
-      if (republish && !oldRuntimeVersion) {
-        throw new Error(
-          'Can not find the runtime version of the update group that is being republished.'
-        );
-      }
-      return {
-        branchId,
-        updateInfoGroup: localUpdateInfoGroup,
-        runtimeVersion: republish ? oldRuntimeVersion : runtime,
-        message,
-      };
-    });
-    let newUpdates;
-    const publishSpinner = ora('Publishing...').start();
-    try {
-      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
-      publishSpinner.succeed('Published!');
-    } catch (e) {
-      publishSpinner.fail('Failed to published updates');
-      throw e;
-    }
-
-    if (jsonFlag) {
-      Log.log(JSON.stringify(newUpdates));
-    } else {
-      if (new Set(newUpdates.map(update => update.group)).size > 1) {
-        Log.addNewLineIfNone();
-        Log.log(
-          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
-        );
-      }
-
-      Log.addNewLineIfNone();
-      for (const runtime of new Set(Object.values(runtimeVersions))) {
-        const platforms = newUpdates
-          .filter(update => update.runtimeVersion === runtime)
-          .map(update => update.platform);
-        const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
-        if (!newUpdate) {
-          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
-        }
-        Log.log(
-          formatFields([
-            { label: 'branch', value: branchName },
-            { label: 'runtime version', value: runtime },
-            { label: 'platform', value: platforms.join(',') },
-            { label: 'update group ID', value: newUpdate.group },
-            { label: 'message', value: message },
-          ])
-        );
-        Log.addNewLineIfNone();
-      }
-    }
+    throw new Error(BranchPublish.description);
   }
 }
-
-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;
-
-  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}`;
-}

packages/eas-cli/src/commands/branch/rename.ts

@@ -74,10 +74,7 @@ export default class BranchRename extends EasCommand {
       flags: { json: jsonFlag, from: currentName, to: newName },
     } = this.parse(BranchRename);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);

packages/eas-cli/src/commands/branch/view.ts

@@ -58,7 +58,8 @@ export async function viewUpdateBranchAsync({
           appId,
           name,
           limit: PAGE_LIMIT,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch', 'Update'] }
       )
       .toPromise()
   );
@@ -90,11 +91,7 @@ export default class BranchView extends EasCommand {
       flags: { json: jsonFlag },
     } = this.parse(BranchView);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/build/cancel.ts

@@ -117,7 +117,7 @@ export default class BuildCancel extends EasCommand {
   async runAsync(): Promise<void> {
     const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);

packages/eas-cli/src/commands/build/configure.ts

@@ -7,6 +7,7 @@ import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
+import { getVcsClient } from '../../vcs';
 
 export default class BuildConfigure extends EasCommand {
   static description = 'Configure the project to support EAS Build.';
@@ -21,17 +22,20 @@ export default class BuildConfigure extends EasCommand {
 
   async runAsync(): Promise<void> {
     const { flags } = this.parse(BuildConfigure);
+
     Log.log(
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
     Log.newLine();
 
+    await getVcsClient().ensureRepoExistsAsync();
+
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
     await configureAsync({
       platform,
-      projectDir: (await findProjectRootAsync()) ?? process.cwd(),
+      projectDir: await findProjectRootAsync(),
     });
 
     Log.newLine();
@@ -48,7 +52,7 @@ function logSuccess(platform: RequestedPlatform): void {
     storesText = 'the Google Play Store';
   } else if (platform === 'ios') {
     platformsText = 'iOS project is';
-    storesText = 'the Apple App Store';
+    storesText = 'the Apple App Store Connect';
   }
 
   Log.log(`🎉 Your ${platformsText} ready to build.

packages/eas-cli/src/commands/build/index.ts

@@ -1,26 +1,30 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  EasJsonReader,
-  hasMismatchedExtendsAsync,
-  isUsingDeprecatedFormatAsync,
-  migrateAsync,
-} from '@expo/eas-json';
+import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
+import figures from 'figures';
+import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 
 import { prepareAndroidBuildAsync } from '../../build/android/build';
 import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import { BuildContext, createBuildContextAsync } from '../../build/context';
+import { BuildContext } from '../../build/context';
+import { createBuildContextAsync } from '../../build/createContext';
 import { prepareIosBuildAsync } from '../../build/ios/build';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build/utils/devClient';
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
+import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { BuildFragment, BuildStatus, SubmissionFragment } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus,
+  SubmissionFragment,
+} from '../../graphql/generated';
 import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
-import Log from '../../log';
+import Log, { learnMore, link } from '../../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
@@ -28,27 +32,26 @@ import {
   selectRequestedPlatformAsync,
   toPlatforms,
 } from '../../platform';
-import {
-  EAS_UNAVAILABLE_MESSAGE,
-  isEasEnabledForProjectAsync,
-} from '../../project/isEasEnabledForProject';
 import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { confirmAsync } from '../../prompts';
-import { createSubmissionContext } from '../../submit/context';
+import { selectAsync } from '../../prompts';
+import { createSubmissionContextAsync } from '../../submit/context';
 import {
   submitAsync,
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../../submit/submit';
 import { printSubmissionDetailsUrls } from '../../submit/utils/urls';
+import { easCliVersion } from '../../utils/easCli';
 import { enableJsonOutput } from '../../utils/json';
-import vcs from '../../vcs';
+import { ProfileData, getProfilesAsync } from '../../utils/profiles';
+import { getVcsClient, setVcsClient } from '../../vcs';
+import GitClient from '../../vcs/clients/git';
 
 interface RawBuildFlags {
   platform?: string;
   'skip-credentials-check': boolean;
   'skip-project-configuration': boolean;
-  profile: string;
+  profile?: string;
   'non-interactive': boolean;
   local: boolean;
   wait: boolean;
@@ -61,7 +64,7 @@ interface RawBuildFlags {
 interface BuildFlags {
   requestedPlatform: RequestedPlatform;
   skipProjectConfiguration: boolean;
-  profile: string;
+  profile?: string;
   nonInteractive: boolean;
   local: boolean;
   wait: boolean;
@@ -72,7 +75,7 @@ interface BuildFlags {
 }
 
 export default class Build extends EasCommand {
-  static description = 'start a build';
+  static description = 'Start a build';
 
   static flags = {
     platform: flags.enum({
@@ -92,8 +95,8 @@ export default class Build extends EasCommand {
       description: 'Skip project configuration',
     }),
     profile: flags.string({
-      default: 'release',
-      description: 'Name of the build profile from eas.json',
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
     'non-interactive': flags.boolean({
@@ -136,50 +139,77 @@ export default class Build extends EasCommand {
     const flags = await this.sanitizeFlagsAsync(rawFlags);
     const { requestedPlatform } = flags;
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
-    await vcs.ensureRepoExistsAsync();
+    await getVcsClient().ensureRepoExistsAsync();
     await ensureRepoIsCleanAsync(flags.nonInteractive);
 
     await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
 
     const platforms = toPlatforms(requestedPlatform);
-    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
-      platforms,
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
       projectDir,
-      profile: flags.profile,
-      nonInteractive: flags.nonInteractive,
+      platforms,
+      profileName: flags.profile ?? undefined,
     });
 
-    const startedBuilds: BuildFragment[] = [];
-    for (const platform of platforms) {
-      const maybeBuild = await this.prepareAndStartBuildAsync({
+    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+      projectDir,
+      nonInteractive: flags.nonInteractive,
+      buildProfiles,
+    });
+
+    const startedBuilds: {
+      build: BuildFragment;
+      buildProfile: ProfileData<'build'>;
+    }[] = [];
+    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
+
+    for (const buildProfile of buildProfiles) {
+      const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
         projectDir,
-        platform,
         flags,
         moreBuilds: platforms.length > 1,
+        buildProfile,
       });
       if (maybeBuild) {
-        startedBuilds.push(maybeBuild);
+        startedBuilds.push({ build: maybeBuild, buildProfile });
       }
+      buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
     }
+
     if (flags.local) {
       return;
     }
 
     Log.newLine();
-    printLogsUrls(startedBuilds);
+    printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
     Log.newLine();
 
     const submissions: SubmissionFragment[] = [];
     if (flags.autoSubmit) {
-      for (const build of startedBuilds) {
+      const submitProfiles = await getProfilesAsync({
+        projectDir,
+        platforms,
+        profileName: flags.submitProfile,
+        type: 'submit',
+      });
+      for (const startedBuild of startedBuilds) {
+        const submitProfile = nullthrows(
+          submitProfiles.find(
+            ({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
+          )
+        ).profile;
         const submission = await this.prepareAndStartSubmissionAsync({
-          projectDir,
-          build,
-          flags,
+          build: startedBuild.build,
+          buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
           moreBuilds: startedBuilds.length > 1,
+          projectDir,
+          buildProfile: startedBuild.buildProfile.profile,
+          submitProfile,
+          nonInteractive: flags.nonInteractive,
         });
         submissions.push(submission);
       }
@@ -193,7 +223,7 @@ export default class Build extends EasCommand {
       return;
     }
 
-    const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
+    const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
     printBuildResults(builds, flags.json);
 
     const haveAllBuildsFailedOrCanceled = builds.every(
@@ -248,39 +278,36 @@ export default class Build extends EasCommand {
       wait: flags['wait'],
       clearCache: flags['clear-cache'],
       json: flags['json'],
-      autoSubmit: flags['auto-submit'],
+      autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
     };
   }
 
   private async prepareAndStartBuildAsync({
     projectDir,
-    platform,
     flags,
     moreBuilds,
+    buildProfile,
   }: {
     projectDir: string;
-    platform: Platform;
     flags: BuildFlags;
     moreBuilds: boolean;
-  }): Promise<BuildFragment | undefined> {
-    const easJsonReader = new EasJsonReader(projectDir);
-    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
-
+    buildProfile: ProfileData<'build'>;
+  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
     const buildCtx = await createBuildContextAsync({
-      buildProfileName: flags.profile,
+      buildProfileName: buildProfile.profileName,
       clearCache: flags.clearCache,
-      buildProfile,
+      buildProfile: buildProfile.profile,
       local: flags.local,
       nonInteractive: flags.nonInteractive,
-      platform,
+      platform: buildProfile.platform,
       projectDir,
       skipProjectConfiguration: flags.skipProjectConfiguration,
     });
 
     if (moreBuilds) {
       Log.newLine();
-      const appPlatform = toAppPlatform(platform);
+      const appPlatform = toAppPlatform(buildProfile.platform);
       Log.log(
         `${appPlatformEmojis[appPlatform]} ${chalk.bold(
           `${appPlatformDisplayNames[appPlatform]} build`
@@ -293,11 +320,11 @@ export default class Build extends EasCommand {
       this.metroConfigValidated = true;
     }
 
-    if (!buildCtx.local && !(await isEasEnabledForProjectAsync(buildCtx.projectId))) {
-      error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
-    }
-
-    return await this.startBuildAsync(buildCtx);
+    const build = await this.startBuildAsync(buildCtx);
+    return {
+      build,
+      buildCtx,
+    };
   }
 
   private async startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
@@ -311,28 +338,33 @@ export default class Build extends EasCommand {
   }
 
   private async prepareAndStartSubmissionAsync({
-    projectDir,
     build,
-    flags,
+    buildCtx,
     moreBuilds,
+    projectDir,
+    buildProfile,
+    submitProfile,
+    nonInteractive,
   }: {
-    projectDir: string;
     build: BuildFragment;
-    flags: BuildFlags;
+    buildCtx: BuildContext<Platform>;
     moreBuilds: boolean;
+    projectDir: string;
+    buildProfile: BuildProfile;
+    submitProfile: SubmitProfile;
+    nonInteractive: boolean;
   }): Promise<SubmissionFragment> {
-    const easJsonReader = new EasJsonReader(projectDir);
     const platform = toPlatform(build.platform);
-    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
-    const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
-    const submissionCtx = createSubmissionContext({
+    const submissionCtx = await createSubmissionContextAsync({
       platform,
       projectDir,
       projectId: build.project.id,
       profile: submitProfile,
       archiveFlags: { id: build.id },
-      nonInteractive: flags.nonInteractive,
+      nonInteractive,
       env: buildProfile.env,
+      credentialsCtx: buildCtx.credentialsCtx,
+      applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
     });
 
     if (moreBuilds) {
@@ -361,36 +393,62 @@ 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 easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+  if (!(await fs.pathExists(easJsonPath))) {
+    return;
+  }
+  const easJsonReader = new EasJsonReader(projectDir);
+  const rawEasJson = await easJsonReader.readAsync();
+  if (rawEasJson?.cli) {
+    return;
+  }
 
-    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 (nonInteractive) {
+    Log.warn(
+      `${
+        figures.warning
+      } Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
+        'https://expo.fyi/eas-vcs-workflow'
+      )} for more information.`
+    );
+    Log.warn(
+      'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
+    );
+    setVcsClient(new GitClient());
+    return;
+  }
+  Log.log(
+    `${chalk.bold(
+      'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
+    )} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
+  );
+  Log.log(
+    `If you want to continue using the Git integration, you can opt in with ${chalk.bold(
+      'cli.requireCommit'
+    )} in ${chalk.bold('eas.json')} or with the following prompt.`
+  );
+  Log.newLine();
+
+  const mode = await selectAsync('Select your preferred Git integration', [
+    { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+  ]);
+
+  if (mode === 'requireCommit') {
+    setVcsClient(new GitClient());
+    await ensureRepoIsCleanAsync(nonInteractive);
+  }
+
+  rawEasJson.cli =
+    mode === 'requireCommit'
+      ? { version: `>= ${easCliVersion}`, requireCommit: true }
+      : { version: `>= ${easCliVersion}` };
+  await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
+  Log.withTick('Updated eas.json');
+  if (mode === 'requireCommit') {
+    await getVcsClient().trackFileAsync(easJsonPath);
+    await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
+      nonInteractive,
     });
-    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 });
-    }
   }
 }

packages/eas-cli/src/commands/build/list.ts

@@ -76,7 +76,7 @@ export default class BuildList extends EasCommand {
     const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
     const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);

packages/eas-cli/src/commands/build/view.ts

@@ -34,7 +34,7 @@ export default class BuildView extends EasCommand {
       enableJsonOutput();
     }
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);

packages/eas-cli/src/commands/channel/create.ts

@@ -20,7 +20,7 @@ import { promptAsync } from '../../prompts';
 import formatFields from '../../utils/formatFields';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
 
-async function createUpdateChannelOnAppAsync({
+export async function createUpdateChannelOnAppAsync({
   appId,
   channelName,
   branchId,
@@ -84,10 +84,7 @@ export default class ChannelCreate extends EasCommand {
       flags: { json: jsonFlag },
     } = this.parse(ChannelCreate);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/channel/edit.ts

@@ -49,7 +49,8 @@ async function getChannelByNameForAppAsync({
             }
           }
         `,
-        { appId, channelName }
+        { appId, channelName },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
       )
       .toPromise()
   );
@@ -88,7 +89,7 @@ export async function updateChannelBranchMappingAsync({
   );
   const channel = data.updateChannel.editUpdateChannel;
   if (!channel) {
-    throw new Error(`Could not fine channel with id ${channelId}`);
+    throw new Error(`Could not find a channel with id: ${channelId}`);
   }
   return data.updateChannel.editUpdateChannel!;
 }
@@ -121,10 +122,7 @@ export default class ChannelEdit extends EasCommand {
       flags: { branch: branchName, json: jsonFlag },
     } = this.parse(ChannelEdit);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/channel/list.ts

@@ -58,7 +58,8 @@ async function getAllUpdateChannelForAppAsync({
             }
           }
         `,
-        { appId, offset: 0, limit: CHANNEL_LIMIT }
+        { appId, offset: 0, limit: CHANNEL_LIMIT },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
       )
       .toPromise()
   );
@@ -80,10 +81,7 @@ export default class ChannelList extends EasCommand {
       flags: { json: jsonFlag },
     } = this.parse(ChannelList);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/channel/rollout.ts

@@ -346,10 +346,7 @@ export default class ChannelRollout extends EasCommand {
       flags: { branch: branchName, percent },
     } = this.parse(ChannelRollout);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);

packages/eas-cli/src/commands/channel/view.ts

@@ -133,7 +133,8 @@ export async function getUpdateChannelByNameForAppAsync({
             }
           }
         `,
-        { appId, channelName }
+        { appId, channelName },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
       )
       .toPromise()
   );
@@ -180,7 +181,7 @@ export function logChannelDetails(channel: {
         : []),
       formatUpdate(update),
       update?.runtimeVersion ?? 'N/A',
-      update?.group ?? 'N/A,',
+      update?.group ?? 'N/A',
       getPlatformsForGroup({
         updates: branch.updates,
         group: branch.updates[0]?.group,
@@ -215,10 +216,7 @@ export default class ChannelView extends EasCommand {
       flags: { json: jsonFlag },
     } = this.parse(ChannelView);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
@@ -241,7 +239,7 @@ export default class ChannelView extends EasCommand {
     });
     const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
     if (!channel) {
-      throw new Error(`Could not fine channel with name ${channelName}`);
+      throw new Error(`Could not find a channel with name: ${channelName}`);
     }
 
     if (jsonFlag) {
@@ -258,9 +256,7 @@ export default class ChannelView extends EasCommand {
       ])
     );
     Log.addNewLineIfNone();
-    Log.log(
-      chalk`{bold Branches, pointed at by this channel, and their most recent update group:}`
-    );
+    Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
     logChannelDetails(channel);
   }
 }

packages/eas-cli/src/commands/config.ts

@@ -27,7 +27,7 @@ export default class Config extends EasCommand {
       profile?: string;
     };
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     await handleDeprecatedEasJsonAsync(projectDir, false);
 
     const reader = new EasJsonReader(projectDir);
@@ -55,7 +55,7 @@ export default class Config extends EasCommand {
         },
       ]));
 
-    const profile = await reader.readBuildProfileAsync(platform, profileName);
+    const profile = await reader.getBuildProfileAsync(platform, profileName);
     const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
 
     Log.log(getProjectConfigDescription(projectDir));

packages/eas-cli/src/commands/credentials.ts

@@ -1,12 +1,10 @@
 import EasCommand from '../commandUtils/EasCommand';
-import { createCredentialsContextAsync } from '../credentials/context';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
 
 export default class Credentials extends EasCommand {
   static description = 'manage your credentials';
 
   async runAsync(): Promise<void> {
-    const ctx = await createCredentialsContextAsync(process.cwd(), {});
-    await new SelectPlatform().runAsync(ctx);
+    await new SelectPlatform().runAsync();
   }
 }

packages/eas-cli/src/commands/device/list.ts

@@ -22,7 +22,7 @@ export default class BuildList extends EasCommand {
   async runAsync(): Promise<void> {
     let appleTeamIdentifier = this.parse(BuildList).flags['apple-team-id'];
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 

packages/eas-cli/src/commands/device/view.ts

@@ -29,7 +29,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
       throw new Error('Device UDID is missing');
     }
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 

packages/eas-cli/src/commands/diagnostics.ts

@@ -1,9 +1,11 @@
+import { Platform } from '@expo/eas-build-job';
 import envinfo from 'envinfo';
 
 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
-
-const packageJSON = require('../../package.json');
+import { findProjectRootAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { easCliVersion } from '../utils/easCli';
 
 export default class Diagnostics extends EasCommand {
   static description = 'log environment info to the console';
@@ -30,9 +32,26 @@ export default class Diagnostics extends EasCommand {
         npmGlobalPackages: ['eas-cli', 'expo-cli'],
       },
       {
-        title: `EAS CLI ${packageJSON.version} environment info`,
+        title: `EAS CLI ${easCliVersion} environment info`,
       }
     );
-    Log.log(info);
+
+    Log.log(info.trimEnd());
+    await this.printWorkflowAsync();
+    Log.newLine();
+  }
+
+  private async printWorkflowAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+
+    if (androidWorkflow === iosWorkflow) {
+      Log.log(`    Project workflow: ${androidWorkflow}`);
+    } else {
+      Log.log(`    Project Workflow:`);
+      Log.log(`      Android: ${androidWorkflow}`);
+      Log.log(`      iOS: ${iosWorkflow}`);
+    }
   }
 }

packages/eas-cli/src/commands/project/info.ts

@@ -22,7 +22,8 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
             }
           }
         `,
-        { appId }
+        { appId },
+        { additionalTypenames: ['App'] }
       )
       .toPromise()
   );
@@ -34,10 +35,7 @@ export default class ProjectInfo extends EasCommand {
   static description = 'information about the current project';
 
   async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const { app } = await projectInfoByIdAsync(projectId);

packages/eas-cli/src/commands/project/init.ts

@@ -10,10 +10,7 @@ export default class ProjectInit extends EasCommand {
   static aliases = ['init'];
 
   async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
 
     if (exp.extra?.eas?.projectId) {

packages/eas-cli/src/commands/secret/create.ts

@@ -9,10 +9,6 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -50,19 +46,13 @@ export default class EnvironmentSecretCreate extends EasCommand {
       flags: { name, value: secretValue, scope, force },
     } = this.parse(EnvironmentSecretCreate);
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
     const { slug } = exp;
     const projectId = await getProjectIdAsync(exp);
 
-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
     if (!scope) {
       const validationMessage = 'Secret scope may not be empty.';
 

packages/eas-cli/src/commands/secret/delete.ts

@@ -10,10 +10,6 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -23,7 +19,7 @@ import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
 export default class EnvironmentSecretDelete extends EasCommand {
   static description = `Delete an environment secret by ID.
-Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
+Unsure where to find the secret's ID? Run ${chalk.bold('eas secret:list')}`;
 
   static flags = {
     id: flags.string({
@@ -32,17 +28,11 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
   };
 
   async runAsync(): Promise<void> {
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 
-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
     let {
       flags: { id },
     } = this.parse(EnvironmentSecretDelete);

packages/eas-cli/src/commands/secret/list.ts

@@ -6,10 +6,6 @@ import dateFormat from 'dateformat';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import {
-  isEasEnabledForProjectAsync,
-  warnEasUnavailable,
-} from '../../project/isEasEnabledForProject';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -20,17 +16,11 @@ export default class EnvironmentSecretList extends EasCommand {
   static description = 'Lists environment secrets available for your current app';
 
   async runAsync(): Promise<void> {
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 
-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
     if (!projectDir) {
       throw new Error("Please run this command inside your project's directory");
     }

packages/eas-cli/src/commands/submit.ts

@@ -1,5 +1,4 @@
 import { getConfig } from '@expo/config';
-import { EasJsonReader } from '@expo/eas-json';
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
@@ -7,7 +6,7 @@ import chalk from 'chalk';
 import EasCommand from '../commandUtils/EasCommand';
 import { SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
-import Log, { learnMore } from '../log';
+import Log, { link } from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
@@ -15,11 +14,11 @@ import {
   selectRequestedPlatformAsync,
   toPlatforms,
 } from '../platform';
-import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
-import { SubmitArchiveFlags, createSubmissionContext } from '../submit/context';
+import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
 import { submitAsync, waitToCompleteAsync } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { getProfilesAsync } from '../utils/profiles';
 
 interface RawFlags {
   platform?: string;
@@ -43,10 +42,8 @@ interface Flags {
 }
 
 export default class Submit extends EasCommand {
-  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 description = `Submit build archive to App Store Connect
+See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
   static aliases = ['build:submit'];
 
   static flags = {
@@ -56,7 +53,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
     }),
     profile: flags.string({
       description:
-        'Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.',
+        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
     }),
     latest: flags.boolean({
       description: 'Submit the latest build for specified platform',
@@ -93,33 +90,32 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
     const { flags: rawFlags } = this.parse(Submit);
     const flags = await this.sanitizeFlagsAsync(rawFlags);
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
-    if (!(await isEasEnabledForProjectAsync(projectId))) {
-      warnEasUnavailable();
-      process.exitCode = 1;
-      return;
-    }
-
-    const easJsonReader = new EasJsonReader(projectDir);
     const platforms = toPlatforms(flags.requestedPlatform);
+    const submissionProfiles = await getProfilesAsync({
+      type: 'submit',
+      projectDir,
+      platforms,
+      profileName: flags.profile,
+    });
+
     const submissions: SubmissionFragment[] = [];
-    for (const platform of platforms) {
-      const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
-      const ctx = createSubmissionContext({
-        platform,
+    for (const submissionProfile of submissionProfiles) {
+      const ctx = await createSubmissionContextAsync({
+        platform: submissionProfile.platform,
         projectDir,
         projectId,
-        profile,
+        profile: submissionProfile.profile,
         archiveFlags: flags.archiveFlags,
         nonInteractive: flags.nonInteractive,
       });
 
-      if (platforms.length > 1) {
+      if (submissionProfiles.length > 1) {
         Log.newLine();
-        const appPlatform = toAppPlatform(platform);
+        const appPlatform = toAppPlatform(submissionProfile.platform);
         Log.log(
           `${appPlatformEmojis[appPlatform]} ${chalk.bold(
             `${appPlatformDisplayNames[appPlatform]} submission`

packages/eas-cli/src/commands/update/configure.ts

@@ -0,0 +1,108 @@
+import { ExpoConfig, getConfig, modifyConfigAsync } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import Log, { learnMore } from '../../log';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+
+const EAS_UPDATE_URL = 'https://u.expo.dev';
+const DEFAULT_RUNTIME_VERSION = { policy: 'sdkVersion' } as const;
+
+export async function getEASUpdateURLAsync(exp: ExpoConfig): Promise<string> {
+  const projectId = await getProjectIdAsync(exp);
+  return new URL(projectId, EAS_UPDATE_URL).href;
+}
+
+async function configureProjectForEASUpdateAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  const easUpdateURL = await getEASUpdateURLAsync(exp);
+  const preexistingRuntimeVersion = exp.runtimeVersion;
+  const result = await modifyConfigAsync(projectDir, {
+    runtimeVersion: preexistingRuntimeVersion ?? DEFAULT_RUNTIME_VERSION,
+    updates: { ...exp.updates, url: easUpdateURL },
+  });
+
+  switch (result.type) {
+    case 'success':
+      if (exp.updates?.url) {
+        if (exp.updates.url !== easUpdateURL) {
+          Log.withTick(
+            `Overwrote "${exp.updates?.url}" with "${easUpdateURL}" for the updates.url value in app.json`
+          );
+        }
+      } else {
+        Log.withTick(`Set updates.url value, to "${easUpdateURL}" in app.json`);
+      }
+      if (!preexistingRuntimeVersion) {
+        Log.withTick(
+          `Set runtimeVersion to "${JSON.stringify(DEFAULT_RUNTIME_VERSION)}" in app.json`
+        );
+      }
+
+      break;
+    case 'warn': {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `It looks like you are using a dynamic configuration! ${learnMore(
+          'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs)'
+        )}`
+      );
+      Log.warn(
+        `In order to finish configuring your project for EAS Update, you are going to need manually add the following to your app.config.js:\n${learnMore(
+          'https://expo.fyi/eas-update-config.md'
+        )}\n`
+      );
+      Log.log(
+        chalk.bold(
+          `{\n  updates": {\n    "url": "${easUpdateURL}"\n  },\n  "runtimeVersion": {\n    "policy": "sdkVersion"\n  }\n}`
+        )
+      );
+      Log.addNewLineIfNone();
+      throw new Error(result.message);
+    }
+    case 'fail':
+      throw new Error(result.message);
+    default:
+      throw new Error('Unexpected result type from modifyConfigAsync');
+  }
+}
+
+export default class UpdateConfigure extends EasCommand {
+  static hidden = true;
+  static description = 'Configure the project to support EAS Update.';
+
+  async runAsync(): Promise<void> {
+    Log.log(
+      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
+    );
+
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+    });
+
+    await configureProjectForEASUpdateAsync(projectDir, exp);
+
+    const hasAndroidNativeProject =
+      (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
+    const hasIosNativeProject =
+      (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
+
+    Log.addNewLineIfNone();
+    if (hasAndroidNativeProject || hasIosNativeProject) {
+      Log.log(
+        `🧐 It seems you are on the bare workflow! Please also update your native files. You can do this by either running ${chalk.bold(
+          'eas build:configure'
+        )} or manually editing Expo.plist/AndroidManifest.xml. ${learnMore(
+          'https://expo.fyi/eas-update-config.md#native-configuration'
+        )}`
+      );
+    } else {
+      Log.log(`🎉 Your app is configured to run EAS Update!`);
+    }
+  }
+}

packages/eas-cli/src/commands/update/index.ts

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

packages/eas-cli/src/commands/update/view.ts

@@ -39,7 +39,8 @@ export async function viewUpdateAsync({
         `,
         {
           groupId,
-        }
+        },
+        { additionalTypenames: ['Update'] }
       )
       .toPromise()
   );

packages/eas-cli/src/commands/webhook/create.ts

@@ -14,8 +14,7 @@ export default class WebhookCreate extends EasCommand {
   static flags = {
     event: flags.enum({
       description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
-      default: WebhookType.Build,
+      options: [WebhookType.Build, WebhookType.Submit],
     }),
     url: flags.string({
       description: 'Webhook URL',
@@ -30,10 +29,7 @@ export default class WebhookCreate extends EasCommand {
     const { flags } = this.parse(WebhookCreate);
     const webhookInputParams = await prepareInputParamsAsync(flags);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/webhook/delete.ts

@@ -29,10 +29,7 @@ export default class WebhookDelete extends EasCommand {
       args: { ID: webhookId },
     } = this.parse(WebhookDelete);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 

packages/eas-cli/src/commands/webhook/list.ts

@@ -20,7 +20,7 @@ export default class WebhookList extends EasCommand {
   static flags = {
     event: flags.enum({
       description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
+      options: [WebhookType.Build, WebhookType.Submit],
     }),
   };
 
@@ -29,10 +29,7 @@ export default class WebhookList extends EasCommand {
       flags: { event },
     } = this.parse(WebhookList);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);

packages/eas-cli/src/commands/webhook/update.ts

@@ -18,8 +18,7 @@ export default class WebhookUpdate extends EasCommand {
     }),
     event: flags.enum({
       description: 'Event type that triggers the webhook',
-      options: [WebhookType.Build],
-      default: WebhookType.Build,
+      options: [WebhookType.Build, WebhookType.Submit],
     }),
     url: flags.string({
       description: 'Webhook URL',

packages/eas-cli/src/credentials/__tests__/fixtures-android.ts

@@ -6,6 +6,7 @@ import {
   AndroidKeystoreType,
   AppFragment,
   CommonAndroidAppCredentialsFragment,
+  GoogleServiceAccountKeyFragment,
 } from '../../graphql/generated';
 import * as AndroidGraphqlClient from '../android/api/GraphqlClient';
 import { Keystore } from '../android/credentials';
@@ -68,6 +69,16 @@ export const testLegacyAndroidFcmFragment: AndroidFcmFragment = {
   updatedAt: now,
 };
 
+export const testGoogleServiceAccountKeyFragment: GoogleServiceAccountKeyFragment = {
+  id: 'test-id',
+  projectIdentifier: 'sdf.sdf.sdf',
+  privateKeyIdentifier: 'test-private-key-identifier',
+  clientEmail: '[email protected]',
+  clientIdentifier: 'test-client-identifier',
+  createdAt: now,
+  updatedAt: now,
+};
+
 export const testJksAndroidKeystoreFragment: AndroidKeystoreFragment = {
   id: 'test-id',
   type: AndroidKeystoreType.Jks,
@@ -113,6 +124,7 @@ export const testAndroidAppCredentialsFragment: CommonAndroidAppCredentialsFragm
   isLegacy: false,
   app: testAppFragment,
   androidFcm: testLegacyAndroidFcmFragment,
+  googleServiceAccountKeyForSubmissions: testGoogleServiceAccountKeyFragment,
   androidAppBuildCredentialsList: [testLegacyAndroidBuildCredentialsFragment],
 };
 
@@ -130,6 +142,9 @@ export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlCli
     getAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createKeystoreAsync: jest.fn(),
+    createGoogleServiceAccountKeyAsync: jest.fn(),
+    deleteGoogleServiceAccountKeyAsync: jest.fn(),
+    getGoogleServiceAccountKeysForAccountAsync: jest.fn(),
     createFcmAsync: jest.fn(),
     deleteKeystoreAsync: jest.fn(),
     deleteFcmAsync: jest.fn(),