v0.29.0

* update eas-build-job adds xcode 13 support

* update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: Dominik Sokal <[email protected]>

Co-authored-by: Dominik Sokal <[email protected]>

.eslintrc.js

@@ -1,14 +1,7 @@
 module.exports = {
   root: true,
   extends: ['universe/node'],
-  overrides: [
-    {
-      files: ['**/__tests__/*'],
-    },
-  ],
-  globals: {
-    jasmine: false,
-  },
+  plugins: ['async-protect'],
   rules: {
     'no-console': 'warn',
     'no-constant-condition': ['warn', { checkLoops: false }],
@@ -20,11 +13,41 @@ module.exports = {
     ],
     'flowtype/no-types-missing-file-annotation': 'off',
     curly: 'warn',
+    'import/no-cycle': 'error',
+    'import/no-extraneous-dependencies': [
+      'error',
+      { devDependencies: ['**/__tests__/**/*', '**/__mocks__/**/*'] },
+    ],
     'import/no-relative-packages': 'error',
+    'no-restricted-imports': [
+      'error',
+      {
+        paths: [
+          {
+            name: 'lodash',
+            message: "Don't use lodash, it's heavy!",
+          },
+          {
+            name: 'node-fetch',
+            message: 'Use got instead, node-fetch is used only for the GraphQL client.',
+          },
+        ],
+      },
+    ],
+    '@typescript-eslint/explicit-function-return-type': [
+      'warn',
+      {
+        allowExpressions: true,
+      },
+    ],
+    'async-protect/async-suffix': 'error',
   },
-  settings: {
-    react: {
-      version: 'detect',
+  overrides: [
+    {
+      files: ['**/__tests__/**/*.ts', '**/__mocks__/**/*.ts'],
+      rules: {
+        'async-protect/async-suffix': 'off',
+      },
     },
-  },
+  ],
 };

CHANGELOG.md

@@ -6,7 +6,82 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- Require `eas submit` to be configured with eas.json submit profiles. Drop support for CLI params. ([#590](https://github.com/expo/eas-cli/pull/590) by [@dsokal](https://github.com/dsokal))
+### 🎉 New features
+
+- Added upload support for Google Service Account Keys. ([#642](https://github.com/expo/eas-cli/pull/642) by [@quinlanj](https://github.com/quinlanj))
+- Add Xcode 13 image. ([#651](https://github.com/expo/eas-cli/pull/651) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Credentials manager: stop prompting for an Android build profile every iteration. ([#641](https://github.com/expo/eas-cli/pull/641) by [@quinlanj](https://github.com/quinlanj))
+- Don't display prompt in non-interactive mode when the metro config seems invalid. ([#644](https://github.com/expo/eas-cli/pull/644) by [@dsokal](https://github.com/dsokal))
+- Read versions from correct `Info.plist`. ([#635](https://github.com/expo/eas-cli/pull/635) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Move away from weird convention of exports. ([#647](https://github.com/expo/eas-cli/pull/647) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.28.2](https://github.com/expo/eas-cli/releases/tag/v0.28.2) - 2021-09-23
+
+### 🐛 Bug fixes
+
+- Use `log-symbols` to unify green ticks style. ([#639](https://github.com/expo/eas-cli/pull/639) by [@dsokal](https://github.com/dsokal))
+- Fix `eas build --auto-submit` in fresh projects. ([#640](https://github.com/expo/eas-cli/pull/640) by [@dsokal](https://github.com/dsokal))
+
+## [0.28.1](https://github.com/expo/eas-cli/releases/tag/v0.28.1) - 2021-09-22
+
+### 🐛 Bug fixes
+
+- Prevent ora spinners breaking when debug logs are enabled. ([#575](https://github.com/expo/eas-cli/pull/575) by [@EvanBacon](https://github.com/EvanBacon))
+- Do not fail `eas build` when transient network errors occur. ([#638](https://github.com/expo/eas-cli/pull/638) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Add GraphQL support for GoogleServiceAccountKey. ([#632](https://github.com/expo/eas-cli/pull/632) by [@quinlanj](https://github.com/quinlanj))
+- Remove GraphQL support for the App Specific Password. ([#633](https://github.com/expo/eas-cli/pull/633) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.28.0](https://github.com/expo/eas-cli/releases/tag/v0.28.0) - 2021-09-20
+
+### 🎉 New features
+
+- Use envs from build profile to resolve app config when auto-submitting. ([#614](https://github.com/expo/eas-cli/pull/614) by [@dsokal](https://github.com/dsokal))
+- Support multi flavor Android projects. ([#595](https://github.com/expo/eas-cli/pull/595) by [@wkozyra95](https://github.com/wkozyra95))
+- Improve experience when using the build details page as a build artifact URL in `eas submit`. ([#620](https://github.com/expo/eas-cli/pull/620) by [@dsokal](https://github.com/dsokal))
+- Better error message when eas.json is invalid JSON. ([#618](https://github.com/expo/eas-cli/pull/618) by [@dsokal](https://github.com/dsokal))
+- Add warning about the legacy build service IDs in `eas submit`. ([#624](https://github.com/expo/eas-cli/pull/624) by [@dsokal](https://github.com/dsokal))
+- Validate that project includes `expo-dev-client` when building with `developmentClient` flag. ([#627](https://github.com/expo/eas-cli/pull/627) by [@dsokal](https://github.com/dsokal))
+- Better experience when not logged in in non-interactive mode. ([#628](https://github.com/expo/eas-cli/pull/628) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Reduce `eas-cli` size by almost getting rid of `lodash` from dependencies. ([#605](https://github.com/expo/eas-cli/pull/605) by [@dsokal](https://github.com/dsokal))
+- Enforce explicit return type in all functions. ([#619](https://github.com/expo/eas-cli/pull/619) by [@wkozyra95](https://github.com/wkozyra95))
+- Enforce `Async` suffix for async functions. ([#623](https://github.com/expo/eas-cli/pull/623) by [@dsokal](https://github.com/dsokal))
+
+## [0.27.1](https://github.com/expo/eas-cli/releases/tag/v0.27.1) - 2021-09-10
+
+### 🐛 Bug fixes
+
+- Fixed force-creation, app secret creation, and secret deletion mutations. ([#606](https://github.com/expo/eas-cli/pull/606) by [@fiberjw](https://github.com/fiberjw))
+
+## [0.27.0](https://github.com/expo/eas-cli/releases/tag/v0.27.0) - 2021-09-10
+
+### 🎉 New features
+
+- Implement support for `--platform all` in `eas submit`. ([#598](https://github.com/expo/eas-cli/pull/598) by [@dsokal](https://github.com/dsokal))
+- Implement support for `--non-interactive` in `eas submit`. ([#600](https://github.com/expo/eas-cli/pull/600) by [@dsokal](https://github.com/dsokal))
+- Add auto-submit feature. Run `eas build --auto-submit` to submit automatically on build complete. ([#603](https://github.com/expo/eas-cli/pull/603) by [@dsokal](https://github.com/dsokal))
+- Allow using env var for `android.serviceAccountKeyPath` in submit profiles. ([#604](https://github.com/expo/eas-cli/pull/604) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix detecting `googleServicesFile` on Windows. ([#602](https://github.com/expo/eas-cli/pull/602) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.26.0](https://github.com/expo/eas-cli/releases/tag/v0.26.0) - 2021-09-08
+
+### 🛠 Breaking changes
+
+- Require `eas submit` to be configured with eas.json submit profiles (see [https://docs.expo.dev/submit/eas-json/](https://docs.expo.dev/submit/eas-json/) for details). Drop support for CLI params. ([#590](https://github.com/expo/eas-cli/pull/590) by [@dsokal](https://github.com/dsokal))
 
 ### 🎉 New features
 
@@ -17,8 +92,6 @@ This is the log of notable changes to EAS CLI and related packages.
 - Fix `eas build` from throwing an exception when detecting the git `core.ignorecase` setting. ([#592](https://github.com/expo/eas-cli/pull/592) by [@mwillbanks](https://github.com/mwillbanks))
 - Support app names that consist only of unicode characters. ([#596](https://github.com/expo/eas-cli/pull/596) by [@wkozyra95](https://github.com/wkozyra95))
 
-### 🧹 Chores
-
 ## [0.25.0](https://github.com/expo/eas-cli/releases/tag/v0.25.0) - 2021-09-01
 
 ### 🛠 Breaking changes

CODEOWNERS

@@ -0,0 +1,7 @@
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
+
+packages/eas-cli/src/submit @barthap @dsokal
+packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+
+packages/eas-json @dsokal @wkozyra95

codecov.yml

@@ -1,4 +1,3 @@
-comment: false
 coverage:
   round: up
   precision: 2

lerna.json

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

package.json

@@ -19,7 +19,8 @@
     "@types/jest": "27.0.1",
     "@types/node": "16.7.8",
     "eslint": "7.32.0",
-    "eslint-config-universe": "7.0.1",
+    "eslint-config-universe": "8.0.0",
+    "eslint-plugin-async-protect": "1.1.0",
     "jest": "27.1.0",
     "jest-watch-typeahead": "0.6.4",
     "lerna": "4.0.0",

packages/eas-cli/.eslintrc.js

@@ -1,9 +1,18 @@
+const rootEslintrc = require('../../.eslintrc.js');
+
 module.exports = {
   rules: {
-    'import/no-cycle': 'error',
-    'import/no-extraneous-dependencies': [
+    'no-restricted-imports': [
       'error',
-      { devDependencies: ['**/__tests__/**/*', '**/__mocks__/**/*'] },
+      {
+        paths: [
+          ...rootEslintrc.rules['no-restricted-imports'][1].paths,
+          {
+            name: 'ora',
+            message: 'Import ora from src/ora.ts instead.',
+          },
+        ],
+      },
     ],
     'graphql/template-strings': [
       'error',

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.26.0/packages/eas-cli/src/commands/account/login.js)_
+_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)_
 
 ## `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.26.0/packages/eas-cli/src/commands/account/logout.js)_
+_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)_
 
 ## `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.26.0/packages/eas-cli/src/commands/account/view.js)_
+_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)_
 
 ## `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.26.0/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/analytics.js)_
 
 ## `eas build`
 
@@ -124,16 +124,28 @@ USAGE
 
 OPTIONS
   -p, --platform=(android|ios|all)
-  --clear-cache                     Clear cache before the build
-  --json                            Enable JSON output, non-JSON messages will be printed to stderr
-  --local                           Run build locally [experimental]
-  --non-interactive                 Run command in --non-interactive mode
-  --profile=profile                 [default: release] Name of the build profile from eas.json
-  --skip-project-configuration      Skip project configuration
-  --[no-]wait                       Wait for build(s) to complete
+
+  --auto-submit                            Submit on build complete using the submit profile with the same name as the
+                                           build profile
+
+  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
+
+  --clear-cache                            Clear cache before the build
+
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr
+
+  --local                                  Run build locally [experimental]
+
+  --non-interactive                        Run command in non-interactive mode
+
+  --profile=PROFILE_NAME                   [default: release] Name of the build profile from eas.json
+
+  --skip-project-configuration             Skip project configuration
+
+  --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/build/index.js)_
+_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)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -144,7 +156,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/build/cancel.js)_
+_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)_
 
 ## `eas build:configure`
 
@@ -158,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.26.0/packages/eas-cli/src/commands/build/configure.js)_
+_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)_
 
 ## `eas build:list`
 
@@ -191,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.26.0/packages/eas-cli/src/commands/build/list.js)_
+_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)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -205,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.26.0/packages/eas-cli/src/commands/build/view.js)_
+_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)_
 
 ## `eas config`
 
@@ -220,7 +232,7 @@ OPTIONS
   --profile=profile
 ```
 
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/config.js)_
 
 ## `eas credentials`
 
@@ -231,7 +243,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/credentials.js)_
 
 ## `eas device:create`
 
@@ -242,7 +254,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/device/create.js)_
+_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)_
 
 ## `eas device:list`
 
@@ -256,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.26.0/packages/eas-cli/src/commands/device/list.js)_
+_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)_
 
 ## `eas device:view [UDID]`
 
@@ -267,7 +279,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/device/view.js)_
+_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)_
 
 ## `eas diagnostics`
 
@@ -278,7 +290,7 @@ USAGE
   $ eas diagnostics
 ```
 
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/diagnostics.js)_
 
 ## `eas help [COMMAND]`
 
@@ -306,7 +318,7 @@ USAGE
   $ eas project:info
 ```
 
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/project/info.js)_
+_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)_
 
 ## `eas project:init`
 
@@ -320,7 +332,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/project/init.js)_
+_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)_
 
 ## `eas secret:create`
 
@@ -337,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.26.0/packages/eas-cli/src/commands/secret/create.js)_
+_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)_
 
 ## `eas secret:delete`
 
@@ -354,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.26.0/packages/eas-cli/src/commands/secret/delete.js)_
+_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)_
 
 ## `eas secret:list`
 
@@ -365,7 +377,7 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/secret/list.js)_
+_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)_
 
 ## `eas submit`
 
@@ -376,14 +388,20 @@ USAGE
   $ eas submit
 
 OPTIONS
-  -p, --platform=(android|ios)
-  --id=id                       ID of the build to submit
-  --latest                      Submit the latest build for specified platform
-  --path=path                   Path to the .apk/.aab/.ipa file
-  --profile=profile             Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.
-  --url=url                     App archive url
-  --verbose                     Always print logs from Submission Service
-  --[no-]wait                   Wait for submission to complete
+  -p, --platform=(android|ios|all)
+  --id=id                           ID of the build to submit
+  --latest                          Submit the latest build for specified platform
+  --non-interactive                 Run command in non-interactive mode
+  --path=path                       Path to the .apk/.aab/.ipa file
+
+  --profile=profile                 Name of the submit profile from eas.json. Defaults to "release" if defined in
+                                    eas.json.
+
+  --url=url                         App archive url
+
+  --verbose                         Always print logs from Submission Service
+
+  --[no-]wait                       Wait for submission to complete
 
 DESCRIPTION
   See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
@@ -392,7 +410,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.29.0/packages/eas-cli/src/commands/submit.js)_
 
 ## `eas webhook:create`
 
@@ -411,7 +429,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/webhook/create.js)_
+_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)_
 
 ## `eas webhook:delete [ID]`
 
@@ -425,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.26.0/packages/eas-cli/src/commands/webhook/delete.js)_
+_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)_
 
 ## `eas webhook:list`
 
@@ -439,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.26.0/packages/eas-cli/src/commands/webhook/list.js)_
+_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)_
 
 ## `eas webhook:update`
 
@@ -459,7 +477,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.26.0/packages/eas-cli/src/commands/webhook/update.js)_
+_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)_
 
 ## `eas webhook:view ID`
 
@@ -473,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.26.0/packages/eas-cli/src/commands/webhook/view.js)_
+_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)_
 <!-- commandsstop -->

packages/eas-cli/package.json

@@ -1,28 +1,28 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.26.0",
+  "version": "0.29.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@amplitude/identify": "1.7.0",
-    "@amplitude/node": "1.7.0",
     "@expo/apple-utils": "0.0.0-alpha.25",
-    "@expo/config": "3.3.42",
+    "@expo/config": "5.0.9",
     "@expo/config-plugins": "3.1.0",
-    "@expo/eas-build-job": "0.2.46",
-    "@expo/eas-json": "^0.26.0",
-    "@expo/json-file": "8.2.25",
+    "@expo/eas-build-job": "0.2.48",
+    "@expo/eas-json": "^0.29.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/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.0.7",
     "@expo/sdk-runtime-versions": "1.0.0",
     "@expo/spawn-async": "1.5.0",
+    "@expo/timeago.js": "1.0.0",
     "@oclif/command": "1.8.0",
     "@oclif/config": "1.17.0",
     "@oclif/errors": "1.3.5",
@@ -40,6 +40,7 @@
     "fs-extra": "10.0.0",
     "getenv": "1.0.0",
     "got": "11.8.2",
+    "gradle-to-js": "2.0.0",
     "graphql": "15.5.1",
     "graphql-tag": "2.12.5",
     "ignore": "5.1.8",
@@ -47,7 +48,7 @@
     "jks-js": "1.0.1",
     "joi": "17.4.2",
     "keychain": "1.3.0",
-    "lodash": "4.17.21",
+    "log-symbols": "4.1.0",
     "mime": "2.5.2",
     "minimatch": "3.0.4",
     "nanoid": "3.1.25",
@@ -62,9 +63,7 @@
     "semver": "7.3.5",
     "strip-ansi": "6.0.0",
     "tar": "6.1.11",
-    "tempy": "0.7.0",
     "terminal-link": "2.1.1",
-    "timeago.js": "4.0.2",
     "tslib": "2.3.1",
     "turndown": "7.1.1",
     "untildify": "4.0.0",
@@ -81,7 +80,6 @@
     "@types/form-data": "^2.5.0",
     "@types/fs-extra": "9.0.12",
     "@types/getenv": "^1.0.0",
-    "@types/lodash": "4.14.172",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
     "@types/node-forge": "^0.9.5",
@@ -95,7 +93,9 @@
     "eslint-plugin-graphql": "4.0.0",
     "memfs": "3.2.2",
     "mockdate": "^3.0.2",
-    "nock": "^13.0.5"
+    "nock": "^13.0.5",
+    "tempy": "0.7.0",
+    "ts-deepmerge": "1.0.8"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -120,7 +120,6 @@
       "@oclif/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
-    "helpClass": "./build/help",
     "topics": {
       "account": {
         "description": "manage your account"

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

@@ -1,7 +1,9 @@
-export default jest.fn().mockReturnValue({
+export const ora = jest.fn().mockReturnValue({
   start: jest.fn().mockReturnValue({
     fail: jest.fn(),
     succeed: jest.fn(),
   }),
+  stop: jest.fn(),
+  stopAndPersist: jest.fn(),
   succeed: jest.fn(),
 });

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

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

packages/eas-cli/src/analytics.ts

@@ -1,5 +1,3 @@
-import { Identify } from '@amplitude/identify';
-import * as Amplitude from '@amplitude/node';
 import RudderAnalytics from '@expo/rudder-sdk-node';
 import os from 'os';
 import { URL } from 'url';
@@ -20,40 +18,46 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   linux: 'Linux',
 };
 
-let amplitudeClient: Amplitude.NodeClient | null = null;
 let rudderstackClient: RudderAnalytics | null = null;
 let userIdentified = false;
 let identifyData: {
   userId: string;
   deviceId: string;
-  identify: Identify;
+  traits: Record<string, any>;
 } | null = null;
 
 export async function initAsync(): Promise<void> {
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync('amplitudeEnabled', false);
+  // TODO: remove after some time
+  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+  if (amplitudeEnabled !== null) {
+    await UserSettings.setAsync('analyticsEnabled', amplitudeEnabled);
+    await UserSettings.deleteKeyAsync('amplitudeEnabled');
   }
-  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', true);
-  if (amplitudeEnabled) {
+  const amplitudeDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+  if (amplitudeDeviceId !== null) {
+    await UserSettings.setAsync('analyticsDeviceId', amplitudeDeviceId);
+    await UserSettings.deleteKeyAsync('amplitudeDeviceId');
+  }
+  // TODO: cut here
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync('analyticsEnabled', false);
+  }
+
+  const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', true);
+  if (analyticsEnabled) {
     const config =
       process.env.EXPO_STAGING || process.env.EXPO_LOCAL
         ? {
             // staging environment
-            amplitudeWriteKey: 'cdebbc678931403439486c4750781544',
             rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
             rudderstackDataPlaneURL: 'https://cdp.expo.dev',
           }
         : {
             // prod environment
-            amplitudeWriteKey: '4ac443afd5073c0df6169291db1d3495',
             rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
             rudderstackDataPlaneURL: 'https://cdp.expo.dev',
           };
 
-    amplitudeClient = Amplitude.init(config.amplitudeWriteKey, {
-      retryClass: new Amplitude.OfflineRetryHandler(config.amplitudeWriteKey),
-    });
-
     rudderstackClient = new RudderAnalytics(
       config.rudderstackWriteKey,
       new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
@@ -65,24 +69,17 @@ export async function initAsync(): Promise<void> {
   }
 }
 
-export async function setUserDataAsync(
-  userId: string,
-  properties: Record<string, any>
-): Promise<void> {
-  const identify = new Identify();
-  Object.entries(properties).forEach(([property, value]) => {
-    identify.set(property, value);
-  });
-  const savedDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+export async function setUserDataAsync(userId: string, traits: Record<string, any>): Promise<void> {
+  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
   const deviceId = savedDeviceId ?? uuidv4();
   if (!savedDeviceId) {
-    await UserSettings.setAsync('amplitudeDeviceId', deviceId);
+    await UserSettings.setAsync('analyticsDeviceId', deviceId);
   }
 
   identifyData = {
     userId,
     deviceId,
-    identify,
+    traits,
   };
 
   ensureUserIdentified();
@@ -92,14 +89,10 @@ export async function flushAsync(): Promise<void> {
   if (rudderstackClient) {
     rudderstackClient.flush();
   }
-
-  if (amplitudeClient) {
-    await amplitudeClient.flush();
-  }
 }
 
-export function logEvent(name: string, properties: Record<string, any> = {}) {
-  if (!amplitudeClient && !rudderstackClient) {
+export function logEvent(name: string, properties: Record<string, any> = {}): void {
+  if (!rudderstackClient) {
     return;
   }
   ensureUserIdentified();
@@ -107,56 +100,31 @@ export function logEvent(name: string, properties: Record<string, any> = {}) {
   const { userId, deviceId } = identifyData ?? {};
   const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
 
-  if (amplitudeClient) {
-    amplitudeClient.logEvent({
-      event_type: name,
-      event_properties: { ...properties, ...commonEventProperties },
-      ...(userId && { user_id: userId }),
-      ...(deviceId && { device_id: deviceId }),
-      ...getAmplitudeContext(),
-    });
-  }
-
-  if (rudderstackClient) {
-    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
-    rudderstackClient.track({
-      event: name,
-      properties: { ...properties, ...commonEventProperties },
-      ...identity,
-      context: getRudderStackContext(),
-    });
-  }
+  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+  rudderstackClient.track({
+    event: name,
+    properties: { ...properties, ...commonEventProperties },
+    ...identity,
+    context: getRudderStackContext(),
+  });
 }
 
-function ensureUserIdentified() {
-  if (!(rudderstackClient || amplitudeClient) || userIdentified || !identifyData) {
+function ensureUserIdentified(): void {
+  if (!rudderstackClient || userIdentified || !identifyData) {
     return;
   }
 
-  if (amplitudeClient) {
-    amplitudeClient.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
-  }
-
   if (rudderstackClient) {
     rudderstackClient.identify({
       userId: identifyData.userId,
       anonymousId: identifyData.deviceId,
+      traits: identifyData.traits,
     });
   }
   userIdentified = true;
 }
 
-function getAmplitudeContext() {
-  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-  return {
-    os_name: platform,
-    os_version: os.release(),
-    device_brand: platform,
-    device_model: platform,
-  };
-}
-
-function getRudderStackContext() {
+function getRudderStackContext(): Record<string, any> {
   const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
   return {
     os: { name: platform, version: os.release() },

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

@@ -1,9 +1,11 @@
 import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { readVersionCodeAsync, readVersionNameAsync } from '../version';
+import { maybeResolveVersionsAsync } from '../version';
 
 jest.mock('fs');
 
@@ -20,36 +22,29 @@ beforeEach(() => {
   fs.mkdirpSync(os.tmpdir());
 });
 
-describe(readVersionCodeAsync, () => {
+describe(maybeResolveVersionsAsync, () => {
   describe('generic project', () => {
     it('reads the version code from native code', async () => {
       const exp = initGenericProject();
-      const versionCode = await readVersionCodeAsync('/repo', exp);
-      expect(versionCode).toBe(123);
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/repo',
+        exp,
+        {} as BuildProfile<Platform.ANDROID>
+      );
+      expect(appVersion).toBe('2.0');
+      expect(appBuildVersion).toBe('123');
     });
   });
   describe('managed project', () => {
     it('reads the version code from expo config', async () => {
       const exp = initManagedProject();
-      const versionCode = await readVersionCodeAsync('/repo', exp);
-      expect(versionCode).toBe(123);
-    });
-  });
-});
-
-describe(readVersionNameAsync, () => {
-  describe('generic project', () => {
-    it('reads the version name from native code', async () => {
-      const exp = initGenericProject();
-      const versionName = await readVersionNameAsync('/repo', exp);
-      expect(versionName).toBe('1.0');
-    });
-  });
-  describe('managed project', () => {
-    it('reads the version from expo config', async () => {
-      const exp = initManagedProject();
-      const versionName = await readVersionNameAsync('/repo', exp);
-      expect(versionName).toBe('1.0.0');
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/repo',
+        exp,
+        {} as BuildProfile<Platform.ANDROID>
+      );
+      expect(appVersion).toBe('5.0.0');
+      expect(appBuildVersion).toBe('126');
     });
   });
 });
@@ -69,7 +64,7 @@ function initGenericProject(): ExpoConfig {
   defaultConfig {
     applicationId "com.expo.testapp"
     versionCode 123
-    versionName "1.0"
+    versionName "2.0"
   }
 }`,
       './android/app/src/main/AndroidManifest.xml': 'fake',
@@ -80,9 +75,9 @@ function initGenericProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
-    version: '1.0.0',
+    version: '3.0.0',
     android: {
-      versionCode: 123,
+      versionCode: 124,
     },
   };
   return fakeExp;
@@ -93,9 +88,9 @@ function initManagedProject(): ExpoConfig {
     {
       './app.json': JSON.stringify({
         expo: {
-          version: '1.0.0',
+          version: '4.0.0',
           android: {
-            versionCode: 123,
+            versionCode: 125,
           },
         },
       }),
@@ -106,9 +101,9 @@ function initManagedProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
-    version: '1.0.0',
+    version: '5.0.0',
     android: {
-      versionCode: 123,
+      versionCode: 126,
     },
   };
   return fakeExp;

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

@@ -1,4 +1,4 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
@@ -12,11 +12,13 @@ import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
 } from '../../project/android/applicationId';
+import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import {
   BuildRequestSender,
   CredentialsResult,
+  JobData,
   prepareBuildRequestForPlatformAsync,
 } from '../build';
 import { BuildContext } from '../context';
@@ -51,20 +53,31 @@ This means that it will most likely produce an AAB and you will not be able to i
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
 
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
+
   if (ctx.workflow === Workflow.MANAGED) {
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
   return await prepareBuildRequestForPlatformAsync({
     ctx,
-    ensureCredentialsAsync: ensureAndroidCredentialsAsync,
+    ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
+      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
+    },
     ensureProjectConfiguredAsync: async () => {
       if (ctx.workflow === Workflow.GENERIC) {
         await validateAndSyncProjectConfigurationAsync(ctx.projectDir, ctx.exp);
       }
     },
-    getMetadataContext: () => ({}),
-    prepareJobAsync,
+    getMetadataContext: () => ({
+      gradleContext,
+    }),
+    prepareJobAsync: async (
+      ctx: BuildContext<Platform.ANDROID>,
+      jobData: JobData<AndroidCredentials>
+    ): Promise<Job> => {
+      return await prepareJobAsync(ctx, jobData);
+    },
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
@@ -86,12 +99,17 @@ function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>
+  ctx: BuildContext<Platform.ANDROID>,
+  gradleContext?: GradleBuildContext
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
   }
-  const androidApplicationIdentifier = await getApplicationIdAsync(ctx.projectDir, ctx.exp);
+  const androidApplicationIdentifier = await getApplicationIdAsync(
+    ctx.projectDir,
+    ctx.exp,
+    gradleContext
+  );
   const provider = new AndroidCredentialsProvider(
     await createCredentialsContextAsync(ctx.projectDir, {
       exp: ctx.exp,

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

@@ -1,50 +1,41 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import fs from 'fs-extra';
+import { BuildProfile } from '@expo/eas-json';
 
+import {
+  getAppBuildGradleAsync,
+  parseGradleCommand,
+  resolveConfigValue,
+} from '../../project/android/gradleUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 
-export async function readVersionCodeAsync(
+export async function maybeResolveVersionsAsync(
   projectDir: string,
-  exp: ExpoConfig
-): Promise<number | undefined> {
+  exp: ExpoConfig,
+  buildProfile: BuildProfile<Platform.ANDROID>
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
-    const buildGradle = readBuildGradle(projectDir);
-    const matchResult = buildGradle?.match(/versionCode (.*)/);
-    if (matchResult) {
-      return Number(matchResult[1]);
-    } else {
-      return undefined;
+    const buildGradle = await getAppBuildGradleAsync(projectDir);
+    try {
+      const parsedGradleCommand = buildProfile.gradleCommand
+        ? parseGradleCommand(buildProfile.gradleCommand, buildGradle)
+        : undefined;
+
+      return {
+        appVersion:
+          resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
+        appBuildVersion:
+          resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
+      };
+    } catch (err: any) {
+      return {};
     }
   } else {
-    return AndroidConfig.Version.getVersionCode(exp) ?? 1;
+    return {
+      appBuildVersion: String(AndroidConfig.Version.getVersionCode(exp)),
+      appVersion: exp.version,
+    };
   }
 }
-
-export async function readVersionNameAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  if (workflow === Workflow.GENERIC) {
-    const buildGradle = readBuildGradle(projectDir);
-    const matchResult = buildGradle?.match(/versionName ["'](.*)["']/);
-    if (matchResult) {
-      return matchResult[1];
-    } else {
-      return undefined;
-    }
-  } else {
-    return exp.version;
-  }
-}
-
-function readBuildGradle(projectDir: string): string | undefined {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  if (!fs.pathExistsSync(buildGradlePath)) {
-    return undefined;
-  }
-  return fs.readFileSync(buildGradlePath, 'utf8');
-}

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

@@ -2,27 +2,25 @@ import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo
 import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import nullthrows from 'nullthrows';
-import ora from 'ora';
 
 import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log, { learnMore } from '../log';
-import { promptAsync } from '../prompts';
+import { ora } from '../ora';
+import { requestedPlatformDisplayNames } from '../platform';
 import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
-import { sleep } from '../utils/promise';
+import { sleepAsync } from '../utils/promise';
 import vcs from '../vcs';
-import { requestedPlatformDisplayNames } from './constants';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { MetadataContext, collectMetadata } from './metadata';
+import { MetadataContext, collectMetadataAsync } from './metadata';
 import { TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { commitPromptAsync, makeProjectTarballAsync } from './utils/repository';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -89,7 +87,7 @@ export async function prepareBuildRequestForPlatformAsync<
       } as const);
 
   const metadataContext = builder.getMetadataContext();
-  const metadata = await collectMetadata(ctx, metadataContext);
+  const metadata = await collectMetadataAsync(ctx, metadataContext);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
@@ -230,58 +228,6 @@ async function withAnalyticsAsync<Result>(
   }
 }
 
-enum ShouldCommitChanges {
-  Yes,
-  ShowDiffFirst,
-  Abort,
-}
-
-async function reviewAndCommitChangesAsync(
-  initialCommitMessage: string,
-  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
-): Promise<void> {
-  if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
-    Log.withTick('Committed changes.');
-    return;
-  }
-  if (nonInteractive) {
-    throw new Error(
-      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode or set EAS_BUILD_AUTOCOMMIT=1 in your environment.'
-    );
-  }
-  const { selected } = await promptAsync({
-    type: 'select',
-    name: 'selected',
-    message: 'Can we commit these changes to git for you?',
-    choices: [
-      { title: 'Yes', value: ShouldCommitChanges.Yes },
-      ...(askedFirstTime
-        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
-        : []),
-      {
-        title: 'Abort build process',
-        value: ShouldCommitChanges.Abort,
-      },
-    ],
-  });
-
-  if (selected === ShouldCommitChanges.Abort) {
-    throw new Error(
-      "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
-    );
-  } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync({ initialCommitMessage });
-    Log.withTick('Committed changes.');
-  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcs.showDiffAsync();
-    await reviewAndCommitChangesAsync(initialCommitMessage, {
-      nonInteractive,
-      askedFirstTime: false,
-    });
-  }
-}
-
 export async function waitForBuildEndAsync(
   buildIds: string[],
   { timeoutSec = 3600, intervalSec = 30 } = {}
@@ -298,39 +244,46 @@ export async function waitForBuildEndAsync(
         try {
           return await BuildQuery.byIdAsync(buildId, { useCache: false });
         } catch (err) {
+          Log.debug('Failed to fetch the build status', err);
           return null;
         }
       })
     );
     if (builds.length === 1) {
-      const build = nullthrows(builds[0]);
-      switch (build.status) {
-        case BuildStatus.Finished:
-          spinner.succeed('Build finished');
-          return builds;
-        case BuildStatus.New:
-          spinner.text = 'Build created';
-          break;
-        case BuildStatus.InQueue:
-          spinner.text = 'Build queued...';
-          break;
-        case BuildStatus.Canceled:
-          spinner.text = 'Build canceled';
-          spinner.stopAndPersist();
-          return builds;
-        case BuildStatus.InProgress:
-          spinner.text = 'Build in progress...';
-          break;
-        case BuildStatus.Errored:
-          spinner.fail('Build failed');
-          if (build.error) {
+      const [build] = builds;
+      if (build !== null) {
+        switch (build.status) {
+          case BuildStatus.Finished:
+            spinner.succeed('Build finished');
             return builds;
-          } else {
-            throw new Error(`Standalone build failed!`);
-          }
-        default:
-          spinner.warn('Unknown status.');
-          throw new Error(`Unknown status: ${builds} - aborting!`);
+          case BuildStatus.New:
+            spinner.text = 'Build created';
+            break;
+          case BuildStatus.InQueue:
+            spinner.text = 'Build queued...';
+            break;
+          case BuildStatus.Canceled:
+            spinner.text = 'Build canceled';
+            spinner.stopAndPersist();
+            return builds;
+          case BuildStatus.InProgress:
+            spinner.text = 'Build in progress...';
+            break;
+          case BuildStatus.Errored:
+            spinner.fail('Build failed');
+            if (build.error) {
+              return builds;
+            } else {
+              throw new Error(`Standalone build failed!`);
+            }
+          default:
+            spinner.warn('Unknown status');
+            throw new Error(`Unknown build status: ${build.status} - aborting!`);
+        }
+      } else {
+        if (!spinner.text) {
+          spinner.text = 'Could not fetch the build status. Check your network connection.';
+        }
       }
     } else {
       if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
@@ -354,7 +307,7 @@ export async function waitForBuildEndAsync(
         const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
         const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
         const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknownState = builds.length - newBuilds - inQueue - inProgress - errored - finished;
+        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
         spinner.text = [
           newBuilds && `Builds created: ${newBuilds}`,
           inQueue && `Builds in queue: ${inQueue}`,
@@ -362,14 +315,14 @@ export async function waitForBuildEndAsync(
           canceled && `Builds canceled: ${canceled}`,
           errored && chalk.red(`Builds failed: ${errored}`),
           finished && chalk.green(`Builds finished: ${finished}`),
-          unknownState && chalk.red(`Builds in unknown state: ${unknownState}`),
+          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
         ]
           .filter(i => i)
           .join('\t');
       }
     }
     time = new Date().getTime();
-    await sleep(intervalSec * 1000);
+    await sleepAsync(intervalSec * 1000);
   }
   spinner.warn('Timed out');
   throw new Error(

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

@@ -6,6 +6,7 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 
 import Log, { learnMore } from '../log';
+import { RequestedPlatform } from '../platform';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { confirmAsync, promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
@@ -13,7 +14,6 @@ import vcs from '../vcs';
 import { configureAndroidAsync } from './android/configure';
 import { ConfigureContext } from './context';
 import { configureIosAsync } from './ios/configure';
-import { RequestedPlatform } from './types';
 import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
 
 const configureCommitMessage = {

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

@@ -1,7 +0,0 @@
-import { RequestedPlatform } from './types';
-
-export const requestedPlatformDisplayNames: Record<RequestedPlatform, string> = {
-  [RequestedPlatform.Ios]: 'iOS',
-  [RequestedPlatform.Android]: 'Android',
-  [RequestedPlatform.All]: 'Android and iOS',
-};

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

@@ -5,13 +5,14 @@ import JsonFile from '@expo/json-file';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
+import { RequestedPlatform } from '../platform';
 import { getExpoConfig } from '../project/expoConfig';
 import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { findAccountByName } from '../user/Account';
 import { Actor } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
-import { RequestedPlatform, TrackingContext } from './types';
+import { TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';
 
 export interface ConfigureContext {

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

@@ -9,6 +9,8 @@ import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
+  evaluateTemplateString,
+  getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
 } from '../version';
@@ -28,6 +30,25 @@ beforeEach(() => {
   fs.mkdirpSync(os.tmpdir());
 });
 
+describe(evaluateTemplateString, () => {
+  it('evaluates the template string when value is a number', () => {
+    expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: 123 })).toBe('123');
+  });
+  it('evaluates the template string when value is a string', () => {
+    expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: '123' })).toBe('123');
+  });
+  it('evaluates the template string when template is not the only element', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '123' })).toBe(
+      'before123after'
+    );
+  });
+  it('evaluates the template string when template value is double quoted', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '"123"' })).toBe(
+      'before123after'
+    );
+  });
+});
+
 // generic workflow
 describe(bumpVersionAsync, () => {
   it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
@@ -37,6 +58,7 @@ describe(bumpVersionAsync, () => {
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -51,6 +73,30 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
+  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
+    const fakeExp = initGenericProject({ infoPlistName: 'Info2.plist' });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.BUILD_NUMBER,
+      projectDir: '/repo',
+      exp: fakeExp,
+      buildSettings: {
+        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+      },
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info2.plist'
+    )) as IOSConfig.InfoPlist;
+    expect(fakeExp.version).toBe('1.0.0');
+    expect(fakeExp.ios?.buildNumber).toBe('2');
+    expect(appJSON.expo.version).toBe('1.0.0');
+    expect(appJSON.expo.ios.buildNumber).toBe('2');
+    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
+    expect(infoPlist['CFBundleVersion']).toBe('2');
+  });
+
   it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
     const fakeExp = initGenericProject();
 
@@ -58,6 +104,7 @@ describe(bumpVersionAsync, () => {
       bumpStrategy: BumpStrategy.SHORT_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -79,6 +126,7 @@ describe(bumpVersionAsync, () => {
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -190,10 +238,59 @@ describe(readShortVersionAsync, () => {
   });
 });
 
+describe(getInfoPlistPath, () => {
+  it('returns default path if INFOPLIST_FILE is not specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {});
+    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
+  });
+  it('returns INFOPLIST_FILE if specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates SRCROOT in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates BuildSettings in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
+      TARGET_NAME: 'NotInfo',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+});
+
 function initGenericProject({
   shortVersion = '1.0.0',
   version = '1',
-}: { shortVersion?: string; version?: string } = {}): ExpoConfig {
+  infoPlistName = 'Info.plist',
+}: { shortVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
@@ -204,7 +301,7 @@ function initGenericProject({
           },
         },
       }),
-      './ios/myproject/Info.plist': `<?xml version="1.0" encoding="UTF-8"?>
+      [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

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

@@ -1,7 +1,8 @@
 import { IOSConfig } from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials } from '../../credentials/ios/types';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
@@ -16,6 +17,12 @@ import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
+interface BuildConfiguration {
+  targetName?: string;
+  buildConfiguration?: string;
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}
+
 export async function prepareIosBuildAsync(
   ctx: BuildContext<Platform.IOS>
 ): Promise<BuildRequestSender> {
@@ -43,6 +50,7 @@ export async function prepareIosBuildAsync(
     },
     xcodeBuildContext
   );
+  const buildConfiguration = resolveBuildConfiguration(ctx, targets);
 
   return await prepareBuildRequestForPlatformAsync({
     ctx,
@@ -54,20 +62,11 @@ export async function prepareIosBuildAsync(
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile,
+        buildSettings: buildConfiguration.buildSettings,
       });
     },
     getMetadataContext: (): IosMetadataContext => {
-      if (ctx.workflow === Workflow.MANAGED) {
-        return { buildSettings: {} };
-      }
-      const applicationTarget = findApplicationTarget(targets);
-      const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
-      const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-        targetName: applicationTarget.targetName,
-        buildConfiguration: applicationTarget.buildConfiguration,
-      });
-      const buildSettings = xcBuildConfiguration?.buildSettings ?? {};
-      return { buildSettings };
+      return buildConfiguration;
     },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
@@ -90,3 +89,24 @@ export async function prepareIosBuildAsync(
     },
   });
 }
+
+function resolveBuildConfiguration(
+  ctx: BuildContext<Platform.IOS>,
+  targets: Target[]
+): BuildConfiguration {
+  if (ctx.workflow === Workflow.MANAGED) {
+    return { buildSettings: {} };
+  }
+  const applicationTarget = findApplicationTarget(targets);
+  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
+  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  });
+  const buildSettings = xcBuildConfiguration?.buildSettings ?? {};
+  return {
+    buildSettings,
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  };
+}

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

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
 import {
@@ -31,10 +32,12 @@ export async function validateAndSyncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   buildProfile: IosBuildProfile;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const { autoIncrement } = buildProfile;
@@ -44,7 +47,7 @@ export async function validateAndSyncProjectConfigurationAsync({
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }

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

@@ -3,6 +3,7 @@ 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';
 
@@ -10,7 +11,6 @@ import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { evaluateString } from '../utils/template';
 import { readPlistAsync, writePlistAsync } from './plist';
 
 export enum BumpStrategy {
@@ -23,19 +23,21 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir);
+  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist });
+  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -111,10 +113,10 @@ export async function readShortVersionAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
       infoPlist.CFBundleShortVersionString &&
-      evaluateString(infoPlist.CFBundleShortVersionString, buildSettings)
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
     );
   } else {
     return exp.version;
@@ -128,41 +130,84 @@ export async function readBuildNumberAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleVersion && evaluateString(infoPlist.CFBundleVersion, buildSettings);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    return (
+      infoPlist.CFBundleVersion && evaluateTemplateString(infoPlist.CFBundleVersion, buildSettings)
+    );
   } else {
     return IOSConfig.Version.getBuildNumber(exp);
   }
 }
 
+export async function maybeResolveVersionsAsync(
+  projectDir: string,
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  try {
+    return {
+      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
+      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+    };
+  } catch {
+    return {};
+  }
+}
+
 async function writeVersionsToInfoPlistAsync({
   projectDir,
   exp,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<IOSConfig.InfoPlist> {
   let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
   updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist });
+  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
   return updatedInfoPlist;
 }
 
-async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+export function getInfoPlistPath(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  if (buildSettings.INFOPLIST_FILE) {
+    const infoPlistFile = buildSettings.INFOPLIST_FILE.startsWith('"')
+      ? buildSettings.INFOPLIST_FILE.slice(1, -1)
+      : buildSettings.INFOPLIST_FILE;
+    const iosDir = path.join(projectDir, 'ios');
+    const plistPath = evaluateTemplateString(infoPlistFile, {
+      ...buildSettings,
+      SRCROOT: iosDir,
+    });
+    return path.isAbsolute(plistPath) ? plistPath : path.resolve(iosDir, plistPath);
+  } else {
+    return IOSConfig.Paths.getInfoPlistPath(projectDir);
+  }
+}
+
+async function readInfoPlistAsync(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): Promise<IOSConfig.InfoPlist> {
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
   return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
 }
 
 async function writeInfoPlistAsync({
   projectDir,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
   await writePlistAsync(infoPlistPath, infoPlist);
 }
 
@@ -172,3 +217,14 @@ function ensureStaticConfigExists(projectDir: string): void {
     throw new Error('autoIncrement option is not supported when using app.config.js');
   }
 }
+
+export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
+  return s.replace(/\$\((\w+)\)/g, (match, key) => {
+    if (vars.hasOwnProperty(key)) {
+      const value = String(vars[key]);
+      return value.startsWith('"') ? value.slice(1, -1) : value;
+    } else {
+      return match;
+    }
+  });
+}

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

@@ -11,7 +11,7 @@ const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
 export async function runLocalBuildAsync(job: Job): Promise<void> {
   const execNameOrPath =
     process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
-    (await findWithNodeResolution()) ??
+    (await findWithNodeResolutionAsync()) ??
     PLUGIN_PACKAGE_NAME;
   try {
     const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
@@ -31,7 +31,7 @@ export async function runLocalBuildAsync(job: Job): Promise<void> {
   }
 }
 
-async function findWithNodeResolution(): Promise<string | undefined> {
+async function findWithNodeResolutionAsync(): Promise<string | undefined> {
   try {
     const resolvedPath = path.resolve(
       path.dirname(require.resolve(PLUGIN_PACKAGE_NAME)),

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

@@ -3,6 +3,7 @@ import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
 import { getApplicationIdAsync } from '../project/android/applicationId';
+import { GradleBuildContext } from '../project/android/gradle';
 import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
 import { getUsername } from '../project/projectUtils';
 import { ensureLoggedInAsync } from '../user/actions';
@@ -11,13 +12,13 @@ import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
 } from './android/UpdatesModule';
-import { readVersionCodeAsync, readVersionNameAsync } from './android/version';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from './ios/UpdatesModule';
-import { readBuildNumberAsync, readShortVersionAsync } from './ios/version';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { isExpoUpdatesInstalled } from './utils/updates';
 
 /**
@@ -28,16 +29,21 @@ import { isExpoUpdatesInstalled } from './utils/updates';
 const packageJSON = require('../../package.json');
 
 export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
-  ? object
+  ? AndroidMetadataContext
   : IosMetadataContext;
 
+export interface AndroidMetadataContext {
+  gradleContext?: GradleBuildContext;
+}
 export interface IosMetadataContext {
   buildSettings: XCBuildConfiguration['buildSettings'];
+  targetName?: string;
+  buildConfiguration?: string;
 }
 
-export async function collectMetadata<T extends Platform>(
+export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
+  platformContext: MetadataContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
@@ -46,8 +52,7 @@ export async function collectMetadata<T extends Platform>(
       : ctx.buildProfile.distribution) ?? 'store';
   const metadata = {
     trackingContext: ctx.trackingCtx,
-    appVersion: await resolveAppVersionAsync(ctx, platformContext),
-    appBuildVersion: await resolveAppBuildVersionAsync(ctx, platformContext),
+    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
     cliVersion: packageJSON.version,
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
@@ -56,7 +61,7 @@ export async function collectMetadata<T extends Platform>(
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
-    appIdentifier: await resolveAppIdentifierAsync(ctx),
+    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
     buildProfile: ctx.buildProfileName,
     gitCommitHash: await vcs.getCommitHashAsync(),
     username: getUsername(ctx.exp, await ensureLoggedInAsync()),
@@ -69,38 +74,38 @@ export async function collectMetadata<T extends Platform>(
   return sanitizeMetadata(metadata);
 }
 
-async function resolveAppVersionAsync<T extends Platform>(
+async function maybeResolveVersionsAsync<T extends Platform>(
   ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
-): Promise<string | undefined> {
+  platformContext: MetadataContext<T>
+): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext | undefined;
-    return await readShortVersionAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
+    const iosContext = platformContext as IosMetadataContext;
+    return await maybeResolveIosVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      iosContext?.buildSettings ?? {}
+    );
+  } else if (ctx.platform === Platform.ANDROID) {
+    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
+    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
   } else {
-    return await readVersionNameAsync(ctx.projectDir, ctx.exp);
-  }
-}
-
-async function resolveAppBuildVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
-): Promise<string | undefined> {
-  if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext | undefined;
-    return await readBuildNumberAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
-  } else {
-    const versionCode = await readVersionCodeAsync(ctx.projectDir, ctx.exp);
-    return versionCode !== undefined ? String(versionCode) : undefined;
+    throw new Error(`Unsupported platform ${ctx.platform}`);
   }
 }
 
 async function resolveAppIdentifierAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
 ): Promise<string> {
   if (ctx.platform === Platform.IOS) {
-    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
+    const iosContext = platformContext as IosMetadataContext;
+    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp, {
+      targetName: iosContext.targetName,
+      buildConfiguration: iosContext.buildConfiguration,
+    });
   } else {
-    return await getApplicationIdAsync(ctx.projectDir, ctx.exp);
+    const androidContext = platformContext as AndroidMetadataContext;
+    return await getApplicationIdAsync(ctx.projectDir, ctx.exp, androidContext.gradleContext);
   }
 }
 

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

@@ -1,9 +1,3 @@
-export enum RequestedPlatform {
-  Android = 'android',
-  Ios = 'ios',
-  All = 'all',
-}
-
 export enum BuildStatus {
   NEW = 'new',
   IN_QUEUE = 'in-queue',

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

@@ -3,9 +3,12 @@ import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 
 import Log from '../../log';
-import { requestedPlatformDisplayNames } from '../constants';
+import { requestedPlatformDisplayNames } from '../../platform';
 
-export function logCredentialsSource(credentialsSource: CredentialsSource, platform: Platform) {
+export function logCredentialsSource(
+  credentialsSource: CredentialsSource,
+  platform: Platform
+): void {
   let message = `Using ${credentialsSource} ${requestedPlatformDisplayNames[platform]} credentials`;
   if (credentialsSource === CredentialsSource.LOCAL) {
     message += ` ${chalk.dim('(credentials.json)')}`;

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

@@ -0,0 +1,116 @@
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
+import chalk from 'chalk';
+import resolveFrom from 'resolve-from';
+
+import { toAppPlatform } from '../../graphql/types/AppPlatform';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames } from '../../platform';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { confirmAsync } from '../../prompts';
+import { expoCommandAsync } from '../../utils/expoCommand';
+import zipObject from '../../utils/expodash/zipObject';
+import { reviewAndCommitChangesAsync } from './repository';
+
+export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
+  projectDir,
+  platforms,
+  profile,
+  nonInteractive = false,
+}: {
+  projectDir: string;
+  platforms: Platform[];
+  profile: string;
+  nonInteractive?: boolean;
+}): Promise<void> {
+  if (await isExpoDevClientInstalledAsync(projectDir)) {
+    return;
+  }
+
+  const easJsonReader = new EasJsonReader(projectDir);
+  const devClientPerPlatformList = await Promise.all(
+    platforms.map(async platform => {
+      const buildProfile = await easJsonReader.readBuildProfileAsync(platform, profile);
+      return buildProfile.developmentClient ?? false;
+    })
+  );
+
+  const isDevClientRequired = devClientPerPlatformList.some(i => i);
+  if (!isDevClientRequired) {
+    return;
+  }
+
+  const devClientPerPlatform = zipObject(platforms, devClientPerPlatformList);
+  const platformsToCheck = platforms.filter(platform => devClientPerPlatform[platform]);
+  const workflowPerPlatformList = await Promise.all(
+    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
+  );
+
+  Log.newLine();
+  Log.error(
+    `You want to build a development client build for platforms: ${platformsToCheck
+      .map(i => chalk.bold(appPlatformDisplayNames[toAppPlatform(i)]))
+      .join(', ')}`
+  );
+  Log.error(
+    `However, we detected that you don't have ${chalk.bold(
+      'expo-dev-client'
+    )} installed for your project.`
+  );
+  const areAllManaged = workflowPerPlatformList.every(i => i === Workflow.MANAGED);
+  if (areAllManaged) {
+    const install = await confirmAsync({
+      message: 'Do you want EAS CLI to install expo-dev-client for you?',
+      instructions: 'The command will abort unless you agree.',
+    });
+    if (install) {
+      await installExpoDevClientAsync(projectDir, { nonInteractive });
+    } else {
+      error(`Install ${chalk.bold('expo-dev-client')} on your own and come back later.`, {
+        exit: 1,
+      });
+    }
+  } else {
+    Log.warn(`Unfortunately, you need to install ${chalk.bold('expo-dev-client')} on your own.`);
+    Log.warn(
+      learnMore('https://docs.expo.dev/clients/installation/', {
+        learnMoreMessage: 'See installation instructions on how to do it',
+        dim: false,
+      })
+    );
+    Log.warn('If you proceed anyway, you might not get the build you want.');
+    Log.newLine();
+    const shouldContinue = await confirmAsync({
+      message: 'Do you want to proceed anyway?',
+      initial: false,
+    });
+    if (!shouldContinue) {
+      error('Come back later', { exit: 1 });
+    }
+  }
+}
+
+async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolean> {
+  try {
+    resolveFrom(projectDir, 'expo-dev-client/package.json');
+    return true;
+  } catch (err: any) {
+    Log.debug(err);
+    return false;
+  }
+}
+
+async function installExpoDevClientAsync(
+  projectDir: string,
+  { nonInteractive }: { nonInteractive: boolean }
+): Promise<void> {
+  Log.newLine();
+  Log.log(`Running ${chalk.bold('expo install expo-dev-client')}`);
+  Log.newLine();
+  await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
+  Log.newLine();
+  await reviewAndCommitChangesAsync('Install expo-dev-client', {
+    nonInteractive,
+  });
+}

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

@@ -9,7 +9,7 @@ import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
 import { getBuildLogsUrl } from './url';
 
-export function formatGraphQLBuild(build: BuildFragment) {
+export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);
   const fields: { label: string; value?: string | null }[] = [
     { label: 'ID', value: build.id },

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

@@ -1,11 +1,11 @@
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import ora from 'ora';
 import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
 import Log from '../../log';
+import { ora } from '../../ora';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
@@ -121,3 +121,55 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
 
   return { size, path: tarPath };
 }
+
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Abort,
+}
+
+export async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
+): Promise<void> {
+  if (process.env.EAS_BUILD_AUTOCOMMIT) {
+    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+    Log.withTick('Committed changes.');
+    return;
+  }
+  if (nonInteractive) {
+    throw new Error(
+      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode or set EAS_BUILD_AUTOCOMMIT=1 in your environment.'
+    );
+  }
+  const { selected } = await promptAsync({
+    type: 'select',
+    name: 'selected',
+    message: 'Can we commit these changes to git for you?',
+    choices: [
+      { title: 'Yes', value: ShouldCommitChanges.Yes },
+      ...(askedFirstTime
+        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
+        : []),
+      {
+        title: 'Abort build process',
+        value: ShouldCommitChanges.Abort,
+      },
+    ],
+  });
+
+  if (selected === ShouldCommitChanges.Abort) {
+    throw new Error(
+      "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
+    );
+  } else if (selected === ShouldCommitChanges.Yes) {
+    await commitPromptAsync({ initialCommitMessage });
+    Log.withTick('Committed changes.');
+  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
+      nonInteractive,
+      askedFirstTime: false,
+    });
+  }
+}

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

@@ -1,5 +0,0 @@
-import template from 'lodash/template';
-
-export function evaluateString(s: string, vars: Record<string, any>): string {
-  return template(s, { interpolate: /\$\(([\s\S]+?)\)/g })(vars);
-}

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

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

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

@@ -25,7 +25,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const rootDir = await vcs.getRootPathAsync();
+  const rootDir = path.normalize(await vcs.getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&

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

@@ -16,11 +16,16 @@ export default abstract class EasCommand extends Command {
    */
   protected requiresAuthentication = true;
 
-  async init() {
+  protected abstract runAsync(): Promise<any>;
+
+  // eslint-disable-next-line async-protect/async-suffix
+  async run(): Promise<any> {
     await initAnalyticsAsync();
 
     if (this.requiresAuthentication) {
-      await ensureLoggedInAsync();
+      const { flags } = this.parse();
+      const nonInteractive = (flags as any)['non-interactive'] ?? false;
+      await ensureLoggedInAsync({ nonInteractive });
     } else {
       await getUserAsync();
     }
@@ -29,9 +34,11 @@ export default abstract class EasCommand extends Command {
       // commands/submit === submit, commands/build/list === build:list
       action: `eas ${this.id}`,
     });
+    return this.runAsync();
   }
 
-  async finally(err: Error) {
+  // eslint-disable-next-line async-protect/async-suffix
+  async finally(err: Error): Promise<any> {
     await flushAnalyticsAsync();
     return super.finally(err);
   }

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../__tests__/utils';
 import { flushAsync, initAsync, logEvent } from '../../analytics';
 import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
 import { getUserAsync } from '../../user/User';
@@ -19,12 +20,27 @@ jest.mock('../../analytics', () => {
   };
 });
 
+let originalProcessArgv: string[];
+
+beforeAll(() => {
+  originalProcessArgv = process.argv;
+  process.argv = [];
+});
+
+afterAll(() => {
+  process.argv = originalProcessArgv;
+});
+
 beforeEach(() => {
-  (getUserAsync as jest.Mock).mockReset().mockImplementation(() => mockJester);
-  (ensureLoggedInAsync as jest.Mock).mockReset().mockImplementation(() => mockJester);
-  (initAsync as jest.Mock).mockReset();
-  (flushAsync as jest.Mock).mockReset();
-  (logEvent as jest.Mock).mockReset();
+  asMock(getUserAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(ensureLoggedInAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(initAsync).mockReset();
+  asMock(flushAsync).mockReset();
+  asMock(logEvent).mockReset();
 });
 
 describe(EasCommand.name, () => {
@@ -43,7 +59,7 @@ describe(EasCommand.name, () => {
     }, 15_000);
 
     it('ensures the user data is read from cache', async () => {
-      (TestEasCommand.prototype.authValue as jest.Mock).mockImplementationOnce(() => false);
+      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
 
       await TestEasCommand.run();
 

packages/eas-cli/src/commandUtils/__tests__/TestEasCommand.ts

@@ -3,11 +3,11 @@ import EasCommand from '../EasCommand';
 export default class TestEasCommand extends EasCommand {
   requiresAuthentication = this.authValue();
 
-  authValue() {
+  authValue(): boolean {
     return false;
   }
 
-  async run() {}
+  async runAsync(): Promise<void> {}
 }
 
 TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not

packages/eas-cli/src/commands/account/login.ts

@@ -1,15 +1,14 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { showLoginPromptAsync } from '../../user/actions';
 
-export default class AccountLogin extends Command {
+export default class AccountLogin extends EasCommand {
   static description = 'log in with your Expo account';
-
   static aliases = ['login'];
 
-  async run() {
-    Log.log('Log in to EAS');
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     await showLoginPromptAsync();
     Log.log('Logged in');
   }

packages/eas-cli/src/commands/account/logout.ts

@@ -1,14 +1,14 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { logoutAsync } from '../../user/User';
 
-export default class AccountLogout extends Command {
+export default class AccountLogout extends EasCommand {
   static description = 'log out';
-
   static aliases = ['logout'];
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     await logoutAsync();
     Log.log('Logged out');
   }

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

@@ -1,15 +1,16 @@
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { getActorDisplayName, getUserAsync } from '../../user/User';
 
-export default class AccountView extends Command {
+export default class AccountView extends EasCommand {
   static description = 'show the username you are logged in as';
-
   static aliases = ['whoami'];
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     const user = await getUserAsync();
     if (user) {
       Log.log(chalk.green(getActorDisplayName(user)));

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

@@ -1,23 +1,24 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
 import UserSettings from '../user/UserSettings';
 
-export default class AnalyticsView extends Command {
+export default class AnalyticsView extends EasCommand {
   static description = 'view or change analytics settings';
 
   static args = [{ name: 'STATUS', options: ['on', 'off'] }];
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     const { STATUS: status } = this.parse(AnalyticsView).args;
     if (status) {
-      await UserSettings.setAsync('amplitudeEnabled', status === 'on');
+      await UserSettings.setAsync('analyticsEnabled', status === 'on');
       Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
     } else {
-      const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+      const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', null);
       Log.log(
         `Analytics are ${
-          amplitudeEnabled === false ? 'disabled' : 'enabled'
+          analyticsEnabled === false ? 'disabled' : 'enabled'
         } on this eas-cli installation.`
       );
     }

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateBranchForAppMutation,
@@ -49,7 +50,7 @@ export async function createUpdateBranchOnAppAsync({
   return newBranch;
 }
 
-export default class BranchCreate extends Command {
+export default class BranchCreate extends EasCommand {
   static hidden = true;
   static description = 'Create a branch on the current project.';
 
@@ -68,7 +69,7 @@ export default class BranchCreate extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags,

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateBranchMutation,
@@ -73,7 +74,7 @@ async function deleteBranchOnAppAsync({
   return data.updateBranch.deleteUpdateBranch;
 }
 
-export default class BranchDelete extends Command {
+export default class BranchDelete extends EasCommand {
   static hidden = true;
   static description = 'Republish an update group';
 
@@ -91,7 +92,7 @@ export default class BranchDelete extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags: { json: jsonFlag },

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

@@ -1,18 +1,29 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
+import { print } from 'graphql';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { BranchesByAppQuery, BranchesByAppQueryVariables } from '../../graphql/generated';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+} from '../../graphql/generated';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 
 const BRANCHES_LIMIT = 10_000;
 
-export async function listBranchesAsync({ projectId }: { projectId: string }) {
+export async function listBranchesAsync({
+  projectId,
+}: {
+  projectId: string;
+}): Promise<UpdateBranchFragment[]> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
@@ -23,29 +34,12 @@ export async function listBranchesAsync({ projectId }: { projectId: string }) {
                 id
                 updateBranches(offset: 0, limit: $limit) {
                   id
-                  name
-                  updates(offset: 0, limit: 10) {
-                    id
-                    actor {
-                      __typename
-                      id
-                      ... on User {
-                        username
-                      }
-                      ... on Robot {
-                        firstName
-                      }
-                    }
-                    createdAt
-                    message
-                    runtimeVersion
-                    group
-                    platform
-                  }
+                  ...UpdateBranchFragment
                 }
               }
             }
           }
+          ${print(UpdateBranchFragmentNode)}
         `,
         {
           appId: projectId,
@@ -58,7 +52,7 @@ export async function listBranchesAsync({ projectId }: { projectId: string }) {
   return data?.app?.byId.updateBranches ?? [];
 }
 
-export default class BranchList extends Command {
+export default class BranchList extends EasCommand {
   static hidden = true;
 
   static description = 'List all branches on this project.';
@@ -70,7 +64,7 @@ export default class BranchList extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(BranchList);
 
     const projectDir = await findProjectRootAsync(process.cwd());

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

@@ -1,13 +1,12 @@
 import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
 import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
 import dateFormat from 'dateformat';
 import gql from 'graphql-tag';
-import { uniqBy } from 'lodash';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetUpdateGroupAsyncQuery,
@@ -20,6 +19,7 @@ import {
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log from '../../log';
+import { ora } from '../../ora';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import {
   PublishPlatform,
@@ -30,6 +30,7 @@ import {
 } from '../../project/publish';
 import { promptAsync, selectAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
+import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import vcs from '../../vcs';
 import { createUpdateBranchOnAppAsync } from './create';
@@ -66,7 +67,7 @@ async function getUpdateGroupAsync({
   return updatesByGroup;
 }
 
-async function ensureBranchExists({
+async function ensureBranchExistsAsync({
   appId,
   name: branchName,
 }: {
@@ -93,7 +94,7 @@ async function ensureBranchExists({
   return { id: newUpdateBranch.id, updates: [] };
 }
 
-export default class BranchPublish extends Command {
+export default class BranchPublish extends EasCommand {
   static hidden = true;
   static description = 'Publish an update group to a branch.';
 
@@ -144,7 +145,7 @@ export default class BranchPublish extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: branchName },
       flags: {
@@ -201,7 +202,7 @@ export default class BranchPublish extends Command {
       assert(branchName, 'branch name must be specified.');
     }
 
-    const { id: branchId, updates } = await ensureBranchExists({
+    const { id: branchId, updates } = await ensureBranchExistsAsync({
       appId: projectId,
       name: branchName,
     });

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   EditUpdateBranchInput,
@@ -49,7 +50,7 @@ async function renameUpdateBranchOnAppAsync({
   return data.updateBranch.editUpdateBranch;
 }
 
-export default class BranchRename extends Command {
+export default class BranchRename extends EasCommand {
   static hidden = true;
   static description = 'Rename a branch.';
 
@@ -68,7 +69,7 @@ export default class BranchRename extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       flags: { json: jsonFlag, from: currentName, to: newName },
     } = this.parse(BranchRename);

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

@@ -1,16 +1,17 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import gql from 'graphql-tag';
-import { groupBy } from 'lodash';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import groupBy from '../../utils/expodash/groupBy';
 import formatFields from '../../utils/formatFields';
 
 const PAGE_LIMIT = 10_000;
@@ -64,7 +65,7 @@ export async function viewUpdateBranchAsync({
   return data;
 }
 
-export default class BranchView extends Command {
+export default class BranchView extends EasCommand {
   static hidden = true;
   static description = 'View a branch.';
 
@@ -83,7 +84,7 @@ export default class BranchView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags: { json: jsonFlag },

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

@@ -1,9 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   Build,
@@ -13,6 +12,7 @@ import {
 } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
 import { appPlatformEmojis } from '../../platform';
 import {
   findProjectRootAsync,
@@ -109,12 +109,12 @@ async function ensureBuildExistsAsync(buildId: string): Promise<void> {
   }
 }
 
-export default class BuildCancel extends Command {
+export default class BuildCancel extends EasCommand {
   static description = 'Cancel a build.';
 
   static args = [{ name: 'BUILD_ID' }];
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();

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

@@ -1,14 +1,14 @@
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
 import { configureAsync } from '../../build/configure';
-import { RequestedPlatform } from '../../build/types';
+import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
+import { RequestedPlatform } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class BuildConfigure extends Command {
+export default class BuildConfigure extends EasCommand {
   static description = 'Configure the project to support EAS Build.';
 
   static flags = {
@@ -19,7 +19,7 @@ export default class BuildConfigure extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(BuildConfigure);
     Log.log(
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
@@ -29,7 +29,6 @@ export default class BuildConfigure extends Command {
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
-    await ensureLoggedInAsync();
     await configureAsync({
       platform,
       projectDir: (await findProjectRootAsync()) ?? process.cwd(),
@@ -40,7 +39,7 @@ export default class BuildConfigure extends Command {
   }
 }
 
-function logSuccess(platform: RequestedPlatform) {
+function logSuccess(platform: RequestedPlatform): void {
   let platformsText = 'iOS and Android projects are';
   let storesText = 'the Apple App Store or Google Play Store';
 

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

@@ -6,26 +6,41 @@ import {
   migrateAsync,
 } from '@expo/eas-json';
 import { flags } from '@oclif/command';
-import { error, exit } from '@oclif/errors';
+import { error } from '@oclif/errors';
+import chalk from 'chalk';
 
 import { prepareAndroidBuildAsync } from '../../build/android/build';
 import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
 import { ensureProjectConfiguredAsync } from '../../build/configure';
 import { BuildContext, createBuildContextAsync } from '../../build/context';
 import { prepareIosBuildAsync } from '../../build/ios/build';
-import { RequestedPlatform } from '../../build/types';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build/utils/devClient';
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { BuildFragment, BuildStatus } from '../../graphql/generated';
+import { BuildFragment, BuildStatus, SubmissionFragment } from '../../graphql/generated';
+import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
 import Log from '../../log';
+import {
+  RequestedPlatform,
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  selectRequestedPlatformAsync,
+  toPlatforms,
+} from '../../platform';
 import {
   EAS_UNAVAILABLE_MESSAGE,
   isEasEnabledForProjectAsync,
 } from '../../project/isEasEnabledForProject';
 import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../prompts';
+import { confirmAsync } from '../../prompts';
+import { createSubmissionContext } from '../../submit/context';
+import {
+  submitAsync,
+  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
+} from '../../submit/submit';
+import { printSubmissionDetailsUrls } from '../../submit/utils/urls';
 import { enableJsonOutput } from '../../utils/json';
 import vcs from '../../vcs';
 
@@ -39,6 +54,8 @@ interface RawBuildFlags {
   wait: boolean;
   'clear-cache': boolean;
   json: boolean;
+  'auto-submit': boolean;
+  'auto-submit-with-profile'?: string;
 }
 
 interface BuildFlags {
@@ -50,13 +67,18 @@ interface BuildFlags {
   wait: boolean;
   clearCache: boolean;
   json: boolean;
+  autoSubmit: boolean;
+  submitProfile?: string;
 }
 
 export default class Build extends EasCommand {
   static description = 'start a build';
 
   static flags = {
-    platform: flags.enum({ char: 'p', options: ['android', 'ios', 'all'] }),
+    platform: flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
     'skip-credentials-check': flags.boolean({
       default: false,
       hidden: true,
@@ -72,10 +94,11 @@ export default class Build extends EasCommand {
     profile: flags.string({
       default: 'release',
       description: 'Name of the build profile from eas.json',
+      helpValue: 'PROFILE_NAME',
     }),
     'non-interactive': flags.boolean({
       default: false,
-      description: 'Run command in --non-interactive mode',
+      description: 'Run command in non-interactive mode',
     }),
     local: flags.boolean({
       default: false,
@@ -90,9 +113,22 @@ export default class Build extends EasCommand {
       default: false,
       description: 'Clear cache before the build',
     }),
+    'auto-submit': flags.boolean({
+      default: false,
+      description:
+        'Submit on build complete using the submit profile with the same name as the build profile',
+      exclusive: ['auto-submit-with-profile'],
+    }),
+    'auto-submit-with-profile': flags.string({
+      description: 'Submit on build complete using the submit profile with provided name',
+      helpValue: 'PROFILE_NAME',
+      exclusive: ['auto-submit'],
+    }),
   };
 
-  async run(): Promise<void> {
+  private metroConfigValidated = false;
+
+  async runAsync(): Promise<void> {
     const { flags: rawFlags } = this.parse(Build);
     if (rawFlags.json) {
       enableJsonOutput();
@@ -108,33 +144,22 @@ export default class Build extends EasCommand {
 
     await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
 
-    const easJsonReader = new EasJsonReader(projectDir);
-    const platformsToBuild = this.getPlatformsToBuild(requestedPlatform);
+    const platforms = toPlatforms(requestedPlatform);
+    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+      platforms,
+      projectDir,
+      profile: flags.profile,
+      nonInteractive: flags.nonInteractive,
+    });
 
     const startedBuilds: BuildFragment[] = [];
-    let metroConfigValidated = false;
-    for (const platform of platformsToBuild) {
-      const ctx = await createBuildContextAsync({
-        buildProfileName: flags.profile,
-        clearCache: flags.clearCache,
-        buildProfile: await easJsonReader.readBuildProfileAsync(platform, flags.profile),
-        local: flags.local,
-        nonInteractive: flags.nonInteractive,
-        platform,
+    for (const platform of platforms) {
+      const maybeBuild = await this.prepareAndStartBuildAsync({
         projectDir,
-        skipProjectConfiguration: flags.skipProjectConfiguration,
+        platform,
+        flags,
+        moreBuilds: platforms.length > 1,
       });
-
-      if (ctx.workflow === Workflow.MANAGED && !metroConfigValidated) {
-        await validateMetroConfigForManagedWorkflowAsync(ctx);
-        metroConfigValidated = true;
-      }
-
-      if (!ctx.local && !(await isEasEnabledForProjectAsync(ctx.projectId))) {
-        error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
-      }
-
-      const maybeBuild = await this.startBuildAsync(ctx);
       if (maybeBuild) {
         startedBuilds.push(maybeBuild);
       }
@@ -147,10 +172,38 @@ export default class Build extends EasCommand {
     printLogsUrls(startedBuilds);
     Log.newLine();
 
-    if (flags.wait) {
-      const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
-      printBuildResults(builds, flags.json);
+    const submissions: SubmissionFragment[] = [];
+    if (flags.autoSubmit) {
+      for (const build of startedBuilds) {
+        const submission = await this.prepareAndStartSubmissionAsync({
+          projectDir,
+          build,
+          flags,
+          moreBuilds: startedBuilds.length > 1,
+        });
+        submissions.push(submission);
+      }
+
+      Log.newLine();
+      printSubmissionDetailsUrls(submissions);
+      Log.newLine();
+    }
+
+    if (!flags.wait) {
+      return;
+    }
+
+    const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
+    printBuildResults(builds, flags.json);
+
+    const haveAllBuildsFailedOrCanceled = builds.every(
+      build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
+    );
+    if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
       this.exitWithNonZeroCodeIfSomeBuildsFailed(builds);
+    } else {
+      // the following function also exits with non zero code if any of the submissions failed
+      await waitForSubmissionsToCompleteAsync(submissions);
     }
   }
 
@@ -162,10 +215,14 @@ export default class Build extends EasCommand {
     if (flags.json && !nonInteractive) {
       error('--json is allowed only when building in non-interactive mode', { exit: 1 });
     }
-    const requestedPlatform =
-      (flags.platform as RequestedPlatform | undefined) ?? (await this.promptForPlatformAsync());
 
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
     if (flags.local) {
+      if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
+        // TODO: implement this
+        error('Auto-submits are not yet supported when building locally', { exit: 1 });
+      }
+
       if (requestedPlatform === RequestedPlatform.All) {
         error('Builds for multiple platforms are not supported with flag --local', { exit: 1 });
       } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
@@ -181,40 +238,66 @@ export default class Build extends EasCommand {
       Log.newLine();
     }
 
+    const profile = flags['profile'];
     return {
       requestedPlatform,
       skipProjectConfiguration: flags['skip-project-configuration'],
-      profile: flags['profile'],
+      profile,
       nonInteractive,
       local: flags['local'],
       wait: flags['wait'],
       clearCache: flags['clear-cache'],
       json: flags['json'],
+      autoSubmit: flags['auto-submit'],
+      submitProfile: flags['auto-submit-with-profile'] ?? profile,
     };
   }
 
-  private async promptForPlatformAsync(): Promise<RequestedPlatform> {
-    const { platform } = await promptAsync({
-      type: 'select',
-      message: 'Build for platforms',
-      name: 'platform',
-      choices: [
-        { title: 'All', value: RequestedPlatform.All },
-        { title: 'iOS', value: RequestedPlatform.Ios },
-        { title: 'Android', value: RequestedPlatform.Android },
-      ],
-    });
-    return platform;
-  }
+  private async prepareAndStartBuildAsync({
+    projectDir,
+    platform,
+    flags,
+    moreBuilds,
+  }: {
+    projectDir: string;
+    platform: Platform;
+    flags: BuildFlags;
+    moreBuilds: boolean;
+  }): Promise<BuildFragment | undefined> {
+    const easJsonReader = new EasJsonReader(projectDir);
+    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
 
-  private getPlatformsToBuild(requestedPlatform: RequestedPlatform): Platform[] {
-    if (requestedPlatform === RequestedPlatform.All) {
-      return [Platform.ANDROID, Platform.IOS];
-    } else if (requestedPlatform === RequestedPlatform.Android) {
-      return [Platform.ANDROID];
-    } else {
-      return [Platform.IOS];
+    const buildCtx = await createBuildContextAsync({
+      buildProfileName: flags.profile,
+      clearCache: flags.clearCache,
+      buildProfile,
+      local: flags.local,
+      nonInteractive: flags.nonInteractive,
+      platform,
+      projectDir,
+      skipProjectConfiguration: flags.skipProjectConfiguration,
+    });
+
+    if (moreBuilds) {
+      Log.newLine();
+      const appPlatform = toAppPlatform(platform);
+      Log.log(
+        `${appPlatformEmojis[appPlatform]} ${chalk.bold(
+          `${appPlatformDisplayNames[appPlatform]} build`
+        )}`
+      );
     }
+
+    if (buildCtx.workflow === Workflow.MANAGED && !this.metroConfigValidated) {
+      await validateMetroConfigForManagedWorkflowAsync(buildCtx);
+      this.metroConfigValidated = true;
+    }
+
+    if (!buildCtx.local && !(await isEasEnabledForProjectAsync(buildCtx.projectId))) {
+      error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
+    }
+
+    return await this.startBuildAsync(buildCtx);
   }
 
   private async startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
@@ -227,12 +310,49 @@ export default class Build extends EasCommand {
     return await sendBuildRequestAsync();
   }
 
+  private async prepareAndStartSubmissionAsync({
+    projectDir,
+    build,
+    flags,
+    moreBuilds,
+  }: {
+    projectDir: string;
+    build: BuildFragment;
+    flags: BuildFlags;
+    moreBuilds: boolean;
+  }): Promise<SubmissionFragment> {
+    const easJsonReader = new EasJsonReader(projectDir);
+    const platform = toPlatform(build.platform);
+    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
+    const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
+    const submissionCtx = createSubmissionContext({
+      platform,
+      projectDir,
+      projectId: build.project.id,
+      profile: submitProfile,
+      archiveFlags: { id: build.id },
+      nonInteractive: flags.nonInteractive,
+      env: buildProfile.env,
+    });
+
+    if (moreBuilds) {
+      Log.newLine();
+      Log.log(
+        `${appPlatformEmojis[build.platform]} ${chalk.bold(
+          `${appPlatformDisplayNames[build.platform]} submission`
+        )}`
+      );
+    }
+
+    return await submitAsync(submissionCtx);
+  }
+
   private exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
     const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
       i => i.status === BuildStatus.Errored
     );
     if (failedBuilds.length > 0) {
-      exit(1);
+      process.exit(1);
     }
   }
 }

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

@@ -1,10 +1,10 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
-import ora from 'ora';
 
-import { BuildDistributionType, BuildStatus, RequestedPlatform } from '../../build/types';
+import { BuildDistributionType, BuildStatus } from '../../build/types';
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
 import {
   AppPlatform,
   DistributionType,
@@ -12,6 +12,8 @@ import {
 } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -19,7 +21,7 @@ import {
 } from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-export default class BuildList extends Command {
+export default class BuildList extends EasCommand {
   static description = 'list all builds for your project';
 
   static flags = {
@@ -57,7 +59,7 @@ export default class BuildList extends Command {
     limit: flags.integer(),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(BuildList);
     const {
       json,

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

@@ -1,11 +1,12 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
-import ora from 'ora';
+import { flags } from '@oclif/command';
 
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
 import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -13,7 +14,7 @@ import {
 } from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-export default class BuildView extends Command {
+export default class BuildView extends EasCommand {
   static description = 'view a build for your project';
 
   static args = [{ name: 'BUILD_ID' }];
@@ -24,7 +25,7 @@ export default class BuildView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       args: { BUILD_ID: buildId },
       flags,

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateChannelOnAppMutation,
@@ -57,7 +58,7 @@ async function createUpdateChannelOnAppAsync({
   );
 }
 
-export default class ChannelCreate extends Command {
+export default class ChannelCreate extends EasCommand {
   static hidden = true;
   static description = 'Create a channel on the current project.';
 
@@ -77,7 +78,7 @@ export default class ChannelCreate extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetChannelByNameToEditQuery,
@@ -92,7 +93,7 @@ export async function updateChannelBranchMappingAsync({
   return data.updateChannel.editUpdateChannel!;
 }
 
-export default class ChannelEdit extends Command {
+export default class ChannelEdit extends EasCommand {
   static hidden = true;
   static description = 'Point a channel at a new branch.';
 
@@ -114,7 +115,7 @@ export default class ChannelEdit extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { branch: branchName, json: jsonFlag },

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

@@ -1,7 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetAllChannelsForAppQuery,
@@ -63,7 +64,7 @@ async function getAllUpdateChannelForAppAsync({
   );
 }
 
-export default class ChannelList extends Command {
+export default class ChannelList extends EasCommand {
   static hidden = true;
   static description = 'List all channels on the current project.';
 
@@ -74,7 +75,7 @@ export default class ChannelList extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       flags: { json: jsonFlag },
     } = this.parse(ChannelList);

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

@@ -1,7 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
 import Log from '../../log';
 import {
@@ -305,7 +306,7 @@ async function endRolloutAsync({
   return { newChannelInfo, logMessage };
 }
 
-export default class ChannelRollout extends Command {
+export default class ChannelRollout extends EasCommand {
   static hidden = true;
   static description = 'Rollout a new branch out to a channel incrementally.';
 
@@ -336,7 +337,7 @@ export default class ChannelRollout extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       args: { channel: channelName },
       flags: { json: jsonFlag, end: endFlag },

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

@@ -1,10 +1,11 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetChannelByNameForAppQuery,
@@ -189,7 +190,7 @@ export function logChannelDetails(channel: {
   Log.log(table.toString());
 }
 
-export default class ChannelView extends Command {
+export default class ChannelView extends EasCommand {
   static hidden = true;
   static description = 'View a channel on the current project.';
 
@@ -208,7 +209,7 @@ export default class ChannelView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },

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

@@ -1,15 +1,16 @@
 import { getProjectConfigDescription } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonReader } from '@expo/eas-json';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 
+import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
 import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync } from '../project/projectUtils';
 import { selectAsync } from '../prompts';
 import { handleDeprecatedEasJsonAsync } from './build';
 
-export default class Config extends Command {
+export default class Config extends EasCommand {
   static description = 'show the eas.json config';
 
   static flags = {
@@ -17,7 +18,9 @@ export default class Config extends Command {
     profile: flags.string(),
   };
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(Config);
     const { platform: maybePlatform, profile: maybeProfile } = flags as {
       platform?: Platform;

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

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

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

@@ -1,17 +1,16 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import AppStoreApi from '../../credentials/ios/appstore/AppStoreApi';
-import { createContext } from '../../devices/context';
+import { createContextAsync } from '../../devices/context';
 import DeviceManager from '../../devices/manager';
 import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class DeviceCreate extends Command {
+export default class DeviceCreate extends EasCommand {
   static description = 'register new Apple Devices to use for internal distribution';
 
-  async run() {
+  async runAsync(): Promise<void> {
     const user = await ensureLoggedInAsync();
 
-    const ctx = await createContext({ appStore: new AppStoreApi(), user });
+    const ctx = await createContextAsync({ appStore: new AppStoreApi(), user });
     const manager = new DeviceManager(ctx);
     await manager.createAsync();
   }

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

@@ -1,31 +1,32 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
+import { Ora, ora } from '../../ora';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 
-export default class BuildList extends Command {
+export default class BuildList extends EasCommand {
   static description = 'list all registered devices for your account';
 
   static flags = {
     'apple-team-id': flags.string(),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let appleTeamIdentifier = this.parse(BuildList).flags['apple-team-id'];
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
-    let spinner: ora.Ora;
+    let spinner: Ora;
 
     if (!appleTeamIdentifier) {
       spinner = ora().start('Fetching the list of teams for the project…');

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

@@ -1,18 +1,18 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
+import { ora } from '../../ora';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 
-export default class DeviceView extends Command {
+export default class DeviceView extends EasCommand {
   static description = 'view a device for your project';
 
   static args = [{ name: 'UDID' }];
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { UDID } = this.parse(DeviceView).args;
 
     if (!UDID) {
@@ -36,7 +36,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
     const spinner = ora().start(`Fetching device details for ${UDID}…`);
 
     try {
-      const device = await AppleDeviceQuery.getByDeviceIdentifier(accountName, UDID);
+      const device = await AppleDeviceQuery.getByDeviceIdentifierAsync(accountName, UDID);
 
       if (device) {
         spinner.succeed('Fetched device details');

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

@@ -1,14 +1,16 @@
-import { Command } from '@oclif/command';
 import envinfo from 'envinfo';
 
+import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
 
 const packageJSON = require('../../package.json');
 
-export default class Diagnostics extends Command {
+export default class Diagnostics extends EasCommand {
   static description = 'log environment info to the console';
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     const info = await envinfo.run(
       {
         System: ['OS', 'Shell'],
@@ -16,14 +18,16 @@ export default class Diagnostics extends Command {
         Utilities: ['Git'],
         npmPackages: [
           'expo',
+          'expo-cli',
           'react',
           'react-dom',
           'react-native',
           'react-native-web',
           'react-navigation',
           '@expo/webpack-config',
+          'expo-dev-client',
         ],
-        npmGlobalPackages: ['eas-cli'],
+        npmGlobalPackages: ['eas-cli', 'expo-cli'],
       },
       {
         title: `EAS CLI ${packageJSON.version} environment info`,

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

@@ -1,7 +1,7 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
@@ -30,10 +30,10 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
   return data;
 }
 
-export default class ProjectInfo extends Command {
+export default class ProjectInfo extends EasCommand {
   static description = 'information about the current project';
 
-  async run() {
+  async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync(process.cwd());
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');

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

@@ -1,15 +1,15 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';
 
-export default class ProjectInit extends Command {
+export default class ProjectInit extends EasCommand {
   static description = 'create or link an EAS project';
   static aliases = ['init'];
 
-  async run() {
+  async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync(process.cwd());
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');

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

@@ -1,7 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
   EnvironmentSecretScope,
@@ -22,7 +23,7 @@ import { findAccountByName } from '../../user/Account';
 import { getActorDisplayName } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class EnvironmentSecretCreate extends Command {
+export default class EnvironmentSecretCreate extends EasCommand {
   static description = 'Create an environment secret on the current project or owner account.';
 
   static flags = {
@@ -43,7 +44,7 @@ export default class EnvironmentSecretCreate extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const actor = await ensureLoggedInAsync();
     let {
       flags: { name, value: secretValue, scope, force },
@@ -123,7 +124,7 @@ export default class EnvironmentSecretCreate extends Command {
         const existingSecret = existingSecrets.find(secret => secret.name === name);
 
         if (existingSecret) {
-          await EnvironmentSecretMutation.delete(existingSecret.id);
+          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
           Log.withTick(
             `Deleting existing secret ${chalk.bold(name)} on project ${chalk.bold(
               `@${accountName}/${slug}`
@@ -132,7 +133,7 @@ export default class EnvironmentSecretCreate extends Command {
         }
       }
 
-      const secret = await EnvironmentSecretMutation.createForApp(
+      const secret = await EnvironmentSecretMutation.createForAppAsync(
         { name, value: secretValue },
         projectId
       );
@@ -149,6 +150,7 @@ export default class EnvironmentSecretCreate extends Command {
       );
     } else if (scope === EnvironmentSecretScope.ACCOUNT) {
       const ownerAccount = findAccountByName(actor.accounts, accountName);
+
       if (!ownerAccount) {
         Log.warn(
           `Your account (${getActorDisplayName(actor)}) doesn't have access to the ${chalk.bold(
@@ -159,11 +161,12 @@ export default class EnvironmentSecretCreate extends Command {
       }
 
       if (force) {
-        const existingSecrets = await EnvironmentSecretsQuery.byAcccountNameAsync(projectId);
+        const existingSecrets = await EnvironmentSecretsQuery.byAccountNameAsync(ownerAccount.name);
         const existingSecret = existingSecrets.find(secret => secret.name === name);
 
         if (existingSecret) {
-          await EnvironmentSecretMutation.delete(existingSecret.id);
+          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
+
           Log.withTick(
             `Deleting existing secret ${chalk.bold(name)} on account ${chalk.bold(
               ownerAccount.name
@@ -172,7 +175,7 @@ export default class EnvironmentSecretCreate extends Command {
         }
       }
 
-      const secret = await EnvironmentSecretMutation.createForAccount(
+      const secret = await EnvironmentSecretMutation.createForAccountAsync(
         { name, value: secretValue },
         ownerAccount.id
       );

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

@@ -1,7 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
   EnvironmentSecretScope,
@@ -19,9 +20,8 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class EnvironmentSecretDelete extends Command {
+export default class EnvironmentSecretDelete extends EasCommand {
   static description = `Delete an environment secret by ID.
 Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
 
@@ -31,9 +31,7 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
     }),
   };
 
-  async run() {
-    await ensureLoggedInAsync();
-
+  async runAsync(): Promise<void> {
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
@@ -93,7 +91,7 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
       process.exit(1);
     }
 
-    await EnvironmentSecretMutation.delete(id);
+    await EnvironmentSecretMutation.deleteAsync(id);
 
     Log.withTick(`️Deleted secret${secret?.name ? ` "${secret?.name}"` : ''} with id "${id}".`);
   }

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

@@ -1,9 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import dateFormat from 'dateformat';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
 import {
@@ -15,14 +15,11 @@ import {
   getProjectAccountNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class EnvironmentSecretList extends Command {
+export default class EnvironmentSecretList extends EasCommand {
   static description = 'Lists environment secrets available for your current app';
 
-  async run(): Promise<void> {
-    await ensureLoggedInAsync();
-
+  async runAsync(): Promise<void> {
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);

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

@@ -1,33 +1,48 @@
 import { getConfig } from '@expo/config';
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonReader, IosSubmitProfile } from '@expo/eas-json';
+import { EasJsonReader } from '@expo/eas-json';
 import { flags } from '@oclif/command';
-import { exit } from '@oclif/errors';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 
 import EasCommand from '../commandUtils/EasCommand';
-import { AppPlatform, SubmissionFragment, SubmissionStatus } from '../graphql/generated';
+import { SubmissionFragment } from '../graphql/generated';
+import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log, { learnMore } from '../log';
-import { appPlatformDisplayNames, appPlatformEmojis } from '../platform';
+import {
+  RequestedPlatform,
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  selectRequestedPlatformAsync,
+  toPlatforms,
+} from '../platform';
 import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
-import { promptAsync } from '../prompts';
-import AndroidSubmitCommand from '../submissions/android/AndroidSubmitCommand';
-import IosSubmitCommand from '../submissions/ios/IosSubmitCommand';
-import { SubmitArchiveFlags } from '../submissions/types';
-import { displayLogsAsync } from '../submissions/utils/logs';
-import { printSubmissionDetailsUrls } from '../submissions/utils/urls';
-import { waitForSubmissionsEndAsync } from '../submissions/utils/wait';
+import { SubmitArchiveFlags, createSubmissionContext } from '../submit/context';
+import { submitAsync, waitToCompleteAsync } from '../submit/submit';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls';
 
-interface Flags {
+interface RawFlags {
+  platform?: string;
+  profile?: string;
+  latest?: boolean;
+  id?: string;
+  path?: string;
+  url?: string;
   verbose: boolean;
   wait: boolean;
-  platform?: Platform;
-  profile?: string;
-  archiveFlags: SubmitArchiveFlags;
+  'non-interactive': boolean;
 }
 
-export default class BuildSubmit extends EasCommand {
+interface Flags {
+  requestedPlatform: RequestedPlatform;
+  profile?: string;
+  archiveFlags: SubmitArchiveFlags;
+  verbose: boolean;
+  wait: boolean;
+  nonInteractive: boolean;
+}
+
+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: '',
@@ -37,7 +52,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
   static flags = {
     platform: flags.enum({
       char: 'p',
-      options: ['android', 'ios'],
+      options: ['android', 'ios', 'all'],
     }),
     profile: flags.string({
       description:
@@ -46,7 +61,6 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
     latest: flags.boolean({
       description: 'Submit the latest build for specified platform',
       exclusive: ['id', 'path', 'url'],
-      default: false,
     }),
     id: flags.string({
       description: 'ID of the build to submit',
@@ -69,13 +83,15 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
       default: true,
       allowNo: true,
     }),
+    'non-interactive': flags.boolean({
+      default: false,
+      description: 'Run command in non-interactive mode',
+    }),
   };
 
-  async run(): Promise<void> {
-    const flags = this.parseFlags();
-    const platform =
-      (flags.platform?.toUpperCase() as AppPlatform | undefined) ??
-      (await this.promptForPlatformAsync());
+  async runAsync(): Promise<void> {
+    const { flags: rawFlags } = this.parse(Submit);
+    const flags = await this.sanitizeFlagsAsync(rawFlags);
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -88,114 +104,72 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
     }
 
     const easJsonReader = new EasJsonReader(projectDir);
-
+    const platforms = toPlatforms(flags.requestedPlatform);
     const submissions: SubmissionFragment[] = [];
-    let iosSubmitProfile: IosSubmitProfile | null = null;
-    if (platform === AppPlatform.Android) {
-      const submitProfile = await easJsonReader.readSubmitProfileAsync(
-        Platform.ANDROID,
-        flags.profile
-      );
-      const ctx = AndroidSubmitCommand.createContext({
+    for (const platform of platforms) {
+      const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
+      const ctx = createSubmissionContext({
+        platform,
         projectDir,
         projectId,
-        profile: submitProfile,
+        profile,
         archiveFlags: flags.archiveFlags,
+        nonInteractive: flags.nonInteractive,
       });
-      const command = new AndroidSubmitCommand(ctx);
-      submissions.push(await command.runAsync());
-    } else {
-      iosSubmitProfile = await easJsonReader.readSubmitProfileAsync(Platform.IOS, flags.profile);
-      const ctx = IosSubmitCommand.createContext({
-        projectDir,
-        projectId,
-        profile: iosSubmitProfile,
-        archiveFlags: flags.archiveFlags,
-      });
-      const command = new IosSubmitCommand(ctx);
-      submissions.push(await command.runAsync());
+
+      if (platforms.length > 1) {
+        Log.newLine();
+        const appPlatform = toAppPlatform(platform);
+        Log.log(
+          `${appPlatformEmojis[appPlatform]} ${chalk.bold(
+            `${appPlatformDisplayNames[appPlatform]} submission`
+          )}`
+        );
+      }
+
+      const submission = await submitAsync(ctx);
+      submissions.push(submission);
     }
 
     Log.newLine();
     printSubmissionDetailsUrls(submissions);
 
     if (flags.wait) {
-      Log.newLine();
-      const completedSubmissions = await waitForSubmissionsEndAsync(submissions);
-      for (const submission of completedSubmissions) {
-        if (completedSubmissions.length > 1) {
-          Log.log(
-            `${appPlatformEmojis[submission.platform]}${chalk.bold(
-              `${appPlatformDisplayNames[submission.platform]} submission`
-            )}`
-          );
-        }
-        if (
-          submission.platform === AppPlatform.Ios &&
-          submission.status === SubmissionStatus.Finished
-        ) {
-          const logMsg = [
-            chalk.bold('Your binary has been successfully uploaded to App Store Connect!'),
-            '- It is now being processed by Apple - you will receive an e-mail when the processing finishes.',
-            '- It usually takes about 5-10 minutes depending on how busy Apple servers are.',
-            // ascAppIdentifier should be always available for ios submissions but check it anyway
-            submission.iosConfig?.ascAppIdentifier &&
-              `- When it’s done, you can see your build here: ${learnMore(
-                `https://appstoreconnect.apple.com/apps/${submission.iosConfig?.ascAppIdentifier}/appstore/ios`,
-                { learnMoreMessage: '' }
-              )}`,
-          ].join('\n');
-          Log.addNewLineIfNone();
-          Log.log(logMsg);
-        }
-        await displayLogsAsync(submission, { verbose: flags.verbose });
-        if (completedSubmissions.length > 1) {
-          Log.newLine();
-        }
-      }
-      this.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
+      await waitToCompleteAsync(submissions, { verbose: flags.verbose });
     }
   }
 
-  private parseFlags(): Flags {
+  private async sanitizeFlagsAsync(flags: RawFlags): Promise<Flags> {
     const {
-      flags: { platform, profile, verbose, wait, ...archiveFlags },
-    } = this.parse(BuildSubmit);
-
-    return {
-      platform: platform as Platform,
-      profile,
+      platform,
       verbose,
       wait,
+      profile,
+      'non-interactive': nonInteractive,
+      ...archiveFlags
+    } = flags;
+
+    if (!flags.platform && nonInteractive) {
+      error('--platform is required when building in non-interactive mode', { exit: 1 });
+    }
+
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    if (requestedPlatform === RequestedPlatform.All) {
+      if (archiveFlags.id || archiveFlags.path || archiveFlags.url) {
+        error(
+          '--id, --path, and --url params are only supported when performing a single-platform submit',
+          { exit: 1 }
+        );
+      }
+    }
+
+    return {
       archiveFlags,
+      requestedPlatform,
+      verbose,
+      wait,
+      profile,
+      nonInteractive,
     };
   }
-
-  private async promptForPlatformAsync(): Promise<AppPlatform> {
-    const { platform } = await promptAsync({
-      type: 'select',
-      message: 'Submit to platform',
-      name: 'platform',
-      choices: [
-        {
-          title: 'iOS',
-          value: AppPlatform.Ios,
-        },
-        {
-          title: 'Android',
-          value: AppPlatform.Android,
-        },
-      ],
-    });
-    return platform;
-  }
-
-  private exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(submissions: SubmissionFragment[]): void {
-    const nonFinishedSubmissions = submissions.filter(
-      ({ status }) => status !== SubmissionStatus.Finished
-    );
-    if (nonFinishedSubmissions.length > 0) {
-      exit(1);
-    }
-  }
 }

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

@@ -1,7 +1,8 @@
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateGroupMutation,
@@ -33,7 +34,7 @@ async function deleteUpdateGroupAsync({
   );
 }
 
-export default class UpdateDelete extends Command {
+export default class UpdateDelete extends EasCommand {
   static hidden = true;
   static description = 'Delete all the updates in an update Group.';
 
@@ -52,7 +53,7 @@ export default class UpdateDelete extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       args: { groupId: group },
       flags: { json: jsonFlag },

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

@@ -1,7 +1,8 @@
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import Table from 'cli-table3';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { UpdatesByGroupQuery, UpdatesByGroupQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
@@ -47,7 +48,7 @@ export async function viewUpdateAsync({
   }
   return data;
 }
-export default class UpdateView extends Command {
+export default class UpdateView extends EasCommand {
   static hidden = true;
   static description = 'Update group details.';
 
@@ -66,7 +67,7 @@ export default class UpdateView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       args: { groupId },
       flags: { json: jsonFlag },

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

@@ -1,14 +1,14 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
-import ora from 'ora';
+import { flags } from '@oclif/command';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
+import { ora } from '../../ora';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
 import { prepareInputParamsAsync } from '../../webhooks/input';
 
-export default class WebhookCreate extends Command {
+export default class WebhookCreate extends EasCommand {
   static description = 'Create a webhook on the current project.';
 
   static flags = {
@@ -26,8 +26,7 @@ export default class WebhookCreate extends Command {
     }),
   };
 
-  async run() {
-    await ensureLoggedInAsync();
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(WebhookCreate);
     const webhookInputParams = await prepareInputParamsAsync(flags);
 

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

@@ -1,20 +1,19 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookFragment } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
-export default class WebhookDelete extends Command {
+export default class WebhookDelete extends EasCommand {
   static description = 'Delete a webhook on the current project.';
 
   static args = [
@@ -25,8 +24,7 @@ export default class WebhookDelete extends Command {
     },
   ];
 
-  async run() {
-    await ensureLoggedInAsync();
+  async runAsync(): Promise<void> {
     let {
       args: { ID: webhookId },
     } = this.parse(WebhookDelete);

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

@@ -1,20 +1,20 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
-export default class WebhookList extends Command {
+export default class WebhookList extends EasCommand {
   static description = 'List webhooks on the current project.';
 
   static flags = {
@@ -24,8 +24,7 @@ export default class WebhookList extends Command {
     }),
   };
 
-  async run() {
-    await ensureLoggedInAsync();
+  async runAsync(): Promise<void> {
     const {
       flags: { event },
     } = this.parse(WebhookList);

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

@@ -1,14 +1,14 @@
-import { Command, flags } from '@oclif/command';
-import pick from 'lodash/pick';
-import ora from 'ora';
+import { flags } from '@oclif/command';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
-import { ensureLoggedInAsync } from '../../user/actions';
+import { ora } from '../../ora';
+import pick from '../../utils/expodash/pick';
 import { prepareInputParamsAsync } from '../../webhooks/input';
 
-export default class WebhookUpdate extends Command {
+export default class WebhookUpdate extends EasCommand {
   static description = 'Create a webhook on the current project.';
 
   static flags = {
@@ -30,8 +30,7 @@ export default class WebhookUpdate extends Command {
     }),
   };
 
-  async run() {
-    await ensureLoggedInAsync();
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(WebhookUpdate);
 
     const webhookId = flags.id;

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

@@ -1,12 +1,10 @@
-import { Command } from '@oclif/command';
-import ora from 'ora';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
-import { ensureLoggedInAsync } from '../../user/actions';
+import { ora } from '../../ora';
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
-export default class WebhookView extends Command {
+export default class WebhookView extends EasCommand {
   static description = 'View a webhook on the current project.';
 
   static args = [
@@ -17,8 +15,7 @@ export default class WebhookView extends Command {
     },
   ];
 
-  async run() {
-    await ensureLoggedInAsync();
+  async runAsync(): Promise<void> {
     const {
       args: { ID: webhookId },
     } = this.parse(WebhookView);

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

@@ -7,6 +7,7 @@ import {
   AppFragment,
   CommonAndroidAppCredentialsFragment,
 } from '../../graphql/generated';
+import * as AndroidGraphqlClient from '../android/api/GraphqlClient';
 import { Keystore } from '../android/credentials';
 import {
   testKeystore2Base64,
@@ -115,7 +116,7 @@ export const testAndroidAppCredentialsFragment: CommonAndroidAppCredentialsFragm
   androidAppBuildCredentialsList: [testLegacyAndroidBuildCredentialsFragment],
 };
 
-export function getNewAndroidApiMock() {
+export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlClient]?: any } {
   return {
     getAndroidAppCredentialsWithCommonFieldsAsync: jest.fn(),
     getAndroidAppBuildCredentialsListAsync: jest.fn(() => []),
@@ -129,6 +130,7 @@ export function getNewAndroidApiMock() {
     getAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createKeystoreAsync: jest.fn(),
+    createGoogleServiceAccountKeyAsync: jest.fn(),
     createFcmAsync: jest.fn(),
     deleteKeystoreAsync: jest.fn(),
     deleteFcmAsync: jest.fn(),

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

@@ -1,3 +1,4 @@
+import AppStoreApi from '../ios/appstore/AppStoreApi';
 import { AuthCtx } from '../ios/appstore/authenticate';
 
 export const testAuthCtx: AuthCtx = {
@@ -6,7 +7,7 @@ export const testAuthCtx: AuthCtx = {
   team: { id: 'test-team-id', name: 'test-team-name', inHouse: false },
 };
 
-export function getAppstoreMock() {
+export function getAppstoreMock(): AppStoreApi {
   return {
     ensureAuthenticatedAsync: jest.fn(),
     ensureBundleIdExistsAsync: jest.fn(),
@@ -21,5 +22,5 @@ export function getAppstoreMock() {
     createProvisioningProfileAsync: jest.fn(),
     revokeProvisioningProfileAsync: jest.fn(),
     createOrReuseAdhocProvisioningProfileAsync: jest.fn(),
-  };
+  } as any;
 }

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

@@ -1,4 +1,4 @@
-import merge from 'lodash/merge';
+import merge from 'ts-deepmerge';
 
 import { Context } from '../context';
 import { getNewAndroidApiMock } from './fixtures-android';

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

@@ -9,6 +9,7 @@ import {
   IosAppBuildCredentialsFragment,
   IosDistributionType,
 } from '../../graphql/generated';
+import * as IosGraphqlClient from '../ios/api/GraphqlClient';
 import { DistributionCertificate, ProvisioningProfile } from '../ios/appstore/Credentials.types';
 import { Target } from '../ios/types';
 import { testProvisioningProfileBase64 } from './fixtures-base64-data';
@@ -117,7 +118,7 @@ export const testAppleTeam = {
   id: 'test-team-id',
 };
 
-export function getNewIosApiMock() {
+export function getNewIosApiMock(): { [key in keyof typeof IosGraphqlClient]?: any } {
   return {
     getIosAppCredentialsWithCommonFieldsAsync: jest.fn(),
     createOrGetIosAppCredentialsWithCommonFieldsAsync: jest.fn(),

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

@@ -34,7 +34,7 @@ export default class AndroidCredentialsProvider {
   }
 
   private async getRemoteAsync(): Promise<AndroidCredentials> {
-    const setupBuildCredentialsAction = await new SetupBuildCredentials({ app: this.options.app });
+    const setupBuildCredentialsAction = new SetupBuildCredentials({ app: this.options.app });
     const buildCredentials = await setupBuildCredentialsAction.runAsync(this.ctx);
     return this.toAndroidCredentials(buildCredentials);
   }

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

@@ -1,9 +1,10 @@
 import assert from 'assert';
 import { nanoid } from 'nanoid';
-import ora from 'ora';
 
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
+import { ora } from '../../../ora';
 import { getApplicationIdAsync } from '../../../project/android/applicationId';
+import { GradleBuildContext } from '../../../project/android/gradle';
 import { getProjectAccountName, getProjectConfigDescription } from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
 import { findAccountByName } from '../../../user/Account';
@@ -83,7 +84,10 @@ export async function promptUserAndCopyLegacyCredentialsAsync(
   spinner.succeed('Credentials copied to EAS.');
 }
 
-export async function getAppLookupParamsFromContextAsync(ctx: Context): Promise<AppLookupParams> {
+export async function getAppLookupParamsFromContextAsync(
+  ctx: Context,
+  gradleContext?: GradleBuildContext
+): Promise<AppLookupParams> {
   ctx.ensureProjectContext();
   const projectName = ctx.exp.slug;
   const accountName = getProjectAccountName(ctx.exp, ctx.user);
@@ -92,7 +96,11 @@ export async function getAppLookupParamsFromContextAsync(ctx: Context): Promise<
     throw new Error(`You do not have access to account: ${accountName}`);
   }
 
-  const androidApplicationIdentifier = await getApplicationIdAsync(ctx.projectDir, ctx.exp);
+  const androidApplicationIdentifier = await getApplicationIdAsync(
+    ctx.projectDir,
+    ctx.exp,
+    gradleContext
+  );
   if (!androidApplicationIdentifier) {
     throw new Error(
       `android.package needs to be defined in your ${getProjectConfigDescription(

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

@@ -0,0 +1,41 @@
+import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
+import Log from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { Account } from '../../../user/Account';
+import { Context } from '../../context';
+import { GoogleServiceAccountKey } from '../credentials';
+import { readAndValidateServiceAccountKey } from '../utils/googleServiceAccountKey';
+
+export class CreateGoogleServiceAccountKey {
+  constructor(private account: Account) {}
+
+  public async runAsync(ctx: Context): 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 gsaKeyFragment = await ctx.android.createGoogleServiceAccountKeyAsync(
+      this.account,
+      jsonKeyObject
+    );
+    Log.succeed('Uploaded Google Service Account Key.');
+    return gsaKeyFragment;
+  }
+
+  private async provideAsync(): 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",
+        },
+      ]);
+      return readAndValidateServiceAccountKey(keyJsonPath);
+    } catch (e) {
+      Log.error(e);
+      return await this.provideAsync();
+    }
+  }
+}

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

@@ -41,7 +41,7 @@ export class RemoveKeystore {
     Log.succeed('Keystore removed');
   }
 
-  displayWarning() {
+  displayWarning(): void {
     Log.newLine();
     Log.warn(
       `Clearing your Android build credentials from our build servers is a ${chalk.bold(

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

@@ -1,11 +1,11 @@
 import nullthrows from 'nullthrows';
-import ora from 'ora';
 
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidKeystoreFragment,
 } from '../../../graphql/generated';
 import Log from '../../../log';
+import { ora } from '../../../ora';
 import { Context } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';

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

@@ -14,9 +14,9 @@ describe(AssignFcm, () => {
 
     // expect app credentials to be fetched/created, then updated
     expect(
-      ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync as any
+      ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync
     ).toHaveBeenCalledTimes(1);
-    expect(ctx.android.updateAndroidAppCredentialsAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.updateAndroidAppCredentialsAsync).toHaveBeenCalledTimes(1);
   });
   it('works in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -14,8 +15,9 @@ import {
   promptUserAndCopyLegacyCredentialsAsync,
 } from '../BuildCredentialsUtils';
 
+jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe('BuildCredentialsUtils', () => {
   describe(canCopyLegacyCredentialsAsync, () => {
@@ -82,7 +84,7 @@ describe('BuildCredentialsUtils', () => {
   });
   describe(promptUserAndCopyLegacyCredentialsAsync, () => {
     it('copies all legacy credentials to EAS if the user is eligible', async () => {
-      (promptAsync as jest.Mock).mockImplementation(() => ({ providedName: 'test-provided-name' }));
+      asMock(promptAsync).mockImplementation(() => ({ providedName: 'test-provided-name' }));
       const ctx = createCtxMock({
         nonInteractive: false,
         android: {
@@ -102,12 +104,12 @@ describe('BuildCredentialsUtils', () => {
       await promptUserAndCopyLegacyCredentialsAsync(ctx, appLookupParams);
 
       expect(
-        ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync as any
+        ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync
       ).toHaveBeenCalledTimes(1);
-      expect(ctx.android.createFcmAsync as any).toHaveBeenCalledTimes(1);
-      expect(ctx.android.updateAndroidAppCredentialsAsync as any).toHaveBeenCalledTimes(1);
-      expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
-      expect(ctx.android.createAndroidAppBuildCredentialsAsync as any).toHaveBeenCalledTimes(1);
+      expect(ctx.android.createFcmAsync).toHaveBeenCalledTimes(1);
+      expect(ctx.android.updateAndroidAppCredentialsAsync).toHaveBeenCalledTimes(1);
+      expect(ctx.android.createKeystoreAsync).toHaveBeenCalledTimes(1);
+      expect(ctx.android.createAndroidAppBuildCredentialsAsync).toHaveBeenCalledTimes(1);
     });
     it('errors in Non-Interactive Mode', async () => {
       const ctx = createCtxMock({

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

@@ -1,10 +1,11 @@
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateFcm } from '../CreateFcm';
 
 jest.mock('../../../../prompts');
-(promptAsync as jest.Mock).mockImplementation(() => ({ fcmApiKey: 'blah' }));
+asMock(promptAsync).mockImplementation(() => ({ fcmApiKey: 'blah' }));
 
 describe(CreateFcm, () => {
   it('creates an fcm api key in Interactive Mode', async () => {
@@ -14,7 +15,7 @@ describe(CreateFcm, () => {
     await createFcmAction.runAsync(ctx);
 
     // expect fcm api key to be created on expo servers
-    expect(ctx.android.createFcmAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createFcmAsync).toHaveBeenCalledTimes(1);
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -0,0 +1,41 @@
+import { vol } from 'memfs';
+
+import { asMock } from '../../../../__tests__/utils';
+import { promptAsync } from '../../../../prompts';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+import { CreateGoogleServiceAccountKey } from '../CreateGoogleServiceAccountKey';
+
+jest.mock('../../../../prompts');
+jest.mock('fs');
+asMock(promptAsync).mockImplementation(() => ({
+  keyJsonPath: '/google-service-account-key.json',
+}));
+
+beforeEach(() => {
+  vol.reset();
+});
+
+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' }),
+    });
+
+    const ctx = createCtxMock({ nonInteractive: false });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const createGsaKeyAction = new CreateGoogleServiceAccountKey(appLookupParams.account);
+    await createGsaKeyAction.runAsync(ctx);
+
+    // expect fcm api key to be created on expo servers
+    expect(ctx.android.createGoogleServiceAccountKeyAsync).toHaveBeenCalledTimes(1);
+  });
+  it('errors in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({ nonInteractive: true });
+    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
+    const createGsaKeyAction = new CreateGoogleServiceAccountKey(appLookupParams.account);
+
+    // fail if users are running in non-interactive mode
+    await expect(createGsaKeyAction.runAsync(ctx)).rejects.toThrowError();
+  });
+});

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

@@ -3,15 +3,20 @@ import { jester as mockJester } from '../../../../credentials/__tests__/fixtures
 import { testKeystore } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { askForUserProvidedAsync } from '../../../utils/promptForCredentials';
+import { generateRandomKeystoreAsync } from '../../utils/keystore';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateKeystore } from '../CreateKeystore';
 
-jest.mock('../../../utils/promptForCredentials');
 jest.mock('../../../../project/ensureProjectExists');
 jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
 jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
+jest.mock('../../../utils/promptForCredentials');
+jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn() }));
 
 describe('CreateKeystore', () => {
+  beforeEach(() => {
+    asMock(generateRandomKeystoreAsync).mockReset();
+  });
   it('creates a keystore in Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: false });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
@@ -19,7 +24,8 @@ describe('CreateKeystore', () => {
     await createKeystoreAction.runAsync(ctx);
 
     // expect keystore to be created on expo servers
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createKeystoreAsync).toHaveBeenCalled();
+    expect(generateRandomKeystoreAsync).toHaveBeenCalled();
   });
   it('creates a keystore by uploading', async () => {
     asMock(askForUserProvidedAsync).mockImplementationOnce(() => testKeystore);
@@ -29,11 +35,11 @@ describe('CreateKeystore', () => {
     await createKeystoreAction.runAsync(ctx);
 
     // expect keystore to be created on expo servers
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledWith(
+    expect(ctx.android.createKeystoreAsync).toHaveBeenCalledWith(
       appLookupParams.account,
       expect.objectContaining(testKeystore)
     );
+    expect(generateRandomKeystoreAsync).not.toHaveBeenCalled();
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -16,8 +16,8 @@ describe(DownloadKeystore, () => {
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
     const downloadKeystoreAction = new DownloadKeystore({ app: appLookupParams });
     await downloadKeystoreAction.runAsync(ctx, testAndroidBuildCredentialsFragment);
-    expect(fsWriteFileSpy as any).toHaveBeenCalledTimes(1);
-    expect(fsWriteFileSpy as any).toHaveBeenCalledWith(
+    expect(fsWriteFileSpy).toHaveBeenCalledTimes(1);
+    expect(fsWriteFileSpy).toHaveBeenCalledWith(
       `@${appLookupParams.account.name}__${appLookupParams.projectName}.jks`,
       testAndroidBuildCredentialsFragment.androidKeystore?.keystore,
       'base64'

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -8,7 +9,7 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveFcm } from '../RemoveFcm';
 
 jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveFcm, () => {
   it('removes an FCM Api Key', async () => {
@@ -24,7 +25,7 @@ describe(RemoveFcm, () => {
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
     const removeFcmApiKeyAction = new RemoveFcm(appLookupParams);
     await removeFcmApiKeyAction.runAsync(ctx);
-    expect(ctx.android.deleteFcmAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.deleteFcmAsync).toHaveBeenCalledTimes(1);
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import { testAndroidBuildCredentialsFragment } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -6,7 +7,7 @@ import { RemoveKeystore } from '../RemoveKeystore';
 
 jest.mock('fs-extra');
 jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveKeystore, () => {
   it('removes a keystore', async () => {
@@ -16,7 +17,7 @@ describe(RemoveKeystore, () => {
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
     const removeKeystoreAction = new RemoveKeystore(appLookupParams);
     await removeKeystoreAction.runAsync(ctx, testAndroidBuildCredentialsFragment);
-    expect(ctx.android.deleteKeystoreAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.deleteKeystoreAsync).toHaveBeenCalledTimes(1);
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import {
   getNewAndroidApiMock,
   testAndroidBuildCredentialsFragment,
@@ -6,14 +7,21 @@ import {
 import { jester as mockJester } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
+import { generateRandomKeystoreAsync } from '../../utils/keystore';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetupBuildCredentials } from '../SetupBuildCredentials';
 
+jest.mock('../../../../ora');
 jest.mock('../../../../project/ensureProjectExists');
 jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
+jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn() }));
 
 describe('SetupBuildCredentials', () => {
+  beforeEach(() => {
+    asMock(generateRandomKeystoreAsync).mockReset();
+  });
+
   it('skips setup when there are prior credentials', async () => {
     const ctx = createCtxMock({
       nonInteractive: false,
@@ -29,7 +37,7 @@ describe('SetupBuildCredentials', () => {
     await setupBuildCredentialsAction.runAsync(ctx);
 
     // expect keystore not to be created
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(0);
+    expect(ctx.android.createKeystoreAsync).not.toHaveBeenCalled();
   });
   it('sets up credentials when there are no prior credentials', async () => {
     const ctx = createCtxMock({
@@ -44,7 +52,8 @@ describe('SetupBuildCredentials', () => {
     await setupBuildCredentialsAction.runAsync(ctx);
 
     // expect keystore to be created
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createKeystoreAsync).toHaveBeenCalled();
+    expect(generateRandomKeystoreAsync).toHaveBeenCalled();
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { AndroidKeystoreType } from '../../../../graphql/generated';
 import { confirmAsync } from '../../../../prompts';
 import {
@@ -18,7 +19,7 @@ import { SetupBuildCredentialsFromCredentialsJson } from '../SetupBuildCredentia
 jest.mock('fs');
 
 jest.mock('../../../../prompts');
-(confirmAsync as jest.Mock).mockImplementation(() => true);
+asMock(confirmAsync).mockImplementation(() => true);
 jest.mock('../../../manager/SelectAndroidBuildCredentials');
 
 beforeEach(() => {
@@ -27,7 +28,7 @@ beforeEach(() => {
 
 describe(SetupBuildCredentialsFromCredentialsJson, () => {
   it('sets up a new build configuration from credentials.json upon user request', async () => {
-    (SelectAndroidBuildCredentials as any).mockImplementation(() => {
+    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
       return {
         runAsync: () => {
           return {
@@ -64,8 +65,8 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
     await setupBuildCredentialsAction.runAsync(ctx);
 
     // expect keystore to be created with credentials.json content
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
-    expect(ctx.android.createKeystoreAsync as any).toBeCalledWith(appLookupParams.account, {
+    expect(ctx.android.createKeystoreAsync).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createKeystoreAsync).toBeCalledWith(appLookupParams.account, {
       keystorePassword: testJksAndroidKeystoreFragment.keystorePassword,
       keyAlias: testJksAndroidKeystoreFragment.keyAlias,
       keyPassword: testJksAndroidKeystoreFragment.keyPassword,
@@ -74,10 +75,10 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
     });
 
     // expect new build credentials to be created
-    expect(ctx.android.createAndroidAppBuildCredentialsAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createAndroidAppBuildCredentialsAsync).toHaveBeenCalledTimes(1);
   });
   it('uses an existing build configuration upon user request', async () => {
-    (SelectAndroidBuildCredentials as any).mockImplementation(() => {
+    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
       return {
         runAsync: () => {
           return {
@@ -114,8 +115,8 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
     await setupBuildCredentialsAction.runAsync(ctx);
 
     // expect keystore to be created with credentials.json content
-    expect(ctx.android.createKeystoreAsync as any).toHaveBeenCalledTimes(1);
-    expect(ctx.android.createKeystoreAsync as any).toBeCalledWith(appLookupParams.account, {
+    expect(ctx.android.createKeystoreAsync).toHaveBeenCalledTimes(1);
+    expect(ctx.android.createKeystoreAsync).toBeCalledWith(appLookupParams.account, {
       keystorePassword: testJksAndroidKeystoreFragment.keystorePassword,
       keyAlias: testJksAndroidKeystoreFragment.keyAlias,
       keyPassword: testJksAndroidKeystoreFragment.keyPassword,
@@ -124,7 +125,7 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
     });
 
     // expect existing build credentials to be updated
-    expect(ctx.android.updateAndroidAppBuildCredentialsAsync as any).toHaveBeenCalledTimes(1);
+    expect(ctx.android.updateAndroidAppBuildCredentialsAsync).toHaveBeenCalledTimes(1);
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -5,14 +5,16 @@ import {
   AndroidKeystoreFragment,
   AppFragment,
   CommonAndroidAppCredentialsFragment,
+  GoogleServiceAccountKeyFragment,
 } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
 import { AppQuery } from '../../ios/api/graphql/queries/AppQuery';
-import { KeystoreWithType } from '../credentials';
+import { GoogleServiceAccountKey, KeystoreWithType } from '../credentials';
 import { AndroidAppBuildCredentialsMutation } from './graphql/mutations/AndroidAppBuildCredentialsMutation';
 import { AndroidAppCredentialsMutation } from './graphql/mutations/AndroidAppCredentialsMutation';
 import { AndroidFcmMutation } from './graphql/mutations/AndroidFcmMutation';
 import { AndroidKeystoreMutation } from './graphql/mutations/AndroidKeystoreMutation';
+import { GoogleServiceAccountKeyMutation } from './graphql/mutations/GoogleServiceAccountKeyMutation';
 import { AndroidAppCredentialsQuery } from './graphql/queries/AndroidAppCredentialsQuery';
 
 export interface AppLookupParams {
@@ -184,7 +186,7 @@ export async function createOrUpdateAndroidAppBuildCredentialsByNameAsync(
   });
 }
 
-export async function createOrUpdateDefaultIosAppBuildCredentialsAsync() {
+export async function createOrUpdateDefaultIosAppBuildCredentialsAsync(): Promise<void> {
   throw new Error('This requires user prompting. Look for me in BuildCredentialsUtils');
 }
 
@@ -192,7 +194,7 @@ export async function createKeystoreAsync(
   account: Account,
   keystore: KeystoreWithType
 ): Promise<AndroidKeystoreFragment> {
-  return await AndroidKeystoreMutation.createAndroidKeystore(
+  return await AndroidKeystoreMutation.createAndroidKeystoreAsync(
     {
       base64EncodedKeystore: keystore.keystore,
       keystorePassword: keystore.keystorePassword,
@@ -205,7 +207,7 @@ export async function createKeystoreAsync(
 }
 
 export async function deleteKeystoreAsync(keystore: AndroidKeystoreFragment): Promise<void> {
-  return await AndroidKeystoreMutation.deleteAndroidKeystore(keystore.id);
+  return await AndroidKeystoreMutation.deleteAndroidKeystoreAsync(keystore.id);
 }
 
 export async function createFcmAsync(
@@ -213,11 +215,24 @@ export async function createFcmAsync(
   fcmApiKey: string,
   version: AndroidFcmVersion
 ): Promise<AndroidFcmFragment> {
-  return await AndroidFcmMutation.createAndroidFcm({ credential: fcmApiKey, version }, account.id);
+  return await AndroidFcmMutation.createAndroidFcmAsync(
+    { credential: fcmApiKey, version },
+    account.id
+  );
 }
 
 export async function deleteFcmAsync(fcm: AndroidFcmFragment): Promise<void> {
-  return await AndroidFcmMutation.deleteAndroidFcm(fcm.id);
+  return await AndroidFcmMutation.deleteAndroidFcmAsync(fcm.id);
+}
+
+export async function createGoogleServiceAccountKeyAsync(
+  account: Account,
+  jsonKey: GoogleServiceAccountKey
+): Promise<GoogleServiceAccountKeyFragment> {
+  return await GoogleServiceAccountKeyMutation.createGoogleServiceAccountKeyAsync(
+    { jsonKey },
+    account.id
+  );
 }
 
 async function getAppAsync(appLookupParams: AppLookupParams): Promise<AppFragment> {

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

@@ -15,7 +15,7 @@ export type AndroidAppBuildCredentialsMetadataInput = Omit<
   AndroidAppBuildCredentialsInput,
   'keystoreId'
 >;
-const AndroidAppBuildCredentialsMutation = {
+export const AndroidAppBuildCredentialsMutation = {
   async createAndroidAppBuildCredentialsAsync(
     androidAppBuildCredentialsInput: AndroidAppBuildCredentialsInput,
     androidAppCredentialsId: string
@@ -85,5 +85,3 @@ const AndroidAppBuildCredentialsMutation = {
     return data.androidAppBuildCredentials.setKeystore;
   },
 };
-
-export { AndroidAppBuildCredentialsMutation };

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

@@ -10,7 +10,7 @@ import {
 } from '../../../../../graphql/generated';
 import { CommonAndroidAppCredentialsFragmentNode } from '../../../../../graphql/types/credentials/AndroidAppCredentials';
 
-const AndroidAppCredentialsMutation = {
+export const AndroidAppCredentialsMutation = {
   async createAndroidAppCredentialsAsync(
     androidAppCredentialsInput: {
       fcmId?: string;
@@ -83,5 +83,3 @@ const AndroidAppCredentialsMutation = {
     return data.androidAppCredentials.setFcm;
   },
 };
-
-export { AndroidAppCredentialsMutation };

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

@@ -11,8 +11,8 @@ import {
 } from '../../../../../graphql/generated';
 import { AndroidFcmFragmentNode } from '../../../../../graphql/types/credentials/AndroidFcm';
 
-const AndroidFcmMutation = {
-  async createAndroidFcm(
+export const AndroidFcmMutation = {
+  async createAndroidFcmAsync(
     androidFcmInput: AndroidFcmInput,
     accountId: string
   ): Promise<AndroidFcmFragment> {
@@ -43,7 +43,7 @@ const AndroidFcmMutation = {
     );
     return data.androidFcm.createAndroidFcm;
   },
-  async deleteAndroidFcm(androidFcmId: string): Promise<void> {
+  async deleteAndroidFcmAsync(androidFcmId: string): Promise<void> {
     await withErrorHandlingAsync(
       graphqlClient
         .mutation<DeleteAndroidFcmMutation>(
@@ -67,5 +67,3 @@ const AndroidFcmMutation = {
     );
   },
 };
-
-export { AndroidFcmMutation };

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

@@ -11,8 +11,8 @@ import {
 } from '../../../../../graphql/generated';
 import { AndroidKeystoreFragmentNode } from '../../../../../graphql/types/credentials/AndroidKeystore';
 
-const AndroidKeystoreMutation = {
-  async createAndroidKeystore(
+export const AndroidKeystoreMutation = {
+  async createAndroidKeystoreAsync(
     androidKeystoreInput: AndroidKeystoreInput,
     accountId: string
   ): Promise<AndroidKeystoreFragment> {
@@ -49,7 +49,7 @@ const AndroidKeystoreMutation = {
     );
     return data.androidKeystore.createAndroidKeystore;
   },
-  async deleteAndroidKeystore(androidKeystoreId: string): Promise<void> {
+  async deleteAndroidKeystoreAsync(androidKeystoreId: string): Promise<void> {
     await withErrorHandlingAsync(
       graphqlClient
         .mutation<DeleteAndroidKeystoreMutation>(
@@ -73,5 +73,3 @@ const AndroidKeystoreMutation = {
     );
   },
 };
-
-export { AndroidKeystoreMutation };