convert to ESM

* eslint - enable no-underscore-dangle

* update CHANGELOG.md

.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 }],
@@ -34,6 +34,7 @@ module.exports = {
         ],
       },
     ],
+    'no-underscore-dangle': ['error', { allow: ['__typename'] }],
     '@typescript-eslint/explicit-function-return-type': [
       'warn',
       {
@@ -41,6 +42,7 @@ module.exports = {
       },
     ],
     'async-protect/async-suffix': 'error',
+    'node/no-sync': 'error',
   },
   overrides: [
     {

.github/PULL_REQUEST_TEMPLATE

@@ -2,7 +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 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.
 - [ ] 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).
 
 # 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@v1
+        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" | xargs )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | xargs )
+          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
@@ -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@v1
+        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@v1
+        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: ''

CHANGELOG.md

@@ -8,6 +8,73 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+### 🐛 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
+
+- 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/0.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/0.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/0.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))
 

CONTRIBUTING.md

@@ -1,37 +1,8 @@
 ## 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]`
+1. Run `yarn release` in the repository root folder.
+2. Wait, the `release` workflow on GitHub Actions is going to take care of the rest (including publishing packages to npm and updating the changelog).
+3. Check the changelog. If any of the 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.

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.29.0"
+  "version": "0.31.1"
 }

package.json

@@ -1,8 +1,6 @@
 {
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
   "scripts": {
     "build": "lerna run build",
     "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
@@ -12,7 +10,8 @@
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint . --ext .ts --ext .js",
     "release": "lerna version",
-    "test": "jest"
+    "test": "jest",
+    "clean": "lerna run clean"
   },
   "devDependencies": {
     "@expo/oclif-dev-cli": "1.24.0-expo",
@@ -21,6 +20,7 @@
     "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",
@@ -29,7 +29,7 @@
     "typescript": "4.4.2"
   },
   "volta": {
-    "node": "16.8.0",
-    "yarn": "1.22.11"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
   }
 }

packages/eas-cli/README.md

@@ -73,7 +73,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/account/login.js)_
+_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/login.js)_
 
 ## `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.29.0/packages/eas-cli/src/commands/account/logout.js)_
+_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/logout.js)_
 
 ## `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.29.0/packages/eas-cli/src/commands/account/view.js)_
+_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/view.js)_
 
 ## `eas analytics [STATUS]`
 
@@ -112,7 +112,7 @@ USAGE
   $ eas analytics [STATUS]
 ```
 
-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/analytics.js)_
 
 ## `eas build`
 
@@ -145,7 +145,7 @@ OPTIONS
   --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/index.js)_
+_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/index.js)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -156,7 +156,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/build/cancel.js)_
+_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/cancel.js)_
 
 ## `eas build:configure`
 
@@ -170,7 +170,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.29.0/packages/eas-cli/src/commands/build/configure.js)_
+_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/configure.js)_
 
 ## `eas build:list`
 
@@ -203,7 +203,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.29.0/packages/eas-cli/src/commands/build/list.js)_
+_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/list.js)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -217,7 +217,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.29.0/packages/eas-cli/src/commands/build/view.js)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/view.js)_
 
 ## `eas config`
 
@@ -232,7 +232,7 @@ OPTIONS
   --profile=profile
 ```
 
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/config.js)_
 
 ## `eas credentials`
 
@@ -243,7 +243,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/credentials.js)_
 
 ## `eas device:create`
 
@@ -254,7 +254,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/create.js)_
 
 ## `eas device:list`
 
@@ -268,7 +268,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/list.js)_
+_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/list.js)_
 
 ## `eas device:view [UDID]`
 
@@ -279,7 +279,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/device/view.js)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/view.js)_
 
 ## `eas diagnostics`
 
@@ -290,7 +290,7 @@ USAGE
   $ eas diagnostics
 ```
 
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/diagnostics.js)_
 
 ## `eas help [COMMAND]`
 
@@ -318,7 +318,7 @@ USAGE
   $ eas project:info
 ```
 
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/info.js)_
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/project/info.js)_
 
 ## `eas project:init`
 
@@ -332,7 +332,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/project/init.js)_
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/project/init.js)_
 
 ## `eas secret:create`
 
@@ -349,7 +349,7 @@ OPTIONS
   --value=value              Value of the secret
 ```
 
-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/create.js)_
 
 ## `eas secret:delete`
 
@@ -366,7 +366,7 @@ DESCRIPTION
   Unsure where to find the secret's ID? Run eas secrets:list
 ```
 
-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/delete.js)_
+_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/delete.js)_
 
 ## `eas secret:list`
 
@@ -377,7 +377,7 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/secret/list.js)_
+_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/list.js)_
 
 ## `eas submit`
 
@@ -410,7 +410,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/submit.js)_
 
 ## `eas webhook:create`
 
@@ -429,7 +429,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/create.js)_
+_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/create.js)_
 
 ## `eas webhook:delete [ID]`
 
@@ -443,7 +443,7 @@ ARGUMENTS
   ID  ID of the webhook to delete
 ```
 
-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/delete.js)_
+_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/delete.js)_
 
 ## `eas webhook:list`
 
@@ -457,7 +457,7 @@ OPTIONS
   --event=(BUILD)  Event type that triggers the webhook
 ```
 
-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/list.js)_
+_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/list.js)_
 
 ## `eas webhook:update`
 
@@ -477,7 +477,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/update.js)_
+_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/update.js)_
 
 ## `eas webhook:view ID`
 
@@ -491,5 +491,5 @@ ARGUMENTS
   ID  ID of the webhook to view
 ```
 
-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- 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.schema.json

@@ -15034,7 +15034,7 @@
         "fields": [
           {
             "name": "createGoogleServiceAccountKey",
-            "description": "Create an Google Service Account Key",
+            "description": "Create a Google Service Account Key",
             "args": [
               {
                 "name": "googleServiceAccountKeyInput",
@@ -15080,6 +15080,39 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "deleteGoogleServiceAccountKey",
+            "description": "Delete a Google Service Account Key",
+            "args": [
+              {
+                "name": "id",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "DeleteGoogleServiceAccountKeyResult",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -15114,6 +15147,33 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "DeleteGoogleServiceAccountKeyResult",
+        "description": "",
+        "fields": [
+          {
+            "name": "id",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "AppleAppIdentifierMutation",

packages/eas-cli/package.json

@@ -1,7 +1,8 @@
 {
   "name": "eas-cli",
+  "type": "module",
   "description": "EAS command line tool",
-  "version": "0.29.0",
+  "version": "0.31.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -9,17 +10,17 @@
   "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.48",
-    "@expo/eas-json": "^0.29.0",
+    "@expo/config": "6.0.2",
+    "@expo/config-plugins": "4.0.2",
+    "@expo/eas-build-job": "0.2.52",
+    "@expo/eas-json": "^0.31.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/prebuild-config": "3.0.2",
     "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.0.7",
+    "@expo/rudder-sdk-node": "1.1.0",
     "@expo/sdk-runtime-versions": "1.0.0",
     "@expo/spawn-async": "1.5.0",
     "@expo/timeago.js": "1.0.0",
@@ -61,6 +62,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",
@@ -112,7 +114,6 @@
     "cli"
   ],
   "license": "MIT",
-  "main": "build/index.js",
   "oclif": {
     "bin": "eas",
     "commands": "./build/commands",
@@ -176,6 +177,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 build node_modules"
   }
 }

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/analytics.ts

@@ -65,7 +65,6 @@ export async function initAsync(): Promise<void> {
         flushInterval: 300,
       }
     );
-    rudderstackClient.logger.silent = true;
   }
 }
 
@@ -87,7 +86,7 @@ export async function setUserDataAsync(userId: string, traits: Record<string, an
 
 export async function flushAsync(): Promise<void> {
   if (rudderstackClient) {
-    rudderstackClient.flush();
+    await rudderstackClient.flush();
   }
 }
 
@@ -114,13 +113,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;
 }
 

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());
+});
+
+// generic 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 = initGenericProject({ 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 = initGenericProject({ 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 = initGenericProject();
+
+    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 () => {
+    it('reads the versions from native code', async () => {
       const exp = initGenericProject();
       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 initGenericProject({
+  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,7 +5,6 @@ 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 {
@@ -65,9 +64,11 @@ This means that it will most likely produce an AAB and you will not be able to i
       return await ensureAndroidCredentialsAsync(ctx, gradleContext);
     },
     ensureProjectConfiguredAsync: async () => {
-      if (ctx.workflow === Workflow.GENERIC) {
-        await validateAndSyncProjectConfigurationAsync(ctx.projectDir, ctx.exp);
-      }
+      await validateAndSyncProjectConfigurationAsync({
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
+        buildProfile,
+      });
     },
     getMetadataContext: () => ({
       gradleContext,
@@ -110,22 +111,16 @@ async function ensureAndroidCredentialsAsync(
     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,
-      },
-    }
-  );
+  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 { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
 
 import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   warnIfAndroidPackageDefinedInAppConfigForGenericProject,
 } from '../../project/android/applicationId';
+import { resolveWorkflowAsync } from '../../project/workflow';
 import vcs 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) {
@@ -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: AndroidBuildProfile;
+}): 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/prepareJob.ts

@@ -1,6 +1,7 @@
 import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';
+import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getUsername } from '../../project/projectUtils';
@@ -25,7 +26,8 @@ export async function prepareJobAsync(
 ): Promise<Job> {
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
   const buildProfile: AndroidBuildProfile = ctx.buildProfile;
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const projectRootDirectory =
+    slash(path.relative(await vcs.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,

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/context.ts

@@ -5,6 +5,7 @@ import JsonFile from '@expo/json-file';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
+import { CredentialsContext } from '../credentials/context';
 import { RequestedPlatform } from '../platform';
 import { getExpoConfig } from '../project/expoConfig';
 import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
@@ -31,6 +32,7 @@ export interface BuildContext<T extends Platform> {
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
   clearCache: boolean;
+  credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
   local: boolean;
   nonInteractive: boolean;
@@ -69,9 +71,16 @@ export async function createBuildContextAsync<T extends Platform>({
   const accountName = getProjectAccountName(exp, user);
   const projectName = exp.slug;
   const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
-
   const workflow = await resolveWorkflowAsync(projectDir, platform);
   const accountId = findAccountByName(user.accounts, accountName)?.id;
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+  });
+
   const devClientProperties = getDevClientEventProperties({
     platform,
     projectDir,
@@ -87,11 +96,13 @@ export async function createBuildContextAsync<T extends Platform>({
     ...devClientProperties,
   };
   Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
+
   return {
     accountName,
     buildProfile,
     buildProfileName,
     clearCache,
+    credentialsCtx,
     exp,
     local,
     nonInteractive,

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

@@ -19,7 +19,11 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
       projectDir,
       xcodeProject
     );
-    await fs.writeFile(IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
+    await fs.writeFile(
+      IOSConfig.Paths.getPBXProjectPath(projectDir),
+      // eslint-disable-next-line node/no-sync
+      xcodeProject.writeSync()
+    );
   }
 
   let expoPlist = await readExpoPlistAsync(projectDir);

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

@@ -17,17 +17,17 @@ import {
 
 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, () => {
@@ -101,7 +101,7 @@ describe(bumpVersionAsync, () => {
     const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
       buildSettings: {},
@@ -164,7 +164,7 @@ describe(bumpVersionInAppJsonAsync, () => {
     const fakeExp = initManagedProject();
 
     await bumpVersionInAppJsonAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
     });
@@ -215,12 +215,12 @@ describe(readShortVersionAsync, () => {
   describe('generic 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 appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
       const exp = initGenericProject({
-        shortVersion: '$(CURRENT_PROJECT_VERSION)',
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
       const buildNumber = await readShortVersionAsync('/repo', exp, {
         CURRENT_PROJECT_VERSION: '1.0.0',
@@ -232,8 +232,8 @@ 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 appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
   });
 });
@@ -287,26 +287,29 @@ describe(getInfoPlistPath, () => {
 });
 
 function initGenericProject({
-  shortVersion = '1.0.0',
+  appVersion = '1.0.0',
   version = '1',
   infoPlistName = 'Info.plist',
-}: { shortVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: { 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/${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>
@@ -315,6 +318,10 @@ function initGenericProject({
     '/repo'
   );
 
+  return fakeExp;
+}
+
+function initManagedProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -323,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/configure.ts

@@ -1,6 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
+import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
@@ -53,7 +53,7 @@ export async function validateAndSyncProjectConfigurationAsync({
   }
 }
 
-function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpStrategy {
+function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
   if (autoIncrement === true) {
     return BumpStrategy.BUILD_NUMBER;
   } else if (autoIncrement === false) {
@@ -61,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,13 +16,8 @@ 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),

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

@@ -1,6 +1,6 @@
 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';
@@ -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 vcs.getRootPathAsync(), ctx.projectDir)) || '.';
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
   const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
@@ -41,7 +42,7 @@ export async function prepareJobAsync(
     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,
@@ -73,17 +74,6 @@ export async function prepareJobAsync(
   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,19 +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 path from 'path';
-import semver from 'semver';
 import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync } from '../utils/version';
 import { readPlistAsync, writePlistAsync } from './plist';
 
 export enum BumpStrategy {
-  SHORT_VERSION,
+  APP_VERSION,
   BUILD_NUMBER,
   NOOP,
 }
@@ -55,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+)*$/)) {

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/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/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/commands/branch/create.ts

@@ -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);

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

@@ -98,10 +98,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

@@ -67,10 +67,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

@@ -25,7 +25,7 @@ import {
   PublishPlatform,
   buildBundlesAsync,
   buildUnsortedUpdateInfoGroupAsync,
-  collectAssets,
+  collectAssetsAsync,
   uploadAssetsAsync,
 } from '../../project/publish';
 import { promptAsync, selectAsync } from '../../prompts';
@@ -162,11 +162,7 @@ export default class BranchPublish extends EasCommand {
     // 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 projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, {
       skipSDKVersionRequirement: true,
       isPublicConfig: true,
@@ -290,7 +286,7 @@ export default class BranchPublish extends EasCommand {
       const assetSpinner = ora('Uploading assets...').start();
       try {
         const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
-        const assets = collectAssets({ inputDir: inputDir!, platforms });
+        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
         await uploadAssetsAsync(assets);
         unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
         assetSpinner.succeed('Uploaded assets!');

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

@@ -90,11 +90,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

@@ -31,7 +31,7 @@ export default class BuildConfigure extends EasCommand {
 
     await configureAsync({
       platform,
-      projectDir: (await findProjectRootAsync()) ?? process.cwd(),
+      projectDir: await findProjectRootAsync(),
     });
 
     Log.newLine();

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

@@ -8,6 +8,7 @@ import {
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 
 import { prepareAndroidBuildAsync } from '../../build/android/build';
 import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
@@ -18,7 +19,13 @@ import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { BuildFragment, BuildStatus, SubmissionFragment } from '../../graphql/generated';
+import { CredentialsContext } from '../../credentials/context';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus,
+  SubmissionFragment,
+} from '../../graphql/generated';
 import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
 import Log from '../../log';
 import {
@@ -35,7 +42,7 @@ import {
 import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { confirmAsync } from '../../prompts';
-import { createSubmissionContext } from '../../submit/context';
+import { createSubmissionContextAsync } from '../../submit/context';
 import {
   submitAsync,
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
@@ -136,7 +143,7 @@ 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();
@@ -153,8 +160,9 @@ export default class Build extends EasCommand {
     });
 
     const startedBuilds: BuildFragment[] = [];
+    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
     for (const platform of platforms) {
-      const maybeBuild = await this.prepareAndStartBuildAsync({
+      const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
         projectDir,
         platform,
         flags,
@@ -163,6 +171,7 @@ export default class Build extends EasCommand {
       if (maybeBuild) {
         startedBuilds.push(maybeBuild);
       }
+      buildCtxByPlatform[toAppPlatform(platform)] = buildCtx;
     }
     if (flags.local) {
       return;
@@ -176,10 +185,11 @@ export default class Build extends EasCommand {
     if (flags.autoSubmit) {
       for (const build of startedBuilds) {
         const submission = await this.prepareAndStartSubmissionAsync({
-          projectDir,
           build,
+          credentialsCtx: nullthrows(buildCtxByPlatform[build.platform]?.credentialsCtx),
           flags,
           moreBuilds: startedBuilds.length > 1,
+          projectDir,
         });
         submissions.push(submission);
       }
@@ -253,17 +263,17 @@ export default class Build extends EasCommand {
     };
   }
 
-  private async prepareAndStartBuildAsync({
+  private async prepareAndStartBuildAsync<T extends Platform>({
     projectDir,
     platform,
     flags,
     moreBuilds,
   }: {
     projectDir: string;
-    platform: Platform;
+    platform: T;
     flags: BuildFlags;
     moreBuilds: boolean;
-  }): Promise<BuildFragment | undefined> {
+  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<T> }> {
     const easJsonReader = new EasJsonReader(projectDir);
     const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
 
@@ -297,7 +307,11 @@ export default class Build extends EasCommand {
       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,21 +325,23 @@ export default class Build extends EasCommand {
   }
 
   private async prepareAndStartSubmissionAsync({
-    projectDir,
     build,
+    credentialsCtx,
     flags,
     moreBuilds,
+    projectDir,
   }: {
-    projectDir: string;
     build: BuildFragment;
+    credentialsCtx: CredentialsContext;
     flags: BuildFlags;
     moreBuilds: boolean;
+    projectDir: string;
   }): 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,
@@ -333,6 +349,7 @@ export default class Build extends EasCommand {
       archiveFlags: { id: build.id },
       nonInteractive: flags.nonInteractive,
       env: buildProfile.env,
+      credentialsCtx,
     });
 
     if (moreBuilds) {

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

@@ -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

@@ -121,10 +121,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

@@ -80,10 +80,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

@@ -215,10 +215,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);
 

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);

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

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

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/project/info.ts

@@ -34,10 +34,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

@@ -50,7 +50,7 @@ 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);
 

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

@@ -32,7 +32,7 @@ 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);

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

@@ -20,7 +20,7 @@ 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);

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

@@ -7,7 +7,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,
@@ -17,7 +17,7 @@ import {
 } 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';
 
@@ -44,9 +44,7 @@ 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: '',
-  })}`;
+See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
   static aliases = ['build:submit'];
 
   static flags = {
@@ -93,7 +91,7 @@ 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);
 
@@ -108,7 +106,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
     const submissions: SubmissionFragment[] = [];
     for (const platform of platforms) {
       const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
-      const ctx = createSubmissionContext({
+      const ctx = await createSubmissionContextAsync({
         platform,
         projectDir,
         projectId,

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

@@ -30,10 +30,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

@@ -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/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],
 };
 
@@ -131,6 +143,8 @@ export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlCli
     createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createKeystoreAsync: jest.fn(),
     createGoogleServiceAccountKeyAsync: jest.fn(),
+    deleteGoogleServiceAccountKeyAsync: jest.fn(),
+    getGoogleServiceAccountKeysForAccountAsync: jest.fn(),
     createFcmAsync: jest.fn(),
     deleteKeystoreAsync: jest.fn(),
     deleteFcmAsync: jest.fn(),

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

@@ -1,12 +1,12 @@
 import merge from 'ts-deepmerge';
 
-import { Context } from '../context';
+import { CredentialsContext } from '../context';
 import { getNewAndroidApiMock } from './fixtures-android';
 import { getAppstoreMock } from './fixtures-appstore';
 import { testAppJson, testUsername } from './fixtures-constants';
 import { getNewIosApiMock } from './fixtures-ios';
 
-export function createCtxMock(mockOverride: Record<string, any> = {}): Context {
+export function createCtxMock(mockOverride: Record<string, any> = {}): CredentialsContext {
   const defaultMock = {
     ios: getNewIosApiMock(),
     android: getNewAndroidApiMock(),

packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts

@@ -3,7 +3,7 @@ import { CredentialsSource } from '@expo/eas-json';
 import nullthrows from 'nullthrows';
 
 import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
-import { Context } from '../context';
+import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { SetupBuildCredentials } from './actions/SetupBuildCredentials';
 import { AppLookupParams } from './api/GraphqlClient';
@@ -20,7 +20,7 @@ interface Options {
 export default class AndroidCredentialsProvider {
   public readonly platform = Platform.ANDROID;
 
-  constructor(private ctx: Context, private options: Options) {}
+  constructor(private ctx: CredentialsContext, private options: Options) {}
 
   public async getCredentialsAsync(
     src: CredentialsSource.LOCAL | CredentialsSource.REMOTE

packages/eas-cli/src/credentials/android/actions/AssignFcm.ts

@@ -3,14 +3,14 @@ import {
   CommonAndroidAppCredentialsFragment,
 } from '../../../graphql/generated';
 import Log from '../../../log';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 
 export class AssignFcm {
   constructor(private app: AppLookupParams) {}
 
   public async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     fcm: AndroidFcmFragment
   ): Promise<CommonAndroidAppCredentialsFragment> {
     const appCredentials =

packages/eas-cli/src/credentials/android/actions/AssignGoogleServiceAccountKey.ts

@@ -0,0 +1,29 @@
+import {
+  CommonAndroidAppCredentialsFragment,
+  GoogleServiceAccountKeyFragment,
+} from '../../../graphql/generated';
+import Log from '../../../log';
+import { CredentialsContext } from '../../context';
+import { AppLookupParams } from '../api/GraphqlClient';
+
+export class AssignGoogleServiceAccountKey {
+  constructor(private app: AppLookupParams) {}
+
+  public async runAsync(
+    ctx: CredentialsContext,
+    googleServiceAccountKey: GoogleServiceAccountKeyFragment
+  ): Promise<CommonAndroidAppCredentialsFragment> {
+    const appCredentials =
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(this.app);
+    const updatedAppCredentials = await ctx.android.updateAndroidAppCredentialsAsync(
+      appCredentials,
+      {
+        googleServiceAccountKeyForSubmissionsId: googleServiceAccountKey.id,
+      }
+    );
+    Log.succeed(
+      `Google Service Account Key assigned to ${this.app.androidApplicationIdentifier} for submissions`
+    );
+    return updatedAppCredentials;
+  }
+}

packages/eas-cli/src/credentials/android/actions/BuildCredentialsUtils.ts

@@ -8,7 +8,7 @@ import { GradleBuildContext } from '../../../project/android/gradle';
 import { getProjectAccountName, getProjectConfigDescription } from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
 import { findAccountByName } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 
 /**
@@ -16,7 +16,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
  * EAS credentials set up yet
  */
 export async function canCopyLegacyCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   app: AppLookupParams
 ): Promise<boolean> {
   const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(app);
@@ -30,7 +30,7 @@ export async function canCopyLegacyCredentialsAsync(
 }
 
 export async function promptUserAndCopyLegacyCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   app: AppLookupParams
 ): Promise<void> {
   assert(
@@ -85,7 +85,7 @@ export async function promptUserAndCopyLegacyCredentialsAsync(
 }
 
 export async function getAppLookupParamsFromContextAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   gradleContext?: GradleBuildContext
 ): Promise<AppLookupParams> {
   ctx.ensureProjectContext();
@@ -113,7 +113,7 @@ export async function getAppLookupParamsFromContextAsync(
 }
 
 export async function createOrUpdateDefaultAndroidAppBuildCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   appLookupParams: AppLookupParams,
   {
     androidKeystoreId,

packages/eas-cli/src/credentials/android/actions/CreateFcm.ts

@@ -2,12 +2,12 @@ import { AndroidFcmFragment, AndroidFcmVersion } from '../../../graphql/generate
 import Log from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 
 export class CreateFcm {
   constructor(private account: Account) {}
 
-  public async runAsync(ctx: Context): Promise<AndroidFcmFragment> {
+  public async runAsync(ctx: CredentialsContext): Promise<AndroidFcmFragment> {
     if (ctx.nonInteractive) {
       throw new Error(`FCM API Key cannot be uploaded in non-interactive mode.`);
     }

packages/eas-cli/src/credentials/android/actions/CreateGoogleServiceAccountKey.ts

@@ -2,18 +2,21 @@ import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { GoogleServiceAccountKey } from '../credentials';
-import { readAndValidateServiceAccountKey } from '../utils/googleServiceAccountKey';
+import {
+  detectGoogleServiceAccountKeyPathAsync,
+  readAndValidateServiceAccountKey,
+} from '../utils/googleServiceAccountKey';
 
 export class CreateGoogleServiceAccountKey {
   constructor(private account: Account) {}
 
-  public async runAsync(ctx: Context): Promise<GoogleServiceAccountKeyFragment> {
+  public async runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment> {
     if (ctx.nonInteractive) {
       throw new Error(`New Google Service Account Key cannot be created in non-interactive mode.`);
     }
-    const jsonKeyObject = await this.provideAsync();
+    const jsonKeyObject = await this.provideAsync(ctx);
     const gsaKeyFragment = await ctx.android.createGoogleServiceAccountKeyAsync(
       this.account,
       jsonKeyObject
@@ -22,20 +25,30 @@ export class CreateGoogleServiceAccountKey {
     return gsaKeyFragment;
   }
 
-  private async provideAsync(): Promise<GoogleServiceAccountKey> {
+  private async provideAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKey> {
     try {
-      const { keyJsonPath } = await promptAsync([
-        {
-          type: 'text',
-          name: 'keyJsonPath',
-          message: 'Path to Google Service Account Key JSON file:',
-          validate: (value: string) => value.length > 0 || "Path can't be empty",
-        },
-      ]);
+      const keyJsonPath = await this.provideKeyJsonPathAsync(ctx);
       return readAndValidateServiceAccountKey(keyJsonPath);
     } catch (e) {
       Log.error(e);
-      return await this.provideAsync();
+      return await this.provideAsync(ctx);
     }
   }
+
+  private async provideKeyJsonPathAsync(ctx: CredentialsContext): Promise<string> {
+    const detectedPath = await detectGoogleServiceAccountKeyPathAsync(ctx.projectDir);
+    if (detectedPath) {
+      return detectedPath;
+    }
+
+    const { keyJsonPath } = await promptAsync([
+      {
+        type: 'text',
+        name: 'keyJsonPath',
+        message: 'Path to Google Service Account Key JSON file:',
+        validate: (value: string) => value.length > 0 || "Path can't be empty",
+      },
+    ]);
+    return keyJsonPath;
+  }
 }

packages/eas-cli/src/credentials/android/actions/CreateKeystore.ts

@@ -2,7 +2,7 @@ import { AndroidKeystoreFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { getProjectIdAsync } from '../../../project/projectUtils';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
 import { KeystoreWithType, keystoreSchema } from '../credentials';
 import { generateRandomKeystoreAsync } from '../utils/keystore';
@@ -11,7 +11,7 @@ import { getKeystoreWithType, validateKeystore } from '../utils/keystoreNew';
 export class CreateKeystore {
   constructor(private account: Account) {}
 
-  public async runAsync(ctx: Context): Promise<AndroidKeystoreFragment> {
+  public async runAsync(ctx: CredentialsContext): Promise<AndroidKeystoreFragment> {
     if (ctx.nonInteractive) {
       throw new Error(`New keystore cannot be created in non-interactive mode.`);
     }

packages/eas-cli/src/credentials/android/actions/DownloadKeystore.ts

@@ -5,7 +5,7 @@ import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
 import { maybeRenameExistingFileAsync } from '../../../utils/files';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams, formatProjectFullName } from '../api/GraphqlClient';
 import { displayAndroidKeystore } from '../utils/printCredentials';
 
@@ -19,7 +19,7 @@ export class DownloadKeystore {
   constructor(private options: DownloadKeystoreOptions) {}
 
   public async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     buildCredentials: AndroidAppBuildCredentialsFragment
   ): Promise<void> {
     const keystore = buildCredentials.androidKeystore;
@@ -65,7 +65,7 @@ export class BackupKeystore {
   constructor(private app: AppLookupParams) {}
 
   public async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     buildCredentials: AndroidAppBuildCredentialsFragment
   ): Promise<void> {
     if (!buildCredentials.androidKeystore) {

packages/eas-cli/src/credentials/android/actions/RemoveFcm.ts

@@ -1,12 +1,12 @@
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams, formatProjectFullName } from '../api/GraphqlClient';
 
 export class RemoveFcm {
   constructor(private app: AppLookupParams) {}
 
-  async runAsync(ctx: Context): Promise<void> {
+  async runAsync(ctx: CredentialsContext): Promise<void> {
     if (ctx.nonInteractive) {
       throw new Error(
         "Deleting an FCM Api Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials."

packages/eas-cli/src/credentials/android/actions/RemoveGoogleServiceAccountKey.ts

@@ -0,0 +1,53 @@
+import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
+import Log from '../../../log';
+import { confirmAsync } from '../../../prompts';
+import { Account } from '../../../user/Account';
+import { CredentialsContext } from '../../context';
+import { selectGoogleServiceAccountKeyAsync } from '../utils/googleServiceAccountKey';
+
+export class SelectAndRemoveGoogleServiceAccountKey {
+  constructor(private account: Account) {}
+
+  async runAsync(ctx: CredentialsContext): Promise<void> {
+    if (ctx.nonInteractive) {
+      throw new Error(
+        `Cannot select and remove Google Service Account Keys in non-interactive mode.`
+      );
+    }
+
+    const gsaKeyFragments = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(
+      this.account
+    );
+    if (gsaKeyFragments.length === 0) {
+      Log.warn("There aren't any Google Service Account Keys associated with your account.");
+      return;
+    }
+
+    const selected = await selectGoogleServiceAccountKeyAsync(gsaKeyFragments);
+    await new RemoveGoogleServiceAccountKey(selected).runAsync(ctx);
+    Log.succeed('Removed Google Service Account Key.');
+    Log.newLine();
+  }
+}
+
+export class RemoveGoogleServiceAccountKey {
+  constructor(private googleServiceAccountKey: GoogleServiceAccountKeyFragment) {}
+
+  public async runAsync(ctx: CredentialsContext): Promise<void> {
+    if (ctx.nonInteractive) {
+      throw new Error(`Cannot remove Google Service Account Keys in non-interactive mode`);
+    }
+
+    // TODO(quin): add an extra edge on GoogleServiceAccountKey to find the apps using it
+    const confirm = await confirmAsync({
+      message: `Deleting this Google Service Account Key may affect your projects that rely on it. Do you want to continue?`,
+    });
+    if (!confirm) {
+      Log.log('Aborting');
+      return;
+    }
+
+    Log.log('Removing Google Service Account Key.');
+    await ctx.android.deleteGoogleServiceAccountKeyAsync(this.googleServiceAccountKey);
+  }
+}

packages/eas-cli/src/credentials/android/actions/RemoveKeystore.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { BackupKeystore } from './DownloadKeystore';
 
@@ -11,7 +11,7 @@ export class RemoveKeystore {
   constructor(private app: AppLookupParams) {}
 
   async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     buildCredentials: AndroidAppBuildCredentialsFragment
   ): Promise<void> {
     if (ctx.nonInteractive) {

packages/eas-cli/src/credentials/android/actions/SetupBuildCredentials.ts

@@ -6,7 +6,7 @@ import {
 } from '../../../graphql/generated';
 import Log from '../../../log';
 import { ora } from '../../../ora';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
 import {
@@ -28,7 +28,7 @@ interface Options {
 export class SetupBuildCredentials {
   constructor(private options: Options) {}
 
-  async runAsync(ctx: Context): Promise<AndroidAppBuildCredentialsFragment> {
+  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment> {
     const { app, name: maybeName } = this.options;
 
     if (!ctx.nonInteractive) {
@@ -62,7 +62,7 @@ export class SetupBuildCredentials {
     name,
     keystore,
   }: {
-    ctx: Context;
+    ctx: CredentialsContext;
     app: AppLookupParams;
     name?: string;
     keystore: AndroidKeystoreFragment;
@@ -82,7 +82,7 @@ export class SetupBuildCredentials {
     app,
     name,
   }: {
-    ctx: Context;
+    ctx: CredentialsContext;
     app: AppLookupParams;
     name?: string;
   }): Promise<AndroidAppBuildCredentialsFragment | null> {
@@ -108,7 +108,7 @@ export class SetupBuildCredentials {
     app,
     name,
   }: {
-    ctx: Context;
+    ctx: CredentialsContext;
     app: AppLookupParams;
     name: string;
   }): Promise<AndroidAppBuildCredentialsFragment | null> {

packages/eas-cli/src/credentials/android/actions/SetupBuildCredentialsFromCredentialsJson.ts

@@ -4,7 +4,7 @@ import {
 } from '../../../graphql/generated';
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { readAndroidCredentialsAsync } from '../../credentialsJson/read';
 import {
   SelectAndroidBuildCredentials,
@@ -17,7 +17,7 @@ import { BackupKeystore } from './DownloadKeystore';
 export class SetupBuildCredentialsFromCredentialsJson {
   constructor(private app: AppLookupParams) {}
 
-  async runAsync(ctx: Context): Promise<AndroidAppBuildCredentialsFragment | null> {
+  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | null> {
     if (ctx.nonInteractive) {
       throw new Error(
         'Setting up build credentials from credentials.json is only available in interactive mode'

packages/eas-cli/src/credentials/android/actions/SetupGoogleServiceAccountKey.ts

@@ -0,0 +1,79 @@
+import nullthrows from 'nullthrows';
+
+import {
+  CommonAndroidAppCredentialsFragment,
+  GoogleServiceAccountKeyFragment,
+} from '../../../graphql/generated';
+import Log from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { CredentialsContext } from '../../context';
+import { MissingCredentialsNonInteractiveError } from '../../errors';
+import { AppLookupParams } from '../api/GraphqlClient';
+import { AssignGoogleServiceAccountKey } from './AssignGoogleServiceAccountKey';
+import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
+import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';
+
+export class SetupGoogleServiceAccountKey {
+  constructor(private app: AppLookupParams) {}
+
+  public async runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment> {
+    const isKeySetup = await this.isGoogleServiceAccountKeySetupAsync(ctx);
+    if (isKeySetup) {
+      Log.succeed('Google Service Account Key already set up.');
+      return nullthrows(
+        await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(this.app),
+        'androidAppCredentials cannot be null if google service account key is already set up'
+      );
+    }
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Google Service Account Keys cannot be set up in --non-interactive mode.'
+      );
+    }
+
+    const keysForAccount = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(
+      this.app.account
+    );
+    let googleServiceAccountKey = null;
+    if (keysForAccount.length === 0) {
+      googleServiceAccountKey = await new CreateGoogleServiceAccountKey(this.app.account).runAsync(
+        ctx
+      );
+    } else {
+      googleServiceAccountKey = await this.createOrUseExistingKeyAsync(ctx);
+    }
+    return await new AssignGoogleServiceAccountKey(this.app).runAsync(ctx, googleServiceAccountKey);
+  }
+
+  private async isGoogleServiceAccountKeySetupAsync(ctx: CredentialsContext): Promise<boolean> {
+    const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(
+      this.app
+    );
+    return !!appCredentials?.googleServiceAccountKeyForSubmissions;
+  }
+
+  private async createOrUseExistingKeyAsync(
+    ctx: CredentialsContext
+  ): Promise<GoogleServiceAccountKeyFragment> {
+    const { action } = await promptAsync({
+      type: 'select',
+      name: 'action',
+      message: 'Select the Google Service Account Key to use for your project:',
+      choices: [
+        {
+          title: '[Choose an existing key]',
+          value: 'CHOOSE_EXISTING',
+        },
+        { title: '[Upload a new service account key]', value: 'GENERATE' },
+      ],
+    });
+
+    if (action === 'GENERATE') {
+      return await new CreateGoogleServiceAccountKey(this.app.account).runAsync(ctx);
+    }
+    return (
+      (await new UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx)) ??
+      (await this.createOrUseExistingKeyAsync(ctx))
+    );
+  }
+}

packages/eas-cli/src/credentials/android/actions/UpdateCredentialsJson.ts

@@ -1,11 +1,11 @@
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { updateAndroidCredentialsAsync } from '../../credentialsJson/update';
 
 export class UpdateCredentialsJson {
   async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     buildCredentials: AndroidAppBuildCredentialsFragment
   ): Promise<void> {
     Log.log('Updating Android credentials in credentials.json');

packages/eas-cli/src/credentials/android/actions/UseExistingGoogleServiceAccountKey.ts

@@ -0,0 +1,25 @@
+import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
+import Log from '../../../log';
+import { Account } from '../../../user/Account';
+import { CredentialsContext } from '../../context';
+import { selectGoogleServiceAccountKeyAsync } from '../utils/googleServiceAccountKey';
+
+export class UseExistingGoogleServiceAccountKey {
+  constructor(private account: Account) {}
+
+  public async runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment | null> {
+    if (ctx.nonInteractive) {
+      throw new Error(
+        `Existing Google Service Account Key cannot be chosen in non-interactive mode.`
+      );
+    }
+    const gsaKeyFragments = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(
+      this.account
+    );
+    if (gsaKeyFragments.length === 0) {
+      Log.error("There aren't any Google Service Account Keys associated with your account.");
+      return null;
+    }
+    return await selectGoogleServiceAccountKeyAsync(gsaKeyFragments);
+  }
+}

packages/eas-cli/src/credentials/android/actions/__tests__/AssignGoogleServiceAccountKey-test.ts

@@ -0,0 +1,33 @@
+import { testGoogleServiceAccountKeyFragment } from '../../../__tests__/fixtures-android';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { AssignGoogleServiceAccountKey } from '../AssignGoogleServiceAccountKey';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+
+describe(AssignGoogleServiceAccountKey, () => {
+  it('assigns a Google Service Account key in Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: false,
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
+    await assignGoogleServiceAccountKeyAction.runAsync(ctx, testGoogleServiceAccountKeyFragment);
+
+    // expect app credentials to be fetched/created, then updated
+    expect(
+      ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync
+    ).toHaveBeenCalledTimes(1);
+    expect(ctx.android.updateAndroidAppCredentialsAsync).toHaveBeenCalledTimes(1);
+  });
+  it('works in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: true,
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
+
+    // dont fail if users are running in non-interactive mode
+    await expect(
+      assignGoogleServiceAccountKeyAction.runAsync(ctx, testGoogleServiceAccountKeyFragment)
+    ).resolves.not.toThrowError();
+  });
+});

packages/eas-cli/src/credentials/android/actions/__tests__/CreateGoogleServiceAccountKey-test.ts

@@ -19,7 +19,11 @@ beforeEach(() => {
 describe(CreateGoogleServiceAccountKey, () => {
   it('creates a Google Service Account Key in Interactive Mode', async () => {
     vol.fromJSON({
-      '/google-service-account-key.json': JSON.stringify({ private_key: 'super secret' }),
+      '/google-service-account-key.json': JSON.stringify({
+        type: 'service_account',
+        private_key: 'super secret',
+        client_email: '[email protected]',
+      }),
     });
 
     const ctx = createCtxMock({ nonInteractive: false });

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveGoogleServiceAccountKey-test.ts

@@ -0,0 +1,34 @@
+import { asMock } from '../../../../__tests__/utils';
+import { confirmAsync } from '../../../../prompts';
+import {
+  getNewAndroidApiMock,
+  testGoogleServiceAccountKeyFragment,
+} from '../../../__tests__/fixtures-android';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { RemoveGoogleServiceAccountKey } from '../RemoveGoogleServiceAccountKey';
+
+jest.mock('../../../../prompts');
+asMock(confirmAsync).mockImplementation(() => true);
+
+describe(RemoveGoogleServiceAccountKey, () => {
+  it('removes an Google Service Account Key', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      android: {
+        ...getNewAndroidApiMock(),
+      },
+    });
+    const removeGoogleServiceAccountKeyAction = new RemoveGoogleServiceAccountKey(
+      testGoogleServiceAccountKeyFragment
+    );
+    await removeGoogleServiceAccountKeyAction.runAsync(ctx);
+    expect(ctx.android.deleteGoogleServiceAccountKeyAsync).toHaveBeenCalledTimes(1);
+  });
+  it('errors in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({ nonInteractive: true });
+    const removeGoogleServiceAccountKeyAction = new RemoveGoogleServiceAccountKey(
+      testGoogleServiceAccountKeyFragment
+    );
+    await expect(removeGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError();
+  });
+});

packages/eas-cli/src/credentials/android/actions/__tests__/SetupGoogleServiceAccountKey-test.ts

@@ -0,0 +1,76 @@
+import { vol } from 'memfs';
+
+import { asMock } from '../../../../__tests__/utils';
+import { promptAsync } from '../../../../prompts';
+import {
+  getNewAndroidApiMock,
+  testAndroidAppCredentialsFragment,
+  testGoogleServiceAccountKeyFragment,
+} from '../../../__tests__/fixtures-android';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { MissingCredentialsNonInteractiveError } from '../../../errors';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+import { SetupGoogleServiceAccountKey } from '../SetupGoogleServiceAccountKey';
+
+jest.mock('../../../../prompts');
+jest.mock('fs');
+asMock(promptAsync).mockImplementation(() => ({
+  keyJsonPath: '/google-service-account-key.json',
+}));
+
+beforeEach(() => {
+  vol.reset();
+});
+
+describe(SetupGoogleServiceAccountKey, () => {
+  it('skips setup when there is a Google Service Account Key already assigned to the project', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      android: {
+        ...getNewAndroidApiMock(),
+        getAndroidAppCredentialsWithCommonFieldsAsync: jest.fn(
+          () => testAndroidAppCredentialsFragment
+        ),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    await setupGoogleServiceAccountKeyAction.runAsync(ctx);
+
+    expect(ctx.android.createGoogleServiceAccountKeyAsync).not.toHaveBeenCalled();
+    expect(ctx.android.updateAndroidAppCredentialsAsync).not.toHaveBeenCalled();
+  });
+  it('sets up a Google Service Account Key when there is none already setup', async () => {
+    vol.fromJSON({
+      '/google-service-account-key.json': JSON.stringify({
+        type: 'service_account',
+        private_key: 'super secret',
+        client_email: '[email protected]',
+      }),
+    });
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      android: {
+        ...getNewAndroidApiMock(),
+        createGoogleServiceAccountKeyAsync: jest.fn(() => testGoogleServiceAccountKeyFragment),
+        getGoogleServiceAccountKeysForAccountAsync: jest.fn(() => []),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    await setupGoogleServiceAccountKeyAction.runAsync(ctx);
+
+    expect(ctx.android.createGoogleServiceAccountKeyAsync).toHaveBeenCalledTimes(1);
+    expect(ctx.android.updateAndroidAppCredentialsAsync).toHaveBeenCalledTimes(1);
+  });
+  it('errors in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: true,
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    await expect(setupGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError(
+      MissingCredentialsNonInteractiveError
+    );
+  });
+});

packages/eas-cli/src/credentials/android/actions/__tests__/UseExistingGoogleServiceAccountKey-test.ts

@@ -0,0 +1,59 @@
+import { asMock } from '../../../../__tests__/utils';
+import { promptAsync } from '../../../../prompts';
+import {
+  getNewAndroidApiMock,
+  testGoogleServiceAccountKeyFragment,
+} from '../../../__tests__/fixtures-android';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+import { UseExistingGoogleServiceAccountKey } from '../UseExistingGoogleServiceAccountKey';
+
+jest.mock('../../../../prompts');
+asMock(promptAsync).mockImplementation(() => ({ chosenKey: testGoogleServiceAccountKeyFragment }));
+
+describe(UseExistingGoogleServiceAccountKey, () => {
+  it('uses an existing Google Service Account Key in Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      android: {
+        ...getNewAndroidApiMock(),
+        getGoogleServiceAccountKeysForAccountAsync: jest.fn(() => [
+          testGoogleServiceAccountKeyFragment,
+        ]),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
+      appLookupParams.account
+    );
+    const selectedKey = await useExistingGoogleServiceAccountKeyAction.runAsync(ctx);
+    expect(ctx.android.getGoogleServiceAccountKeysForAccountAsync).toHaveBeenCalledTimes(1);
+    expect(selectedKey).toMatchObject(testGoogleServiceAccountKeyFragment);
+  });
+  it("returns null if the account doesn't have any Google Service Account Keys", async () => {
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      android: {
+        ...getNewAndroidApiMock(),
+        getGoogleServiceAccountKeysForAccountAsync: jest.fn(() => []),
+      },
+    });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
+      appLookupParams.account
+    );
+    const selectedKey = await useExistingGoogleServiceAccountKeyAction.runAsync(ctx);
+    expect(ctx.android.getGoogleServiceAccountKeysForAccountAsync).toHaveBeenCalledTimes(1);
+    expect(selectedKey).toBe(null);
+  });
+  it('errors in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({ nonInteractive: true });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const useExistingGoogleServiceAccountKeyAction = new UseExistingGoogleServiceAccountKey(
+      appLookupParams.account
+    );
+
+    // fail if users are running in non-interactive mode
+    await expect(useExistingGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError();
+  });
+});

packages/eas-cli/src/credentials/android/api/GraphqlClient.ts

@@ -16,6 +16,7 @@ import { AndroidFcmMutation } from './graphql/mutations/AndroidFcmMutation';
 import { AndroidKeystoreMutation } from './graphql/mutations/AndroidKeystoreMutation';
 import { GoogleServiceAccountKeyMutation } from './graphql/mutations/GoogleServiceAccountKeyMutation';
 import { AndroidAppCredentialsQuery } from './graphql/queries/AndroidAppCredentialsQuery';
+import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
 
 export interface AppLookupParams {
   account: Account;
@@ -89,11 +90,27 @@ export async function updateAndroidAppCredentialsAsync(
   appCredentials: CommonAndroidAppCredentialsFragment,
   {
     androidFcmId,
+    googleServiceAccountKeyForSubmissionsId,
   }: {
-    androidFcmId: string;
+    androidFcmId?: string;
+    googleServiceAccountKeyForSubmissionsId?: string;
   }
 ): Promise<CommonAndroidAppCredentialsFragment> {
-  return await AndroidAppCredentialsMutation.setFcmKeyAsync(appCredentials.id, androidFcmId);
+  let updatedAppCredentials = appCredentials;
+  if (androidFcmId) {
+    updatedAppCredentials = await AndroidAppCredentialsMutation.setFcmKeyAsync(
+      appCredentials.id,
+      androidFcmId
+    );
+  }
+  if (googleServiceAccountKeyForSubmissionsId) {
+    updatedAppCredentials =
+      await AndroidAppCredentialsMutation.setGoogleServiceAccountKeyForSubmissionsAsync(
+        appCredentials.id,
+        googleServiceAccountKeyForSubmissionsId
+      );
+  }
+  return updatedAppCredentials;
 }
 
 export async function updateAndroidAppBuildCredentialsAsync(
@@ -235,6 +252,20 @@ export async function createGoogleServiceAccountKeyAsync(
   );
 }
 
+export async function deleteGoogleServiceAccountKeyAsync(
+  googleServiceAccountKey: GoogleServiceAccountKeyFragment
+): Promise<void> {
+  return await GoogleServiceAccountKeyMutation.deleteGoogleServiceAccountKeyAsync(
+    googleServiceAccountKey.id
+  );
+}
+
+export async function getGoogleServiceAccountKeysForAccountAsync(
+  account: Account
+): Promise<GoogleServiceAccountKeyFragment[]> {
+  return await GoogleServiceAccountKeyQuery.getAllForAccountAsync(account.name);
+}
+
 async function getAppAsync(appLookupParams: AppLookupParams): Promise<AppFragment> {
   const projectFullName = formatProjectFullName(appLookupParams);
   return await AppQuery.byFullNameAsync(projectFullName);

packages/eas-cli/src/credentials/android/api/graphql/mutations/AndroidAppCredentialsMutation.ts

@@ -7,6 +7,7 @@ import {
   CommonAndroidAppCredentialsFragment,
   CreateAndroidAppCredentialsMutation,
   SetFcmMutation,
+  SetGoogleServiceAccountKeyForSubmissionsMutation,
 } from '../../../../../graphql/generated';
 import { CommonAndroidAppCredentialsFragmentNode } from '../../../../../graphql/types/credentials/AndroidAppCredentials';
 
@@ -82,4 +83,41 @@ export const AndroidAppCredentialsMutation = {
     assert(data.androidAppCredentials.setFcm, 'GraphQL: `setFcm` not defined in server response');
     return data.androidAppCredentials.setFcm;
   },
+  async setGoogleServiceAccountKeyForSubmissionsAsync(
+    androidAppCredentialsId: string,
+    googleServiceAccountKeyId: string
+  ): Promise<CommonAndroidAppCredentialsFragment> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<SetGoogleServiceAccountKeyForSubmissionsMutation>(
+          gql`
+            mutation SetGoogleServiceAccountKeyForSubmissionsMutation(
+              $androidAppCredentialsId: ID!
+              $googleServiceAccountKeyId: ID!
+            ) {
+              androidAppCredentials {
+                setGoogleServiceAccountKeyForSubmissions(
+                  id: $androidAppCredentialsId
+                  googleServiceAccountKeyId: $googleServiceAccountKeyId
+                ) {
+                  id
+                  ...CommonAndroidAppCredentialsFragment
+                }
+              }
+            }
+            ${print(CommonAndroidAppCredentialsFragmentNode)}
+          `,
+          {
+            androidAppCredentialsId,
+            googleServiceAccountKeyId,
+          }
+        )
+        .toPromise()
+    );
+    assert(
+      data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions,
+      'GraphQL: `setGoogleServiceAccountKeyForSubmissions` not defined in server response'
+    );
+    return data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions;
+  },
 };

packages/eas-cli/src/credentials/android/api/graphql/mutations/GoogleServiceAccountKeyMutation.ts

@@ -5,6 +5,7 @@ import gql from 'graphql-tag';
 import { graphqlClient, withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
   CreateGoogleServiceAccountKeyMutation,
+  DeleteGoogleServiceAccountKeyMutation,
   GoogleServiceAccountKeyFragment,
   GoogleServiceAccountKeyInput,
 } from '../../../../../graphql/generated';
@@ -48,4 +49,27 @@ export const GoogleServiceAccountKeyMutation = {
     );
     return data.googleServiceAccountKey.createGoogleServiceAccountKey;
   },
+  async deleteGoogleServiceAccountKeyAsync(googleServiceAccountKeyId: string): Promise<void> {
+    await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<DeleteGoogleServiceAccountKeyMutation>(
+          gql`
+            mutation DeleteGoogleServiceAccountKeyMutation($googleServiceAccountKeyId: ID!) {
+              googleServiceAccountKey {
+                deleteGoogleServiceAccountKey(id: $googleServiceAccountKeyId) {
+                  id
+                }
+              }
+            }
+          `,
+          {
+            googleServiceAccountKeyId,
+          },
+          {
+            additionalTypenames: ['GoogleServiceAccountKey', 'AndroidAppCredentials'],
+          }
+        )
+        .toPromise()
+    );
+  },
 };

packages/eas-cli/src/credentials/android/api/graphql/queries/GoogleServiceAccountKeyQuery.ts

@@ -0,0 +1,38 @@
+import { print } from 'graphql';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../../../../graphql/client';
+import {
+  GoogleServiceAccountKeyByAccountQuery,
+  GoogleServiceAccountKeyFragment,
+} from '../../../../../graphql/generated';
+import { GoogleServiceAccountKeyFragmentNode } from '../../../../../graphql/types/credentials/GoogleServiceAccountKey';
+
+export const GoogleServiceAccountKeyQuery = {
+  async getAllForAccountAsync(accountName: string): Promise<GoogleServiceAccountKeyFragment[]> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<GoogleServiceAccountKeyByAccountQuery>(
+          gql`
+            query GoogleServiceAccountKeyByAccountQuery($accountName: String!) {
+              account {
+                byName(accountName: $accountName) {
+                  id
+                  googleServiceAccountKeys {
+                    id
+                    ...GoogleServiceAccountKeyFragment
+                  }
+                }
+              }
+            }
+            ${print(GoogleServiceAccountKeyFragmentNode)}
+          `,
+          {
+            accountName,
+          }
+        )
+        .toPromise()
+    );
+    return data.account.byName.googleServiceAccountKeys;
+  },
+};

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

@@ -19,6 +19,8 @@ export type KeystoreWithType = Keystore & {
 export type GoogleServiceAccountKey = {
   [key: string]: any;
   private_key: string;
+  type: string;
+  client_email: string;
 };
 
 export type AndroidCredentials = {

packages/eas-cli/src/credentials/android/utils/__tests__/__snapshots__/printCredentials-test.ts.snap

@@ -1,3 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`print credentials prints the AndroidAppCredentials fragment 1`] = `"Android Credentials  Project: testApp  Application Identifier: test.com.app  Push Notifications (FCM):    Key: abcd...efgh    Updated 0 second ago  Configuration: legacy (Default)  Keystore:    Type: JKS    Key Alias: QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA==    MD5 Fingerprint: TE:ST:-M:D5    SHA1 Fingerprint: TE:ST:-S:HA:1    SHA256 Fingerprint: TE:ST:-S:HA:25:6    Updated 0 second ago"`;
+exports[`print credentials prints the AndroidAppCredentials fragment 1`] = `
+"Android Credentials     
+Project                 testApp
+Application Identifier  test.com.appPush Notifications (FCM)  Key      abcd...efgh
+Updated  0 second agoGoogle Service Account Key For Submissions  Project ID      sdf.sdf.sdf
+Client Email    [email protected]
+Client ID       test-client-identifier
+Private Key ID  test-private-key-identifier
+Updated         0 second agoConfiguration: legacy (Default)  Keystore  Type                JKS
+Key Alias           QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA==
+MD5 Fingerprint     TE:ST:-M:D5
+SHA1 Fingerprint    TE:ST:-S:HA:1
+SHA256 Fingerprint  TE:ST:-S:HA:25:6
+Updated             0 second ago"
+`;

packages/eas-cli/src/credentials/android/utils/__tests__/googleServiceAccountKey-test.ts

@@ -0,0 +1,89 @@
+import { vol } from 'memfs';
+
+import { asMock } from '../../../../__tests__/utils';
+import { confirmAsync, promptAsync } from '../../../../prompts';
+import { detectGoogleServiceAccountKeyPathAsync } from '../googleServiceAccountKey';
+
+jest.mock('fs');
+jest.mock('../../../../prompts');
+
+beforeAll(() => {
+  const mockDetectableServiceAccountJson = JSON.stringify({
+    type: 'service_account',
+    private_key: 'super secret',
+    client_email: '[email protected]',
+  });
+
+  vol.fromJSON({
+    '/project_dir/subdir/service-account.json': mockDetectableServiceAccountJson,
+    '/project_dir/another-service-account.json': mockDetectableServiceAccountJson,
+    '/other_dir/invalid_file.txt': 'this is not even a JSON',
+  });
+});
+afterAll(() => {
+  vol.reset();
+});
+
+afterEach(() => {
+  asMock(promptAsync).mockClear();
+  asMock(confirmAsync).mockClear();
+});
+
+describe('Google Service Account Key path detection', () => {
+  it('detects a single google-services file and prompts for confirmation', async () => {
+    asMock(confirmAsync).mockResolvedValueOnce(true);
+    const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir/subdir');
+    expect(confirmAsync).toHaveBeenCalledWith(
+      expect.objectContaining({ message: 'Would you like to use this file?' })
+    );
+    expect(serviceAccountPath).toBe('/project_dir/subdir/service-account.json');
+  });
+
+  it('returns null, when no valid files are found in the dir', async () => {
+    const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/other_dir'); // no valid files in that dir
+    expect(promptAsync).not.toHaveBeenCalled();
+    expect(serviceAccountPath).toBe(null);
+  });
+
+  it('returns null, when user rejects to use detected file', async () => {
+    asMock(confirmAsync).mockResolvedValueOnce(false);
+    const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir/subdir');
+    expect(confirmAsync).toHaveBeenCalledTimes(1);
+    expect(confirmAsync).toHaveBeenCalledWith(
+      expect.objectContaining({ message: 'Would you like to use this file?' })
+    );
+    expect(serviceAccountPath).toBe(null);
+  });
+
+  it('displays a chooser, when multiple files are found', async () => {
+    asMock(promptAsync).mockResolvedValueOnce({
+      selectedPath: '/project_dir/another-service-account.json',
+    });
+    const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir'); // should find 2 files here
+
+    const expectedChoices = expect.arrayContaining([
+      expect.objectContaining({ value: '/project_dir/another-service-account.json' }),
+      expect.objectContaining({ value: '/project_dir/subdir/service-account.json' }),
+      expect.objectContaining({ value: null }),
+    ]);
+    expect(promptAsync).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'select',
+        choices: expectedChoices,
+      })
+    );
+    expect(serviceAccountPath).toBe('/project_dir/another-service-account.json');
+  });
+
+  it('returns null, when user selects the "None of above"', async () => {
+    asMock(promptAsync).mockResolvedValueOnce({
+      selectedPath: false,
+    });
+
+    const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir'); // should find 2 files here
+
+    expect(promptAsync).toHaveBeenCalledTimes(1);
+    expect(promptAsync).toHaveBeenCalledWith(expect.objectContaining({ type: 'select' }));
+    expect(serviceAccountPath).toBe(null);
+  });
+});

packages/eas-cli/src/credentials/android/utils/__tests__/printCredentials-test.ts

@@ -4,6 +4,7 @@ import { asMock } from '../../../../__tests__/utils';
 import Log from '../../../../log';
 import {
   testAndroidAppCredentialsFragment,
+  testGoogleServiceAccountKeyFragment,
   testLegacyAndroidFcmFragment,
 } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -11,9 +12,10 @@ import { getAppLookupParamsFromContextAsync } from '../../actions/BuildCredentia
 import { displayAndroidAppCredentials } from '../printCredentials';
 
 jest.mock('../../../../log');
-jest.mock('chalk', () => ({ bold: jest.fn(log => log) }));
+jest.mock('chalk', () => ({ bold: jest.fn(log => log), cyan: { bold: jest.fn(log => log) } }));
 
 mockdate.set(testLegacyAndroidFcmFragment.updatedAt);
+mockdate.set(testGoogleServiceAccountKeyFragment.updatedAt);
 
 describe('print credentials', () => {
   it('prints the AndroidAppCredentials fragment', async () => {

packages/eas-cli/src/credentials/android/utils/googleServiceAccountKey.ts

@@ -1,13 +1,30 @@
 import JsonFile from '@expo/json-file';
+import chalk from 'chalk';
+import glob from 'fast-glob';
 import Joi from 'joi';
+import path from 'path';
 
+import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import Log, { learnMore } from '../../../log';
+import { confirmAsync, promptAsync } from '../../../prompts';
+import { fromNow } from '../../../utils/date';
 import { GoogleServiceAccountKey } from '../credentials';
 
 export const MinimalGoogleServiceAccountKeySchema = Joi.object({
+  type: Joi.string().required(),
   private_key: Joi.string().required(),
+  client_email: Joi.string().required(),
 });
 
+function fileIsServiceAccountKey(keyJsonPath: string): boolean {
+  try {
+    readAndValidateServiceAccountKey(keyJsonPath);
+    return true;
+  } catch (err: any) {
+    return false;
+  }
+}
+
 export function readAndValidateServiceAccountKey(keyJsonPath: string): GoogleServiceAccountKey {
   try {
     const jsonKeyObject = JsonFile.read(keyJsonPath);
@@ -34,3 +51,108 @@ export function readAndValidateServiceAccountKey(keyJsonPath: string): GoogleSer
     throw err;
   }
 }
+
+export async function selectGoogleServiceAccountKeyAsync(
+  keys: GoogleServiceAccountKeyFragment[]
+): Promise<GoogleServiceAccountKeyFragment> {
+  const sortedKeys = sortGoogleServiceAccountKeysByUpdatedAtDesc(keys);
+  const { chosenKey } = await promptAsync({
+    type: 'select',
+    name: 'chosenKey',
+    message: 'Select a Google Service Account Key:',
+    choices: sortedKeys.map(key => ({
+      title: formatGoogleServiceAccountKey(key),
+      value: key,
+    })),
+  });
+  return chosenKey;
+}
+
+function sortGoogleServiceAccountKeysByUpdatedAtDesc(
+  keys: GoogleServiceAccountKeyFragment[]
+): GoogleServiceAccountKeyFragment[] {
+  return keys.sort(
+    (keyA, keyB) => new Date(keyB.updatedAt).getTime() - new Date(keyA.updatedAt).getTime()
+  );
+}
+
+function formatGoogleServiceAccountKey({
+  projectIdentifier,
+  privateKeyIdentifier,
+  clientEmail,
+  clientIdentifier,
+  updatedAt,
+}: GoogleServiceAccountKeyFragment): string {
+  let line = `Client Email: ${clientEmail}, Project Id: ${projectIdentifier}`;
+  line += chalk.gray(
+    `\n    Client Id: ${clientIdentifier}, Private Key Id: ${privateKeyIdentifier}`
+  );
+  line += chalk.gray(`\n    Updated: ${fromNow(new Date(updatedAt))} ago,`);
+  return line;
+}
+
+export async function detectGoogleServiceAccountKeyPathAsync(
+  projectDir: string
+): Promise<string | null> {
+  const foundFilePaths = await glob('**/*.json', {
+    cwd: projectDir,
+    ignore: ['app.json', 'package*.json', 'tsconfig.json', 'node_modules'],
+  });
+
+  const googleServiceFiles = foundFilePaths
+    .map(file => path.join(projectDir, file))
+    .filter(fileIsServiceAccountKey);
+
+  if (googleServiceFiles.length > 1) {
+    const selectedPath = await displayPathChooserAsync(googleServiceFiles, projectDir);
+
+    if (selectedPath) {
+      return selectedPath;
+    }
+  } else if (googleServiceFiles.length === 1) {
+    const [detectedPath] = googleServiceFiles;
+
+    if (await confirmDetectedPathAsync(detectedPath)) {
+      return detectedPath;
+    }
+  }
+
+  return null;
+}
+
+async function displayPathChooserAsync(
+  paths: string[],
+  projectDir: string
+): Promise<string | null> {
+  const choices = paths.map<{ title: string; value: string | null }>(f => ({
+    value: f,
+    title: f.startsWith(projectDir) ? path.relative(projectDir, f) : f,
+  }));
+
+  choices.push({
+    title: 'None of the above',
+    value: null,
+  });
+
+  Log.log(
+    'Multiple Google Service Account JSON keys have been found inside your project directory.'
+  );
+  const { selectedPath } = await promptAsync({
+    name: 'selectedPath',
+    type: 'select',
+    message: 'Choose the key you want to use:',
+    choices,
+  });
+
+  Log.addNewLineIfNone();
+  return selectedPath;
+}
+
+async function confirmDetectedPathAsync(path: string): Promise<boolean> {
+  Log.log(`A Google Service Account JSON key has been found at\n  ${chalk.underline(path)}`);
+  const confirm = await confirmAsync({
+    message: 'Would you like to use this file?',
+  });
+  Log.addNewLineIfNone();
+  return confirm;
+}

packages/eas-cli/src/credentials/android/utils/printCredentials.ts

@@ -10,37 +10,76 @@ import {
 } from '../../../graphql/generated';
 import Log from '../../../log';
 import { fromNow } from '../../../utils/date';
+import formatFields from '../../../utils/formatFields';
 import { sortBuildCredentials } from '../actions/BuildCredentialsUtils';
 import { AppLookupParams } from '../api/GraphqlClient';
 
 export function displayEmptyAndroidCredentials(appLookupParams: AppLookupParams): void {
   const { projectName, androidApplicationIdentifier } = appLookupParams;
-  Log.log(chalk.bold(`Android Credentials`));
-  Log.log(`  Project: ${projectName}`);
-  Log.log(`  Application Identifier: ${androidApplicationIdentifier}`);
-  Log.log(`  No credentials set up yet!`);
+  const fields = [
+    { label: 'Android Credentials', value: '' },
+    { label: 'Project', value: projectName },
+    { label: 'Application Identifier', value: androidApplicationIdentifier },
+  ];
+  Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
+  Log.log(formatFields([{ label: 'No credentials set up yet!', value: '' }]));
+  Log.newLine();
 }
 
 function displayAndroidFcmCredentials(appCredentials: CommonAndroidAppCredentialsFragment): void {
   const maybeFcm = appCredentials.androidFcm;
-  Log.log(`  Push Notifications (FCM):`);
+  Log.log(
+    formatFields([{ label: 'Push Notifications (FCM)', value: '' }], {
+      labelFormat: chalk.cyan.bold,
+    })
+  );
   if (!maybeFcm) {
-    Log.log(`    None assigned yet`);
+    Log.log(formatFields([{ label: '', value: 'None assigned yet' }]));
     Log.newLine();
     return;
   }
   const { snippet, version, updatedAt } = maybeFcm;
+  const fields = [];
   if (version === AndroidFcmVersion.Legacy) {
     const { firstFourCharacters, lastFourCharacters } = snippet as FcmSnippetLegacy;
-    Log.log(`    Key: ${firstFourCharacters}...${lastFourCharacters}`);
+    fields.push({ label: 'Key', value: `${firstFourCharacters}...${lastFourCharacters}` });
   } else if (version === AndroidFcmVersion.V1) {
     const { projectId, serviceAccountEmail, clientId, keyId } = snippet as FcmSnippetV1;
-    Log.log(`    Project Id: ${projectId}`);
-    Log.log(`    Service Account: ${serviceAccountEmail}`);
-    Log.log(`    Client Id: ${clientId}`);
-    Log.log(`    Key Id: ${keyId}`);
+    fields.push({ label: 'Project ID', value: projectId });
+    fields.push({ label: 'Client Email', value: serviceAccountEmail });
+    fields.push({ label: 'Client ID', value: clientId ?? 'Unknown' });
+    fields.push({ label: 'Private Key ID', value: keyId });
   }
-  Log.log(`    Updated ${fromNow(new Date(updatedAt))} ago`);
+  fields.push({ label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` });
+  Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
+  Log.newLine();
+}
+
+function displayGoogleServiceAccountKeyForSubmissions(
+  appCredentials: CommonAndroidAppCredentialsFragment
+): void {
+  const maybeGsaKey = appCredentials.googleServiceAccountKeyForSubmissions;
+  Log.log(
+    formatFields([{ label: 'Google Service Account Key For Submissions', value: '' }], {
+      labelFormat: chalk.cyan.bold,
+    })
+  );
+  if (!maybeGsaKey) {
+    Log.log(formatFields([{ label: '', value: 'None assigned yet' }]));
+    Log.newLine();
+    return;
+  }
+  const { projectIdentifier, privateKeyIdentifier, clientEmail, clientIdentifier, updatedAt } =
+    maybeGsaKey;
+
+  const fields = [
+    { label: 'Project ID', value: projectIdentifier },
+    { label: 'Client Email', value: clientEmail },
+    { label: 'Client ID', value: clientIdentifier },
+    { label: 'Private Key ID', value: privateKeyIdentifier },
+    { label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` },
+  ];
+  Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
   Log.newLine();
 }
 
@@ -48,6 +87,7 @@ function displayEASAndroidAppCredentials(
   appCredentials: CommonAndroidAppCredentialsFragment
 ): void {
   displayAndroidFcmCredentials(appCredentials);
+  displayGoogleServiceAccountKeyForSubmissions(appCredentials);
   const sortedBuildCredentialsList = sortBuildCredentials(
     appCredentials.androidAppBuildCredentialsList
   );
@@ -73,20 +113,25 @@ function formatFingerprint(fingerprint: string | null): string {
   return bytes.join(':');
 }
 function displayAndroidBuildCredentials(
-  buildCredentials: AndroidAppBuildCredentialsFragment,
-  skipConfigurationDisplay?: boolean
+  buildCredentials: AndroidAppBuildCredentialsFragment
 ): void {
-  if (!skipConfigurationDisplay) {
-    const { isDefault, name } = buildCredentials;
-    Log.log(chalk.bold(`  Configuration: ${name}${isDefault ? ' (Default)' : ''}`));
-  }
+  const { isDefault, name } = buildCredentials;
+  Log.log(
+    formatFields([{ label: `Configuration: ${name}${isDefault ? ' (Default)' : ''}`, value: '' }], {
+      labelFormat: chalk.cyan.bold,
+    })
+  );
 
   const maybeKeystore = buildCredentials.androidKeystore;
-  Log.log(`  Keystore:`);
+  Log.log(
+    formatFields([{ label: 'Keystore', value: '' }], {
+      labelFormat: chalk.cyan.bold,
+    })
+  );
   if (maybeKeystore) {
     displayAndroidKeystore(maybeKeystore);
   } else {
-    Log.log(`    None assigned yet`);
+    Log.log(formatFields([{ label: '', value: 'None assigned yet' }]));
   }
   Log.newLine();
 }
@@ -100,13 +145,15 @@ export function displayAndroidKeystore(keystore: AndroidKeystoreFragment): void
     sha256CertificateFingerprint,
     updatedAt,
   } = keystore;
-  Log.log(`    Type: ${type}`);
-  Log.log(`    Key Alias: ${keyAlias}`);
-
-  Log.log(`    MD5 Fingerprint: ${formatFingerprint(md5CertificateFingerprint ?? null)}`);
-  Log.log(`    SHA1 Fingerprint: ${formatFingerprint(sha1CertificateFingerprint ?? null)}`);
-  Log.log(`    SHA256 Fingerprint: ${formatFingerprint(sha256CertificateFingerprint ?? null)}`);
-  Log.log(`    Updated ${fromNow(new Date(updatedAt))} ago`);
+  const fields = [
+    { label: 'Type', value: type },
+    { label: 'Key Alias', value: keyAlias },
+    { label: 'MD5 Fingerprint', value: formatFingerprint(md5CertificateFingerprint ?? null) },
+    { label: 'SHA1 Fingerprint', value: formatFingerprint(sha1CertificateFingerprint ?? null) },
+    { label: 'SHA256 Fingerprint', value: formatFingerprint(sha256CertificateFingerprint ?? null) },
+    { label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` },
+  ];
+  Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
 }
 
 export function displayAndroidAppCredentials({
@@ -117,9 +164,12 @@ export function displayAndroidAppCredentials({
   appCredentials: CommonAndroidAppCredentialsFragment | null;
 }): void {
   const { projectName, androidApplicationIdentifier } = appLookupParams;
-  Log.log(chalk.bold(`Android Credentials`));
-  Log.log(`  Project: ${projectName}`);
-  Log.log(`  Application Identifier: ${androidApplicationIdentifier}`);
+  const fields = [
+    { label: 'Android Credentials', value: '' },
+    { label: 'Project', value: projectName },
+    { label: 'Application Identifier', value: androidApplicationIdentifier },
+  ];
+  Log.log(formatFields(fields, { labelFormat: chalk.cyan.bold }));
   Log.newLine();
 
   if (appCredentials) {

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

@@ -6,83 +6,50 @@ import { getExpoConfig } from '../project/expoConfig';
 import { getProjectAccountName } from '../project/projectUtils';
 import { confirmAsync } from '../prompts';
 import { Actor, getActorDisplayName } from '../user/User';
-import { ensureLoggedInAsync } from '../user/actions';
-import pick from '../utils/expodash/pick';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
 
-export interface Action<T = void> {
-  runAsync(ctx: Context): Promise<T>;
-}
+export class CredentialsContext {
+  public readonly android = AndroidGraphqlClient;
+  public readonly appStore = new AppStoreApi();
+  public readonly ios = IosGraphqlClient;
+  public readonly nonInteractive: boolean;
+  public readonly projectDir: string;
+  public readonly user: Actor;
 
-interface AppleCtxOptions {
-  appleId?: string;
-  appleIdPassword?: string;
-  teamId?: string;
-}
+  private shouldAskAuthenticateAppStore: boolean = true;
+  private resolvedExp?: ExpoConfig;
 
-interface Options extends AppleCtxOptions {
-  nonInteractive?: boolean;
-  exp?: ExpoConfig;
-}
+  constructor(
+    private options: {
+      exp?: ExpoConfig;
+      nonInteractive?: boolean;
+      projectDir: string;
+      user: Actor;
+    }
+  ) {
+    this.projectDir = options.projectDir;
+    this.user = options.user;
+    this.nonInteractive = options.nonInteractive ?? false;
 
-export interface Context {
-  readonly projectDir: string;
-  readonly user: Actor;
-  readonly nonInteractive: boolean;
-  readonly android: typeof AndroidGraphqlClient;
-  readonly ios: typeof IosGraphqlClient;
-  readonly appStore: AppStoreApi;
-  readonly hasProjectContext: boolean;
-  readonly exp: ExpoConfig;
-
-  ensureProjectContext(): void;
-  bestEffortAppStoreAuthenticateAsync(): Promise<void>;
-}
-
-export async function createCredentialsContextAsync(
-  projectDir: string,
-  options: Options
-): Promise<Context> {
-  const user = await ensureLoggedInAsync();
-
-  let expoConfig: ExpoConfig | undefined = options.exp;
-  if (!expoConfig) {
-    try {
-      expoConfig = getExpoConfig(projectDir);
-    } catch (error) {
-      // ignore error, context might be created outside of expo project
+    this.resolvedExp = options.exp;
+    if (!this.resolvedExp) {
+      try {
+        this.resolvedExp = getExpoConfig(options.projectDir);
+      } catch (error) {
+        // ignore error, context might be created outside of expo project
+      }
     }
   }
 
-  return new CredentialsContext(projectDir, user, expoConfig, options);
-}
-
-class CredentialsContext implements Context {
-  public readonly android = AndroidGraphqlClient;
-  public readonly ios = IosGraphqlClient;
-  public readonly appStore: AppStoreApi;
-  public readonly nonInteractive: boolean;
-  private shouldAskAuthenticateAppStore: boolean = true;
-
-  constructor(
-    public readonly projectDir: string,
-    public readonly user: Actor,
-    private _exp: ExpoConfig | undefined,
-    options: Options
-  ) {
-    this.appStore = new AppStoreApi(pick(options, ['appleId', 'appleIdPassword', 'teamId']));
-    this.nonInteractive = options.nonInteractive ?? false;
-  }
-
   get hasProjectContext(): boolean {
-    return !!this._exp;
+    return !!this.resolvedExp;
   }
 
   get exp(): ExpoConfig {
     this.ensureProjectContext();
-    return this._exp!;
+    return this.resolvedExp!;
   }
 
   public ensureProjectContext(): void {
@@ -90,14 +57,15 @@ class CredentialsContext implements Context {
       return;
     }
     // trigger getConfig error
-    getConfig(this.projectDir, { skipSDKVersionRequirement: true });
+    getConfig(this.options.projectDir, { skipSDKVersionRequirement: true });
   }
 
   public logOwnerAndProject(): void {
+    const { user } = this.options;
     if (this.hasProjectContext) {
-      const owner = getProjectAccountName(this.exp, this.user);
+      const owner = getProjectAccountName(this.exp, user);
       // Figure out if User A is configuring credentials as admin for User B's project
-      const isProxyUser = this.user.__typename === 'Robot' || owner !== this.user.username;
+      const isProxyUser = user.__typename === 'Robot' || owner !== user.username;
 
       Log.log(
         `Accessing credentials ${isProxyUser ? 'on behalf of' : 'for'} ${owner} in project ${
@@ -105,7 +73,7 @@ class CredentialsContext implements Context {
         }`
       );
     } else {
-      Log.log(`Accessing credentials for ${this.exp.owner ?? getActorDisplayName(this.user)}`);
+      Log.log(`Accessing credentials for ${this.exp.owner ?? getActorDisplayName(user)}`);
     }
   }
 

packages/eas-cli/src/credentials/credentialsJson/update.ts

@@ -8,7 +8,7 @@ import { findApplicationTarget, findTargetByName } from '../../project/ios/targe
 import zipObject from '../../utils/expodash/zipObject';
 import vcs from '../../vcs';
 import GitClient from '../../vcs/git';
-import { Context } from '../context';
+import { CredentialsContext } from '../context';
 import { App, Target, TargetCredentials } from '../ios/types';
 import { readRawAsync } from './read';
 import {
@@ -23,7 +23,7 @@ import { getCredentialsJsonPath } from './utils';
  * is not validated
  */
 export async function updateAndroidCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   buildCredentials: AndroidAppBuildCredentialsFragment
 ): Promise<void> {
   const rawCredentialsJson: any =
@@ -70,7 +70,7 @@ export async function updateAndroidCredentialsAsync(
  * credentials.json will be updated partially
  */
 export async function updateIosCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   app: App,
   targets: Target[],
   distributionType: IosDistributionType
@@ -205,7 +205,7 @@ function createTargetCredentialsPathsMap(
 }
 
 async function getTargetBuildCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   app: App,
   target: Target,
   iosDistributionType: IosDistributionType
@@ -244,7 +244,7 @@ async function getTargetBuildCredentialsAsync(
 }
 
 async function backupTargetCredentialsAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   {
     targetCredentials,
     targetCredentialsPaths,

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

@@ -5,7 +5,7 @@ import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
 import Log from '../../log';
 import { findApplicationTarget } from '../../project/ios/target';
 import { confirmAsync } from '../../prompts';
-import { Context } from '../context';
+import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
 import { getAppFromContext } from './actions/BuildCredentialsUtils';
@@ -26,7 +26,7 @@ interface Options {
 export default class IosCredentialsProvider {
   public readonly platform = Platform.IOS;
 
-  constructor(private ctx: Context, private options: Options) {}
+  constructor(private ctx: CredentialsContext, private options: Options) {}
 
   public async getCredentialsAsync(
     src: CredentialsSource.LOCAL | CredentialsSource.REMOTE
@@ -68,7 +68,7 @@ export default class IosCredentialsProvider {
   }
 
   private async getPushKeyAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     targets: Target[]
   ): Promise<CommonIosAppCredentialsFragment | null> {
     if (ctx.nonInteractive) {

packages/eas-cli/src/credentials/ios/actions/AppleTeamUtils.ts

@@ -1,9 +1,9 @@
 import { AppleTeamFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 
 export async function resolveAppleTeamIfAuthenticatedAsync(
-  ctx: Context,
+  ctx: CredentialsContext,
   app: AppLookupParams
 ): Promise<AppleTeamFragment | null> {
   if (!ctx.appStore.authCtx) {

packages/eas-cli/src/credentials/ios/actions/AssignPushKey.ts

@@ -1,6 +1,6 @@
 import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 
@@ -8,7 +8,7 @@ export class AssignPushKey {
   constructor(private app: AppLookupParams) {}
 
   public async runAsync(
-    ctx: Context,
+    ctx: CredentialsContext,
     pushKey: ApplePushKeyFragment
   ): Promise<CommonIosAppCredentialsFragment> {
     const appleTeam =