[eas-cli] Add support for updated fingerprint policy to eas update

* Upgrade eas-build dependencies

* update CHANGELOG.md

* fix type errors

---------

Co-authored-by: Szymon Dziedzic <[email protected]>

.github/workflows/release.yml

@@ -152,7 +152,13 @@ jobs:
           VERSION=$(cat lerna.json | jq -r .version)
           echo //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN > ~/.npmrc
           npm dist-tag add eas-cli@$VERSION latest-eas-build-staging
-          echo "Run \"npm dist-tag add eas-cli@$VERSION latest-eas-build\" to promote it to production."
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+      - name: Add latest-eas-build tag
+        run: |
+          VERSION=$(cat lerna.json | jq -r .version)
+          echo //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN > ~/.npmrc
+          npm dist-tag add eas-cli@$VERSION latest-eas-build
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
   release-changelog:

.github/workflows/upgrade-eas-build-modules.yml

@@ -0,0 +1,81 @@
+name: Open a PR bumping eas-build modules
+
+on: workflow_dispatch
+
+jobs:
+  open-pr:
+    name: Open a PR bumping eas-build modules
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          token: ${{ secrets.EXPO_BOT_PAT }}
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20
+
+      - run: yarn install --frozen-lockfile
+
+      - name: Configure git
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Expo Bot"
+
+      - name: Upgrade eas-build modules
+        run: |
+          for DIR in packages/eas-cli packages/eas-json; do
+            pushd $DIR >/dev/null 2>&1
+              # packages are ordered according to output of `lerna list --toposort`
+              # https://github.com/expo/turtle-v2/pull/568
+              for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/steps" "@expo/turtle-spawn" "@expo/build-tools"; do
+                if grep -q $PACKAGE package.json; then
+                  echo "[$DIR] yarn --exact add $PACKAGE"
+                  yarn add --exact $PACKAGE
+                fi
+              done
+            popd >/dev/null 2>&1
+          done
+
+      - name: Set a branch name
+        id: bump-branch-name
+        run: |
+          HASH="$(echo $RANDOM | md5sum | head -c 10)"
+          BRANCH_NAME="@expo-bot/eas-build-bump-$HASH"
+
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+
+      - name: Create a branch, commit, and push
+        run: |
+          BRANCH_NAME="${{ steps.bump-branch-name.outputs.BRANCH_NAME }}"
+
+          git checkout -b $BRANCH_NAME
+          git add .
+          git commit -m "Upgrade eas-build dependencies"
+          git push origin $BRANCH_NAME
+
+      - name: Open a PR to main
+        uses: repo-sync/pull-request@v2
+        id: open-pr
+        with:
+          source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
+          destination_branch: 'main'
+          pr_title: 'Upgrade eas-build dependencies'
+          pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
+          pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
+          github_token: ${{ secrets.EXPO_BOT_PAT }}
+
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_PAT }}
+          script: |
+            github.issues.createComment({
+              issue_number: ${{ steps.open-pr.outputs.pr_number }},
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
+            })

CHANGELOG.md

@@ -6,14 +6,94 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
+### 🎉 New features
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2229](https://github.com/expo/eas-cli/pull/2229) by [@expo-bot](https://github.com/expo-bot))
+
+## [7.2.0](https://github.com/expo/eas-cli/releases/tag/v7.2.0) - 2024-02-11
+
+### 🎉 New features
+
+- Support configuring a Google Service Account Key via eas credentials, for sending Android Notifications via FCM V1. ([#2197](https://github.com/expo/eas-cli/pull/2197) by [@christopherwalter](https://github.com/christopherwalter))
+
+### 🐛 Bug fixes
+
+- Revert expose expo export dev flag as an option in eas update. ([#2214](https://github.com/expo/eas-cli/pull/2214) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2223](https://github.com/expo/eas-cli/pull/2223) by [@expo-bot](https://github.com/expo-bot))
+
+## [7.1.3](https://github.com/expo/eas-cli/releases/tag/v7.1.3) - 2024-02-07
+
+### 🧹 Chores
+
+- Remove duplicated log message when creating ASC API key. ([#2208](https://github.com/expo/eas-cli/pull/2208) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Add simulator flag to metadata. ([#2073](https://github.com/expo/eas-cli/pull/2073) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2220](https://github.com/expo/eas-cli/pull/2220) by [@expo-bot](https://github.com/expo-bot))
+
+## [7.1.2](https://github.com/expo/eas-cli/releases/tag/v7.1.2) - 2024-01-30
+
+### 🧹 Chores
+
+- Add better validation for EAS Submit inputs. ([#2202](https://github.com/expo/eas-cli/pull/2202) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.1.1](https://github.com/expo/eas-cli/releases/tag/v7.1.1) - 2024-01-26
+
+### 🐛 Bug fixes
+
+- Revert incorrect EAS Submit input validation changes. ([#2200](https://github.com/expo/eas-cli/pull/2200) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.1.0](https://github.com/expo/eas-cli/releases/tag/v7.1.0) - 2024-01-26
+
+### 🎉 New features
+
+- Support requireCommit for EAS Update. ([#2196](https://github.com/expo/eas-cli/pull/2196) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove support for classic updates release channel in 50+. ([#2189](https://github.com/expo/eas-cli/pull/2189) by [@wschurman](https://github.com/wschurman))
+- Validate EAS Submit inputs better. ([#2198](https://github.com/expo/eas-cli/pull/2198) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.0.0](https://github.com/expo/eas-cli/releases/tag/v7.0.0) - 2024-01-19
+
+### 🛠 Breaking changes
+
+- Stop generating eas-update-metadata.json on publish. ([#2187](https://github.com/expo/eas-cli/pull/2187) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Use branch mapping utility fn. ([#2186](https://github.com/expo/eas-cli/pull/2186) by [@quinlanj](https://github.com/quinlanj))
+
+## [6.1.0](https://github.com/expo/eas-cli/releases/tag/v6.1.0) - 2024-01-18
+
+### 🎉 New features
+
+- Add `build:delete` command. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Add filter flags for `platform` and `profile` to `build:cancel` and `build:delete` commands. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Remove "bare"-specific **eas.json** template. ([#2179](https://github.com/expo/eas-cli/pull/2179) by [@sjchmiela](https://github.com/sjchmiela))
+- Prompt users if they want to continue if EAS CLI fails to provision the devices. ([#2181](https://github.com/expo/eas-cli/pull/2181) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas-cli` and `@expo/eas-json` dependencies. ([#2176](https://github.com/expo/eas-cli/pull/2176) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas.schema.json` to after adding Xcode 15.2 image. ([#2184](https://github.com/expo/eas-cli/pull/2184) by [@szdziedzic](https://github.com/szdziedzic))
+- Upgrade packages from the expo/expo repo. ([#2145](https://github.com/expo/eas-cli/pull/2145) by [@wschurman](https://github.com/wschurman))
+
+## [6.0.0](https://github.com/expo/eas-cli/releases/tag/v6.0.0) - 2024-01-12
+
+### 🛠 Breaking changes
+
 - Drop support for Node 14. ([#2175](https://github.com/expo/eas-cli/pull/2175) by [@szdziedzic](https://github.com/szdziedzic))
 
 ### 🎉 New features
 
 - Allow undefined update message for EAS Update publishing when no VCS. ([#2148](https://github.com/expo/eas-cli/pull/2148) by [@wschurman](https://github.com/wschurman))
 
-### 🐛 Bug fixes
-
 ### 🧹 Chores
 
 - Upgrade `@expo/eas-build-job` to `1.0.56`, thus removing unused (since [#1524](https://github.com/expo/eas-cli/pull/1524)) support for S3 project archives. ([#2165](https://github.com/expo/eas-cli/pull/2165) by [@sjchmiela](https://github.com/sjchmiela))

CODEOWNERS

@@ -1,10 +1,10 @@
-* @szdziedzic @khamilowicz
+* @szdziedzic @khamilowicz @sjchmiela
 
-packages/eas-cli/src/build @szdziedzic @khamilowicz
-packages/eas-cli/src/commands/build @szdziedzic @khamilowicz
+packages/eas-cli/src/build @szdziedzic @khamilowicz @sjchmiela
+packages/eas-cli/src/commands/build @szdziedzic @khamilowicz @sjchmiela
 
-packages/eas-cli/src/submit @szdziedzic @khamilowicz
-packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz
+packages/eas-cli/src/submit @szdziedzic @khamilowicz @sjchmiela
+packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz @sjchmiela
 
 packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
 packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
@@ -13,4 +13,4 @@ packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric
 
-packages/eas-json @szdziedzic @khamilowicz
+packages/eas-json @szdziedzic @khamilowicz @sjchmiela

RELEASING.md

@@ -12,7 +12,3 @@ The algorithm works as follows:
 - If there are any entries in the "🛠 Breaking changes" section, bump the MAJOR version.
 - Otherwise, if there are any entries in the "🎉 New features", bump the MINOR version.
 - Otherwise, bump the PATCH version.
-
-## Updating EAS CLI version on EAS Build
-
-The release process promotes the new version to staging. After verifying it works there, you can promote it to production with `npm dist-tag add eas-cli@{version} latest-eas-build`.

jest.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  projects: [
-    require('./packages/eas-cli/jest.config.js'),
-    require('./packages/eas-json/jest.config.js'),
-  ],
-  testPathIgnorePatterns: ['.*'],
-};

jest.config.ts

@@ -0,0 +1,15 @@
+import type { Config } from 'jest';
+
+// eslint-disable-next-line import/no-relative-packages
+import easCliConfig from './packages/eas-cli/jest.config';
+// eslint-disable-next-line import/no-relative-packages
+import easJsonConfig from './packages/eas-json/jest.config';
+
+const config: Config = {
+  projects: [easCliConfig, easJsonConfig],
+  testPathIgnorePatterns: ['.*'],
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
+};
+
+export default config;

jest/jest.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
-  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
-};

jest/jest.config.ts

@@ -0,0 +1,9 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
+};
+
+export default config;

lerna.json

@@ -1,6 +1,5 @@
 {
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "version": "6.0.0",
+  "version": "7.2.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -20,19 +20,19 @@
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "29.2.5",
+    "@types/jest": "29.5.11",
     "@types/node": "20.11.0",
-    "eslint": "8.31.0",
-    "eslint-config-universe": "11.1.1",
-    "eslint-plugin-async-protect": "3.0.0",
+    "eslint": "8.56.0",
+    "eslint-config-universe": "12.0.0",
+    "eslint-plugin-async-protect": "3.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.3.1",
-    "jest-watch-typeahead": "2.2.1",
-    "lerna": "6.4.1",
+    "jest": "29.7.0",
+    "jest-watch-typeahead": "2.2.2",
+    "lerna": "7.4.2",
     "oclif": "^3.9.0",
-    "prettier": "2.8.2",
-    "ts-jest": "29.0.3",
-    "typescript": "4.9.4"
+    "prettier": "3.1.1",
+    "ts-jest": "29.1.1",
+    "typescript": "5.3.3"
   },
   "volta": {
     "node": "20.11.0",

packages/eas-cli/README.md

@@ -68,6 +68,7 @@ eas --help COMMAND
 * [`eas build`](#eas-build)
 * [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
 * [`eas build:configure`](#eas-buildconfigure)
+* [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:resign`](#eas-buildresign)
@@ -135,7 +136,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -152,7 +153,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -169,7 +170,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -183,7 +184,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -235,7 +236,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -256,7 +257,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -276,7 +277,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -296,7 +297,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -319,7 +320,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -349,7 +350,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -357,16 +358,18 @@ cancel a build
 
 ```
 USAGE
-  $ eas build:cancel [BUILD_ID] [--non-interactive]
+  $ eas build:cancel [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
 
 FLAGS
-  --non-interactive  Run the command in non-interactive mode.
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.
 
 DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -383,7 +386,26 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/configure.ts)_
+
+## `eas build:delete [BUILD_ID]`
+
+delete a build
+
+```
+USAGE
+  $ eas build:delete [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
+
+FLAGS
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.
+
+DESCRIPTION
+  delete a build
+```
+
+_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/delete.ts)_
 
 ## `eas build:inspect`
 
@@ -418,7 +440,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -430,7 +452,7 @@ USAGE
     new|in-queue|in-progress|pending-cancel|errored|finished|canceled] [--distribution store|internal|simulator]
     [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>] [--sdkVersion <value>] [--runtimeVersion
     <value>] [--appIdentifier <value>] [--buildProfile <value>] [--gitCommitHash <value>] [--offset <value>] [--limit
-    <value>] [--json --non-interactive]
+    <value>] [--json --non-interactive] [--simulator]
 
 FLAGS
   --appBuildVersion=<value>
@@ -450,13 +472,16 @@ FLAGS
   --platform=(all|android|ios)
   --runtimeVersion=<value>
   --sdkVersion=<value>
+  --simulator                                                                   Filter only iOS simulator builds. Can
+                                                                                only be used with --platform flag set to
+                                                                                "ios"
   --status=(new|in-queue|in-progress|pending-cancel|errored|finished|canceled)
 
 DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -482,7 +507,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -508,7 +533,7 @@ DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -557,7 +582,7 @@ DESCRIPTION
   get the latest version from EAS servers
 ```
 
-_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -576,7 +601,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -595,7 +620,7 @@ DESCRIPTION
   update a version in native code with a value stored on EAS servers
 ```
 
-_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -612,7 +637,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -633,7 +658,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -655,7 +680,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -675,7 +700,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -707,7 +732,7 @@ DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -730,7 +755,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -751,7 +776,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -768,7 +793,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -782,7 +807,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -802,7 +827,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -823,7 +848,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -844,7 +869,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -858,7 +883,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -872,7 +897,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -960,7 +985,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -977,7 +1002,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -994,7 +1019,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/push.ts)_
 
 ## `eas open`
 
@@ -1008,7 +1033,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1022,7 +1047,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1044,7 +1069,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -1067,7 +1092,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1085,7 +1110,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1099,7 +1124,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1119,7 +1144,7 @@ DESCRIPTION
   read environment secrets from env file and store on the server
 ```
 
-_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1149,7 +1174,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1158,8 +1183,8 @@ publish an update group
 ```
 USAGE
   $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--republish | --input-dir <value> |
-    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--dev] [--auto] [--private-key-path
-    <value>] [--json --non-interactive]
+    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
+    [--json --non-interactive]
 
 FLAGS
   -m, --message=<value>             A short message describing the update
@@ -1168,7 +1193,6 @@ FLAGS
   --branch=<value>                  Branch to publish the update group on
   --channel=<value>                 Channel that the published update should affect
   --clear-cache                     Clear the bundler cache before publishing
-  --dev                             Publish a development bundle
   --group=<value>                   Update group to republish (deprecated, see republish command)
   --input-dir=<value>               [default: dist] Location of the bundle
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
@@ -1183,7 +1207,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1201,7 +1225,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1222,7 +1246,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1244,7 +1268,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1271,7 +1295,7 @@ DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/republish.ts)_
 
 ## `eas update:roll-back-to-embedded`
 
@@ -1298,7 +1322,7 @@ DESCRIPTION
   roll back to the embedded update
 ```
 
-_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/roll-back-to-embedded.ts)_
 
 ## `eas update:rollback`
 
@@ -1317,7 +1341,7 @@ DESCRIPTION
   roll back to an embedded update or an existing update
 ```
 
-_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/rollback.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1337,7 +1361,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1358,7 +1382,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1378,7 +1402,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1396,7 +1420,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1418,7 +1442,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1435,7 +1459,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v6.0.0/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/graphql.schema.json

@@ -1213,6 +1213,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "isDisabled",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "isSSOEnabled",
             "description": "Whether this account has SSO enabled. Can be queried by all members.",
@@ -1717,6 +1733,18 @@
         "description": null,
         "fields": null,
         "inputFields": [
+          {
+            "name": "searchTerm",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "sortByField",
             "description": null,
@@ -3117,6 +3145,33 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "AccountUsageEASJobsMetadata",
+        "description": null,
+        "fields": [
+          {
+            "name": "resourceClassDisplayName",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "UNION",
         "name": "AccountUsageMetadata",
@@ -3130,6 +3185,11 @@
             "kind": "OBJECT",
             "name": "AccountUsageEASBuildMetadata",
             "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "AccountUsageEASJobsMetadata",
+            "ofType": null
           }
         ]
       },
@@ -4666,6 +4726,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "googleServiceAccountKeyForFcmV1",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "GoogleServiceAccountKey",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "googleServiceAccountKeyForSubmissions",
             "description": null,
@@ -4769,6 +4841,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "googleServiceAccountKeyForFcmV1Id",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "ID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "googleServiceAccountKeyForSubmissionsId",
             "description": null,
@@ -4856,6 +4940,71 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "createFcmV1Credential",
+            "description": "Create a GoogleServiceAccountKeyEntity to store credential and\nconnect it with an edge from AndroidAppCredential",
+            "args": [
+              {
+                "name": "accountId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "androidAppCredentialsId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "credential",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "AndroidAppCredentials",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "deleteAndroidAppCredentials",
             "description": "Delete a set of credentials for an Android app",
@@ -4938,6 +5087,55 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "setGoogleServiceAccountKeyForFcmV1",
+            "description": "Set the Google Service Account Key to be used for Firebase Cloud Messaging V1",
+            "args": [
+              {
+                "name": "googleServiceAccountKeyId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "id",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "AndroidAppCredentials",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "setGoogleServiceAccountKeyForSubmissions",
             "description": "Set the Google Service Account Key to be used for submitting an Android app",
@@ -14513,6 +14711,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "isForIosSimulator",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "isGitWorkingTreeDirty",
             "description": null,
@@ -14944,6 +15158,18 @@
         "name": "BuildAnnotation",
         "description": null,
         "fields": [
+          {
+            "name": "authorUsername",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "buildPhase",
             "description": null,
@@ -15016,6 +15242,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "regexFlags",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "regexString",
             "description": null,
@@ -15116,6 +15354,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "regexFlags",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "regexString",
             "description": null,
@@ -15776,6 +16026,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "simulator",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "status",
             "description": null,
@@ -15874,6 +16136,18 @@
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "simulator",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "interfaces": null,
@@ -16546,18 +16820,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "buildMode",
-            "description": null,
-            "type": {
-              "kind": "ENUM",
-              "name": "BuildMode",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "buildProfile",
             "description": null,
@@ -16810,6 +17072,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "simulator",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "trackingContext",
             "description": null,
@@ -17875,6 +18149,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "isForIosSimulator",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "platform",
             "description": null,
@@ -19246,6 +19536,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "submitProfile",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "targetPattern",
             "description": "A branch name or a wildcard pattern that the pull request targets. For example, `main` or `release/*`.",
@@ -21091,6 +21393,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "JOBS",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "UPDATES",
             "description": null,
@@ -21132,6 +21440,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "RUN_TIME",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "UNIQUE_UPDATERS",
             "description": null,
@@ -23146,6 +23460,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "submitProfile",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "targetPattern",
             "description": null,
@@ -27404,6 +27730,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "DID_SUBSCRIBE_TO_EAS_AT_LEAST_ONCE",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "EAS_MASTER_LIST",
             "description": null,
@@ -28351,6 +28683,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "BUILD_ERRORED",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "BUILD_LIMIT_THRESHOLD_EXCEEDED",
             "description": null,
@@ -28369,6 +28707,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "SUBMISSION_ERRORED",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "TEST",
             "description": null,
@@ -36954,6 +37298,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "submitProfile",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "targetPattern",
             "description": null,
@@ -37385,14 +37741,14 @@
           {
             "name": "EAS_BUILD_PROJECT_SOURCES",
             "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "Use EAS_BUILD_GCS_PROJECT_SOURCES instead."
           },
           {
             "name": "EAS_SUBMIT_APP_ARCHIVE",
             "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "Use EAS_SUBMIT_GCS_APP_ARCHIVE instead."
           },
           {
             "name": "EAS_SUBMIT_GCS_APP_ARCHIVE",
@@ -37530,6 +37886,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "MINUTE",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "REQUEST",
             "description": null,

packages/eas-cli/jest.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  ...require('../../jest/jest.config.js'),
-  rootDir: __dirname,
-  roots: ['src', '__mocks__'],
-  globalSetup: './jest/global-setup.ts',
-  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
-};

packages/eas-cli/jest.config.ts

@@ -0,0 +1,14 @@
+import type { Config } from 'jest';
+
+// eslint-disable-next-line import/no-relative-packages
+import baseConfig from '../../jest/jest.config';
+
+const config: Config = {
+  ...baseConfig,
+  rootDir: __dirname,
+  roots: ['src', '__mocks__'],
+  globalSetup: './jest/global-setup.ts',
+  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
+};
+
+export default config;

packages/eas-cli/package.json

@@ -1,20 +1,21 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "6.0.0",
+  "version": "7.2.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.3.2",
+    "@expo/apple-utils": "1.4.0",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.1.2",
-    "@expo/config-plugins": "7.2.4",
-    "@expo/config-types": "49.0.0",
-    "@expo/eas-build-job": "1.0.56",
-    "@expo/eas-json": "6.0.0",
+    "@expo/config": "8.5.4",
+    "@expo/config-plugins": "7.8.4",
+    "@expo/config-types": "50.0.0",
+    "@expo/eas-build-job": "1.0.70",
+    "@expo/eas-json": "7.1.3",
+    "@expo/fingerprint": "0.6.0",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
@@ -23,11 +24,11 @@
     "@expo/plist": "0.0.20",
     "@expo/plugin-help": "5.1.23",
     "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.2.5",
+    "@expo/prebuild-config": "6.7.3",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.51",
+    "@expo/steps": "1.0.70",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -38,26 +39,27 @@
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
+    "cli-progress": "3.12.0",
     "dateformat": "4.6.3",
-    "dotenv": "16.0.3",
+    "dotenv": "16.3.1",
     "env-paths": "2.2.0",
-    "envinfo": "7.8.1",
+    "envinfo": "7.11.0",
     "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.12",
+    "fast-glob": "3.3.2",
     "figures": "3.2.0",
     "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.2.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
     "graphql": "16.8.1",
     "graphql-tag": "2.12.6",
     "https-proxy-agent": "5.0.1",
-    "ignore": "5.2.4",
+    "ignore": "5.3.0",
     "indent-string": "4.0.0",
     "jks-js": "1.1.0",
-    "joi": "17.7.0",
-    "keychain": "1.3.0",
+    "joi": "17.11.0",
+    "jsonwebtoken": "9.0.0",
+    "keychain": "1.5.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
     "minimatch": "5.1.2",
@@ -67,55 +69,56 @@
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "pngjs": "6.0.0",
+    "pngjs": "7.0.0",
     "promise-limit": "2.7.0",
     "promise-retry": "2.0.1",
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.5.2",
+    "semver": "7.5.4",
     "slash": "3.0.0",
-    "tar": "6.1.13",
+    "tar": "6.2.0",
     "terminal-link": "2.1.1",
-    "tslib": "2.4.1",
-    "turndown": "7.1.1",
+    "tslib": "2.6.2",
+    "turndown": "7.1.2",
     "untildify": "4.0.0",
-    "uuid": "9.0.0",
+    "uuid": "9.0.1",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "2.16.3",
-    "@graphql-codegen/introspection": "2.2.3",
-    "@graphql-codegen/typescript": "2.8.7",
-    "@graphql-codegen/typescript-operations": "2.5.12",
-    "@types/cli-progress": "3.11.0",
+    "@graphql-codegen/cli": "5.0.0",
+    "@graphql-codegen/introspection": "4.0.0",
+    "@graphql-codegen/typescript": "4.0.1",
+    "@graphql-codegen/typescript-operations": "4.0.1",
+    "@types/cli-progress": "3.11.5",
     "@types/dateformat": "3.0.1",
-    "@types/envinfo": "7.8.1",
+    "@types/envinfo": "7.8.3",
     "@types/express": "4.17.15",
-    "@types/fs-extra": "9.0.13",
+    "@types/fs-extra": "11.0.4",
     "@types/getenv": "^1.0.0",
+    "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
     "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.1",
+    "@types/pngjs": "6.0.4",
     "@types/promise-retry": "1.1.3",
     "@types/prompts": "2.4.2",
-    "@types/semver": "7.3.13",
-    "@types/tar": "6.1.3",
+    "@types/semver": "7.5.6",
+    "@types/tar": "6.1.10",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.0",
+    "@types/uuid": "9.0.7",
     "@types/wrap-ansi": "3.0.0",
     "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
     "express": "4.18.2",
     "memfs": "3.4.13",
     "mockdate": "3.0.5",
-    "nock": "13.2.9",
+    "nock": "13.4.0",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "4.0.0",
+    "ts-deepmerge": "6.2.0",
     "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.9.4"
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": ">=16.0.0"

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

@@ -1,11 +1,11 @@
 import { AppVersionSource, EasJson } from '@expo/eas-json';
 import chalk from 'chalk';
 
+import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 import BuildVersionGetView from '../../commands/build/version/get';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 
 jest.mock('../../project/applicationIdentifier');
 jest.mock('fs');

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

@@ -2,12 +2,6 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';
 
-import BuildVersionSetView from '../../commands/build/version/set';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import * as prompts from '../../prompts';
 import {
   getMockAppFragment,
   getMockEasJson,
@@ -15,6 +9,12 @@ import {
   mockProjectId,
   mockTestCommand,
 } from './utils';
+import BuildVersionSetView from '../../commands/build/version/set';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import * as prompts from '../../prompts';
 
 jest.mock('../../project/applicationIdentifier');
 jest.mock('../../graphql/queries/AppVersionQuery');

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

@@ -3,6 +3,13 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';
 
+import {
+  getMockAppFragment,
+  getMockEasJson,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
 import BuildVersionSyncView from '../../commands/build/version/sync';
@@ -14,13 +21,6 @@ import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
 import { resolveTargetsAsync } from '../../project/ios/target';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import * as prompts from '../../prompts';
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
 
 jest.mock('../../build/android/version');
 jest.mock('../../build/ios/version');

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

@@ -59,7 +59,7 @@ export interface LocalProjectContext {
 export function mockCommandContext<
   C extends {
     [name: string]: any;
-  } = object
+  } = object,
 >(
   commandClass: { contextDefinition: ContextInput<C> },
   overrides: {

packages/eas-cli/src/branch/queries.ts

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import { BranchNotFoundError } from './utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
@@ -19,7 +20,6 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { BranchNotFoundError } from './utils';
 
 export const BRANCHES_LIMIT = 50;
 

packages/eas-cli/src/build/__tests__/cancel-test.ts

@@ -92,5 +92,6 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
+    isForIosSimulator: false,
   };
 }

packages/eas-cli/src/build/__tests__/delete-test.ts

@@ -0,0 +1,97 @@
+import { instance, mock } from 'ts-mockito';
+import { v4 as uuid } from 'uuid';
+
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { selectBuildToDeleteAsync } from '../../commands/build/delete';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+jest.mock('../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
+jest.mock('../../prompts', () => {
+  return {
+    selectAsync: jest.fn(),
+    confirmAsync: jest.fn(),
+  };
+});
+
+jest.mock('../../graphql/queries/BuildQuery', () => {
+  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
+  return {
+    BuildQuery: {
+      ...actual.BuildQuery,
+      viewBuildsOnAppAsync: jest.fn(),
+    },
+  };
+});
+
+describe(selectBuildToDeleteAsync.name, () => {
+  const selectedBuildId = uuid();
+  const projectId = uuid();
+
+  beforeEach(() => {
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockImplementation(async () => [
+        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
+      ]);
+  });
+
+  it('does not return build id when confirmation is rejected', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
+  });
+
+  it('returns build id when confirmation is confirmed', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
+    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
+      selectedBuildId
+    );
+  });
+});
+
+function createMockBuildFragment({
+  projectId,
+  buildId,
+}: {
+  projectId: string;
+  buildId?: string;
+}): BuildFragment {
+  return {
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    platform: AppPlatform.Android,
+    id: buildId ?? uuid(),
+    priority: BuildPriority.Normal,
+    project: {
+      __typename: 'App',
+      slug: 'test-project',
+      id: projectId,
+      name: 'test-project',
+      ownerAccount: {
+        __typename: 'Account',
+        id: uuid(),
+        name: 'test-account',
+      },
+    },
+    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
+    isForIosSimulator: false,
+  };
+}

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

@@ -3,6 +3,10 @@ import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
@@ -29,10 +33,6 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } from '../validate';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -99,14 +99,13 @@ export async function prepareAndroidBuildAsync(
       return await ensureAndroidCredentialsAsync(ctx);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         localAutoIncrement:
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
         vcsClient: ctx.vcsClient,
       });
     },

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

@@ -6,37 +6,33 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 import Log from '../../log';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
 import { Client } from '../../vcs/vcs';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    localAutoIncrement,
-    projectId,
-    vcsClient,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    localAutoIncrement?: AndroidVersionAutoIncrement;
-    projectId: string;
-    vcsClient: Client;
-  }
-): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  localAutoIncrement,
+  vcsClient,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  localAutoIncrement?: AndroidVersionAutoIncrement;
+  vcsClient: Client;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     await cleanUpOldEasBuildGradleScriptAsync(projectDir);
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {

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

@@ -100,7 +100,9 @@ export async function maybeResolveVersionsAsync(
   buildProfile: BuildProfile<Platform.ANDROID>,
   vcsClient: Client
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
     try {
@@ -232,7 +234,9 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
       });
       spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -254,7 +258,9 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: String(nextBuildVersion),
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
       });
       spinner.succeed(
         `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -7,6 +7,26 @@ import fs from 'fs-extra';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
+import { BuildContext } from './context';
+import {
+  EasBuildDownForMaintenanceError,
+  EasBuildFreeTierDisabledAndroidError,
+  EasBuildFreeTierDisabledError,
+  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildLegacyResourceClassNotAvailableError,
+  EasBuildProjectArchiveUploadError,
+  EasBuildResourceClassNotAvailableInFreeTierError,
+  EasBuildTooManyPendingBuildsError,
+  RequestValidationError,
+  TurtleDeprecatedJobFormatError,
+} from './errors';
+import { transformMetadata } from './graphql';
+import { LocalBuildMode, runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
@@ -34,26 +54,6 @@ import { formatBytes } from '../utils/files';
 import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
-import { BuildContext } from './context';
-import {
-  EasBuildDownForMaintenanceError,
-  EasBuildFreeTierDisabledAndroidError,
-  EasBuildFreeTierDisabledError,
-  EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildLegacyResourceClassNotAvailableError,
-  EasBuildProjectArchiveUploadError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
-  EasBuildTooManyPendingBuildsError,
-  RequestValidationError,
-  TurtleDeprecatedJobFormatError,
-} from './errors';
-import { transformMetadata } from './graphql';
-import { LocalBuildMode, runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
-import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -97,7 +97,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
-  TJob extends Job
+  TJob extends Job,
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
   const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(

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

@@ -1,13 +1,11 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import Log, { learnMore } from '../log';
-import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 import { Client } from '../vcs/vcs';
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 interface ConfigureParams {
   projectDir: string;
@@ -54,7 +52,7 @@ async function configureAsync({
   }
 }
 
-const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+const EAS_JSON_DEFAULT: EasJson = {
   cli: {
     version: `>= ${easCliVersion}`,
   },
@@ -73,43 +71,10 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
   },
 };
 
-const EAS_JSON_BARE_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-  },
-  build: {
-    development: {
-      distribution: 'internal',
-      android: {
-        gradleCommand: ':app:assembleDebug',
-      },
-      ios: {
-        buildConfiguration: 'Debug',
-      },
-    },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {},
-  },
-  submit: {
-    production: {},
-  },
-};
-
 async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
   const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
 
-  const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)) === Workflow.GENERIC;
-  const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)) === Workflow.GENERIC;
-  const easJson =
-    hasAndroidNativeProject || hasIosNativeProject
-      ? EAS_JSON_BARE_DEFAULT
-      : EAS_JSON_MANAGED_DEFAULT;
-
-  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+  await fs.writeFile(easJsonPath, `${JSON.stringify(EAS_JSON_DEFAULT, null, 2)}\n`);
   await vcsClient.trackFileAsync(easJsonPath);
   Log.withTick(
     `Generated ${chalk.bold('eas.json')}. ${learnMore(

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

@@ -3,6 +3,7 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
 import { NodePackageManager } from '@expo/package-manager';
 
+import { LocalBuildOptions } from './local';
 import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
@@ -13,7 +14,6 @@ import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { Client } from '../vcs/vcs';
-import { LocalBuildOptions } from './local';
 
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 

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

@@ -6,6 +6,11 @@ import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -15,11 +20,6 @@ import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
 import { Client } from '../vcs/vcs';
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
@@ -61,7 +61,9 @@ export async function createBuildContextAsync<T extends Platform>({
   const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
   const projectName = exp.slug;
   const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   const accountId = account.id;
   const runFromCI = getenv.boolish('CI', false);
   const developmentClient =

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

@@ -62,7 +62,7 @@ describe(evaluateTemplateString, () => {
 // bare workflow
 describe(bumpVersionAsync, () => {
   beforeEach(() => {
-    getPbxproj.mockImplementation(() => ({} as any));
+    getPbxproj.mockImplementation((): any => {});
   });
   afterEach(() => {
     getXCBuildConfigurationFromPbxproj.mockReset();
@@ -76,7 +76,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -112,7 +112,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -147,7 +147,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
@@ -182,7 +182,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,

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

@@ -1,6 +1,11 @@
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 
+import { ensureIosCredentialsAsync } from './credentials';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteBuildNumberAsync } from './version';
 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
@@ -15,11 +20,6 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } from '../validate';
-import { ensureIosCredentialsAsync } from './credentials';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteBuildNumberAsync } from './version';
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
@@ -80,7 +80,7 @@ export async function prepareIosBuildAsync(
       return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         targets: ctx.ios.targets,
@@ -88,7 +88,6 @@ export async function prepareIosBuildAsync(
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
         vcsClient: ctx.vcsClient,
       });
     },

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

@@ -2,38 +2,34 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { Client } from '../../vcs/vcs';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    targets,
-    localAutoIncrement,
-    projectId,
-    vcsClient,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    targets: Target[];
-    localAutoIncrement?: IosVersionAutoIncrement;
-    projectId: string;
-    vcsClient: Client;
-  }
-): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  targets,
+  localAutoIncrement,
+  vcsClient,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  targets: Target[];
+  localAutoIncrement?: IosVersionAutoIncrement;
+  vcsClient: Client;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, vcsClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(vcsClient, projectDir, exp);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {

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

@@ -114,7 +114,9 @@ export async function readShortVersionAsync(
   buildSettings: XCBuildConfiguration['buildSettings'],
   vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
 
@@ -136,7 +138,9 @@ export async function readBuildNumberAsync(
   buildSettings: XCBuildConfiguration['buildSettings'],
   vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+    useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+  });
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
@@ -342,7 +346,9 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
       });
       spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -364,7 +370,9 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: nextBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
       });
       spinner.succeed(
         `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.56';
+const PLUGIN_PACKAGE_VERSION = '1.0.60';
 
 export enum LocalBuildMode {
   /**

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

@@ -4,8 +4,17 @@ import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { LocalBuildMode } from './local';
+import { BuildDistributionType } from './types';
 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import {
+  getUsername,
+  isClassicUpdatesSupportedAsync,
+  isExpoUpdatesInstalled,
+} from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -15,19 +24,12 @@ import {
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
-  const distribution =
-    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
-      ? 'simulator'
-      : ctx.buildProfile.distribution) ?? 'store';
+  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
   const metadata: Metadata = {
     trackingContext: ctx.analyticsEventProperties,
     ...(await maybeResolveVersionsAsync(ctx)),
@@ -35,7 +37,9 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    runtimeVersion:
+      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
+      undefined,
     reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
     ...channelOrReleaseChannel,
     distribution,
@@ -64,6 +68,7 @@ export async function collectMetadataAsync<T extends Platform>(
     requiredPackageManager: ctx.requiredPackageManager ?? undefined,
     selectedImage: ctx.buildProfile.image,
     customNodeVersion: ctx.buildProfile.node,
+    simulator: 'simulator' in ctx.buildProfile && ctx.buildProfile.simulator,
   };
   return sanitizeMetadata(metadata);
 }
@@ -123,13 +128,19 @@ async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   if (ctx.buildProfile.channel) {
     return { channel: ctx.buildProfile.channel };
   }
-  if (ctx.buildProfile.releaseChannel) {
-    return { releaseChannel: ctx.buildProfile.releaseChannel };
-  }
   const channel = await getNativeChannelAsync(ctx);
   if (channel) {
     return { channel };
   }
+
+  if (!(await isClassicUpdatesSupportedAsync(ctx.projectDir))) {
+    return null;
+  }
+
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+
   const releaseChannel = await getNativeReleaseChannelAsync(ctx);
   return { releaseChannel };
 }

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

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 
+import { formatGraphQLBuild } from './utils/formatBuild';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { AppPlatform, BuildFilter, BuildFragment } from '../graphql/generated';
@@ -11,7 +12,6 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { formatGraphQLBuild } from './utils/formatBuild';
 
 export const BUILDS_LIMIT = 50;
 

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

@@ -13,6 +13,16 @@ import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
@@ -67,16 +77,6 @@ import { truthy } from '../utils/expodash/filter';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
 import { Client } from '../vcs/vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -334,7 +334,6 @@ async function prepareAndStartBuildAsync({
   );
   if (buildProfile.profile.channel) {
     await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      graphqlClient,
       exp: buildCtx.exp,
       projectId: buildCtx.projectId,
       projectDir,
@@ -479,7 +478,6 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
 
 async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   exp,
-  graphqlClient,
   projectId,
   projectDir,
   vcsClient,
@@ -487,7 +485,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   nonInteractive,
   sdkVersion,
 }: {
-  graphqlClient: ExpoGraphqlClient;
   exp: ExpoConfig;
   projectId: string;
   projectDir: string;
@@ -516,7 +513,7 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
       message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
     });
     if (installExpoUpdates) {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+      await ensureEASUpdateIsConfiguredAsync({
         exp,
         projectId,
         projectDir,

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

@@ -11,5 +11,6 @@ export enum BuildStatus {
 export enum BuildDistributionType {
   STORE = 'store',
   INTERNAL = 'internal',
+  /** @deprecated Use simulator flag instead */
   SIMULATOR = 'simulator',
 }

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

@@ -3,6 +3,7 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
+import { reviewAndCommitChangesAsync } from './repository';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -11,7 +12,6 @@ import { confirmAsync } from '../../prompts';
 import { expoCommandAsync } from '../../utils/expoCli';
 import { ProfileData } from '../../utils/profiles';
 import { Client } from '../../vcs/vcs';
-import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
@@ -43,7 +43,11 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   );
 
   const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
+    platformsToCheck.map(platform =>
+      resolveWorkflowAsync(projectDir, platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })
+    )
   );
 
   Log.newLine();

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

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 
+import { getBuildLogsUrl } from './url';
 import {
   AppPlatform,
   BuildFragment,
@@ -7,7 +8,6 @@ import {
 } from '../../graphql/generated';
 import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
-import { getBuildLogsUrl } from './url';
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);

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

@@ -2,6 +2,7 @@ import assert from 'assert';
 import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';
 
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 import {
   AppPlatform,
   BuildError,
@@ -13,7 +14,6 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore, link } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 function terminalLinkFallback(url: string, text: string): string {
   return `${text} (${url})`;

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

@@ -107,7 +107,9 @@ export async function makeProjectTarballAsync(
   startTimer(compressTimerLabel);
 
   try {
-    await vcsClient.makeShallowCopyAsync(shallowClonePath);
+    await vcsClient.makeShallowCopyAsync(shallowClonePath, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);

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

@@ -3,9 +3,9 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
 
+import { updateAppJsonConfigAsync } from './appJson';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
-import { updateAppJsonConfigAsync } from './appJson';
 
 export function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);

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

@@ -4,9 +4,9 @@ import fs from 'fs-extra';
 import path from 'path';
 import semver from 'semver';
 
+import { CommonContext } from './context';
 import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';
-import { CommonContext } from './context';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {
@@ -32,7 +32,9 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath), {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      })))
   ) {
     Log.warn(
       `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`

packages/eas-cli/src/channel/__tests__/branch-mapping-test.ts

@@ -1,3 +1,4 @@
+import { testChannelBasicInfo } from './branch-mapping-fixtures';
 import {
   emptyBranchMapping,
   rolloutBranchMapping,
@@ -13,7 +14,6 @@ import {
   isAlwaysTrueBranchMapping,
   isEmptyBranchMapping,
 } from '../branch-mapping';
-import { testChannelBasicInfo } from './branch-mapping-fixtures';
 
 describe(assertVersion, () => {
   it('throws if the branch mapping is not the correct version', () => {

packages/eas-cli/src/channel/__tests__/print-utils-test.ts

@@ -1,8 +1,8 @@
 import { format } from '@expo/timeago.js';
 
+import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
 import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
 import { getDescriptionByBranchId } from '../print-utils';
-import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
 
 describe(getDescriptionByBranchId, () => {
   it('should get descriptions for multiple branches with multiple update groups', () => {

packages/eas-cli/src/channel/__tests__/utils-test.ts

@@ -1,5 +1,5 @@
-import { getUpdateBranch } from '../utils';
 import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
+import { getUpdateBranch } from '../utils';
 
 describe(getUpdateBranch, () => {
   it('gets the update branch', () => {

packages/eas-cli/src/channel/branch-mapping.ts

@@ -41,7 +41,7 @@ export type AlwaysTrueBranchMapping = {
     {
       branchId: string;
       branchMappingLogic: BranchMappingAlwaysTrue;
-    }
+    },
   ];
 };
 

packages/eas-cli/src/channel/print-utils.ts

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 
+import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import Log from '../log';
 import { getRollout, isRollout } from '../rollout/branch-mapping';
@@ -8,7 +9,6 @@ import {
   formatBranch,
   getUpdateGroupDescriptionsWithBranch,
 } from '../update/utils';
-import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 
 /**
  * Log all the branches associated with the channel and their most recent update group
@@ -38,31 +38,34 @@ export function logChannelDetails(channel: UpdateChannelObject): void {
 export function getDescriptionByBranchId(
   channel: UpdateChannelObject
 ): Record<string, FormattedBranchDescription> {
-  return channel.updateBranches.reduce((acc, branch) => {
-    const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
-    let maybePercentOnBranch: number | undefined = undefined;
-    if (maybeRollout) {
-      maybePercentOnBranch =
-        maybeRollout.rolledOutBranchId === branch.id
-          ? maybeRollout.percentRolledOut
-          : 100 - maybeRollout.percentRolledOut;
-    }
+  return channel.updateBranches.reduce(
+    (acc, branch) => {
+      const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
+      let maybePercentOnBranch: number | undefined = undefined;
+      if (maybeRollout) {
+        maybePercentOnBranch =
+          maybeRollout.rolledOutBranchId === branch.id
+            ? maybeRollout.percentRolledOut
+            : 100 - maybeRollout.percentRolledOut;
+      }
 
-    if (branch.updateGroups.length === 0) {
-      acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+      if (branch.updateGroups.length === 0) {
+        acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+        return acc;
+      }
+      const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
+        branch.updateGroups
+      );
+      // display the most recent update group
+      const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
+      const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
+      acc[branch.id] = {
+        branch: branchName,
+        branchRolloutPercentage: maybePercentOnBranch,
+        update: updateGroup,
+      };
       return acc;
-    }
-    const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
-    );
-    // display the most recent update group
-    const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
-    const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
-    acc[branch.id] = {
-      branch: branchName,
-      branchRolloutPercentage: maybePercentOnBranch,
-      update: updateGroup,
-    };
-    return acc;
-  }, {} as Record<string, FormattedBranchDescription>);
+    },
+    {} as Record<string, FormattedBranchDescription>
+  );
 }

packages/eas-cli/src/channel/queries.ts

@@ -2,6 +2,9 @@ import chalk from 'chalk';
 import { print } from 'graphql';
 import gql from 'graphql-tag';
 
+import { ChannelNotFoundError } from './errors';
+import { logChannelDetails } from './print-utils';
+import { ChannelBasicInfo } from './utils';
 import { createUpdateBranchOnAppAsync } from '../branch/queries';
 import { BranchNotFoundError } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -24,9 +27,6 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { ChannelNotFoundError } from './errors';
-import { logChannelDetails } from './print-utils';
-import { ChannelBasicInfo } from './utils';
 
 export const CHANNELS_LIMIT = 25;
 

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

@@ -3,13 +3,6 @@ import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
-import {
-  AnalyticsWithOrchestration,
-  CommandEvent,
-  createAnalyticsAsync,
-} from '../analytics/AnalyticsManager';
-import Log from '../log';
-import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import {
@@ -24,11 +17,18 @@ import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
+import {
+  AnalyticsWithOrchestration,
+  CommandEvent,
+  createAnalyticsAsync,
+} from '../analytics/AnalyticsManager';
+import Log from '../log';
+import SessionManager from '../user/SessionManager';
 
 export type ContextInput<
   T extends {
     [name: string]: any;
-  } = object
+  } = object,
 > = {
   [P in keyof T]: ContextField<T[P]>;
 };
@@ -36,7 +36,7 @@ export type ContextInput<
 export type ContextOutput<
   T extends {
     [name: string]: any;
-  } = object
+  } = object,
 > = {
   [P in keyof T]: T[P];
 };
@@ -136,7 +136,7 @@ export default abstract class EasCommand extends Command {
   protected async getContextAsync<
     C extends {
       [name: string]: any;
-    } = object
+    } = object,
   >(
     commandClass: { contextDefinition: ContextInput<C> },
     { nonInteractive }: { nonInteractive: boolean }

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

@@ -0,0 +1,99 @@
+import chalk from 'chalk';
+
+import { ExpoGraphqlClient } from './context/contextUtils/createGraphqlClient';
+import {
+  AppPlatform,
+  Build,
+  BuildFilter,
+  BuildFragment,
+  BuildStatus,
+  InputMaybe,
+} from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import { RequestedPlatform, appPlatformEmojis } from '../platform';
+
+const platformToAppPlatform: Record<
+  Exclude<RequestedPlatform, RequestedPlatform.All>,
+  AppPlatform
+> = {
+  android: AppPlatform.Android,
+  ios: AppPlatform.Ios,
+};
+
+export async function ensureBuildExistsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<void> {
+  try {
+    await BuildQuery.byIdAsync(graphqlClient, buildId);
+  } catch {
+    throw new Error(`Couldn't find a build matching the id ${buildId}`);
+  }
+}
+
+export async function fetchBuildsAsync({
+  graphqlClient,
+  projectId,
+  filters,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  projectId: string;
+  filters?: { statuses?: BuildStatus[]; platform?: RequestedPlatform; profile?: string };
+}): Promise<BuildFragment[]> {
+  let builds: BuildFragment[];
+  const queryFilters: InputMaybe<BuildFilter> = {};
+  if (filters?.platform && filters.platform !== 'all') {
+    queryFilters['platform'] = platformToAppPlatform[filters.platform];
+  }
+  if (filters?.profile) {
+    queryFilters['buildProfile'] = filters.profile;
+  }
+  if (!filters?.statuses) {
+    builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      appId: projectId,
+      offset: 0,
+      limit: 10,
+      filter: queryFilters ? queryFilters : undefined,
+    });
+  } else {
+    builds = (
+      await Promise.all(
+        filters.statuses.map(status =>
+          BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+            appId: projectId,
+            offset: 0,
+            limit: 10,
+            filter: queryFilters ? { ...queryFilters, status } : { status },
+          })
+        )
+      )
+    ).flat();
+  }
+  builds.sort((buildA, buildB) => (buildA.createdAt > buildB.createdAt ? -1 : 1));
+  return builds;
+}
+
+export function formatBuild(
+  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
+): string {
+  const platform = appPlatformEmojis[build.platform];
+  const startTime = new Date(build.createdAt).toLocaleString();
+  let statusText: string;
+  if (build.status === BuildStatus.New) {
+    statusText = 'new';
+  } else if (build.status === BuildStatus.InQueue) {
+    statusText = 'in queue';
+  } else if (build.status === BuildStatus.InProgress) {
+    statusText = 'in progress';
+  } else if (build.status === BuildStatus.Finished) {
+    statusText = 'finished';
+  } else if (build.status === BuildStatus.Errored) {
+    statusText = 'errored';
+  } else if ([BuildStatus.PendingCancel, BuildStatus.Canceled].includes(build.status)) {
+    statusText = 'canceled';
+  } else {
+    statusText = 'unknown';
+  }
+  const status = chalk.blue(statusText);
+  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
+}

packages/eas-cli/src/commandUtils/context/AnalyticsContextField.ts

@@ -1,5 +1,5 @@
-import { Analytics } from '../../analytics/AnalyticsManager';
 import ContextField, { ContextOptions } from './ContextField';
+import { Analytics } from '../../analytics/AnalyticsManager';
 
 export default class AnalyticsContextField extends ContextField<Analytics> {
   async getValueAsync({ analytics }: ContextOptions): Promise<Analytics> {

packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts

@@ -1,13 +1,13 @@
 import { ExpoConfig } from '@expo/config-types';
 
+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import {
   ExpoConfigOptions,
   getPrivateExpoConfig,
   getPublicExpoConfig,
 } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 
 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
   projectId: string;

packages/eas-cli/src/commandUtils/context/LoggedInContextField.ts

@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 
 export default class LoggedInContextField extends ContextField<{
   actor: Actor;

packages/eas-cli/src/commandUtils/context/MaybeLoggedInContextField.ts

@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 
 export default class MaybeLoggedInContextField extends ContextField<{
   actor: Actor | null;

packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
 
-import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class OptionalPrivateProjectConfigContextField extends ContextField<
   | {

packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts

@@ -1,9 +1,9 @@
 import { ExpoConfig } from '@expo/config-types';
 
-import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class PrivateProjectConfigContextField extends ContextField<{
   projectId: string;

packages/eas-cli/src/commandUtils/context/SessionManagementContextField.ts

@@ -1,5 +1,5 @@
-import SessionManager from '../../user/SessionManager';
 import ContextField, { ContextOptions } from './ContextField';
+import SessionManager from '../../user/SessionManager';
 
 export default class SessionManagementContextField extends ContextField<SessionManager> {
   async getValueAsync({ sessionManager }: ContextOptions): Promise<SessionManager> {

packages/eas-cli/src/commandUtils/context/VcsClientContextField.ts

@@ -1,6 +1,6 @@
+import ContextField from './ContextField';
 import { getVcsClient } from '../../vcs';
 import { Client } from '../../vcs/vcs';
-import ContextField from './ContextField';
 
 export default class VcsClientContextField extends ContextField<Client> {
   async getValueAsync(): Promise<Client> {

packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts

@@ -3,6 +3,8 @@ import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
 
+import { createGraphqlClient } from './createGraphqlClient';
+import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
@@ -11,8 +13,6 @@ import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';
-import { createGraphqlClient } from './createGraphqlClient';
-import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 
 /**
  * Save an EAS project ID to the appropriate field in the app config.

packages/eas-cli/src/commandUtils/gating/FeatureGateEnvOverrides.ts

@@ -1,7 +1,7 @@
 import nullthrows from 'nullthrows';
 
-import env from '../../env';
 import { FeatureGateKey } from './FeatureGateKey';
+import env from '../../env';
 
 function parseFeatureGateEnvVariableValue(value: string | undefined): string[] {
   if (!value) {

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

@@ -1,7 +1,8 @@
-import chalk from 'chalk';
+import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
+import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { withErrorHandlingAsync } from '../../graphql/client';
@@ -11,10 +12,9 @@ import {
   CancelBuildMutation,
   CancelBuildMutationVariables,
 } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { appPlatformEmojis } from '../../platform';
+import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';
 
@@ -42,54 +42,28 @@ async function cancelBuildAsync(
   return data.build!.cancel;
 }
 
-function formatUnfinishedBuild(
-  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
-): string {
-  const platform = appPlatformEmojis[build.platform];
-  const startTime = new Date(build.createdAt).toLocaleString();
-  let statusText: string;
-  if (build.status === BuildStatus.New) {
-    statusText = 'new';
-  } else if (build.status === BuildStatus.InQueue) {
-    statusText = 'in queue';
-  } else {
-    statusText = 'in progress';
-  }
-  const status = chalk.blue(statusText);
-  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
-}
-
 export async function selectBuildToCancelAsync(
   graphqlClient: ExpoGraphqlClient,
   projectId: string,
-  projectDisplayName: string
+  projectDisplayName: string,
+  filters?: {
+    platform?: RequestedPlatform;
+    profile?: string;
+  }
 ): Promise<string | null> {
   const spinner = ora().start('Fetching the uncompleted builds…');
 
   let builds;
   try {
-    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.New },
-      }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.InQueue },
-      }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.InProgress },
-      }),
-    ]);
+    builds = await fetchBuildsAsync({
+      graphqlClient,
+      projectId,
+      filters: {
+        ...filters,
+        statuses: [BuildStatus.New, BuildStatus.InQueue, BuildStatus.InProgress],
+      },
+    });
     spinner.stop();
-    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
   } catch (error) {
     spinner.fail(
       `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
@@ -97,13 +71,13 @@ export async function selectBuildToCancelAsync(
     throw error;
   }
   if (builds.length === 0) {
-    Log.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
+    Log.warn(`We couldn't find any uncompleted builds for the project ${projectDisplayName}.`);
     return null;
   } else {
     const buildId = await selectAsync<string>(
       'Which build do you want to cancel?',
       builds.map(build => ({
-        title: formatUnfinishedBuild(build),
+        title: formatBuild(build),
         value: build.id,
       }))
     );
@@ -116,17 +90,6 @@ export async function selectBuildToCancelAsync(
   }
 }
 
-async function ensureBuildExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<void> {
-  try {
-    await BuildQuery.byIdAsync(graphqlClient, buildId);
-  } catch {
-    throw new Error(`Couldn't find a build matching the id ${buildId}`);
-  }
-}
-
 export default class BuildCancel extends EasCommand {
   static override description = 'cancel a build';
 
@@ -134,6 +97,16 @@ export default class BuildCancel extends EasCommand {
 
   static override flags = {
     ...EASNonInteractiveFlag,
+    platform: Flags.enum({
+      char: 'p',
+      description: 'Filter builds by the platform if build ID is not provided',
+      options: Object.values(RequestedPlatform),
+    }),
+    profile: Flags.string({
+      char: 'e',
+      description: 'Filter builds by build profile if build ID is not provided',
+      helpValue: 'PROFILE_NAME',
+    }),
   };
 
   static override contextDefinition = {
@@ -145,8 +118,15 @@ export default class BuildCancel extends EasCommand {
   async runAsync(): Promise<void> {
     const {
       args: { BUILD_ID: buildIdFromArg },
-      flags: { 'non-interactive': nonInteractive },
+      flags: { 'non-interactive': nonInteractive, platform, profile },
     } = await this.parse(BuildCancel);
+
+    if (buildIdFromArg && (platform || profile)) {
+      throw new Error(
+        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
+      );
+    }
+
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -163,10 +143,13 @@ export default class BuildCancel extends EasCommand {
     let buildId: string | null = buildIdFromArg;
     if (!buildId) {
       if (nonInteractive) {
-        throw new Error('BUILD_ID must not be empty in non-interactive mode');
+        throw new Error('Build ID must be provided in non-interactive mode');
       }
 
-      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName);
+      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName, {
+        platform,
+        profile,
+      });
       if (!buildId) {
         return;
       }

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

@@ -11,10 +11,7 @@ import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectU
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import {
-  ensureEASUpdateIsConfiguredInEasJsonAsync,
-  ensureUseClassicUpdatesIsRemovedAsync,
-} from '../../update/configure';
+import { ensureEASUpdateIsConfiguredInEasJsonAsync } from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 
 export default class BuildConfigure extends EasCommand {
@@ -38,7 +35,6 @@ export default class BuildConfigure extends EasCommand {
     const { flags } = await this.parse(BuildConfigure);
     const {
       privateProjectConfig: { exp, projectId, projectDir },
-      loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
@@ -70,34 +66,26 @@ export default class BuildConfigure extends EasCommand {
       vcsClient,
     });
     if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
-      if (exp.updates?.useClassicUpdates) {
-        // NOTE: this method modifies the Expo config; be sure to use this function's return value
-        // if the config object is used later in the future
-        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
-      }
-
       await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
     }
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
         if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
         }
       }
 
       if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+          useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+        });
         if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(
-            graphqlClient,
-            vcsClient,
-            projectDir,
-            exp,
-            projectId
-          );
+          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
         }
       }
     }

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

@@ -0,0 +1,148 @@
+import { Flags } from '@oclif/core';
+import gql from 'graphql-tag';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { withErrorHandlingAsync } from '../../graphql/client';
+import { Build, DeleteBuildMutation, DeleteBuildMutationVariables } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+async function deleteBuildAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<Pick<Build, 'id'>> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<DeleteBuildMutation, DeleteBuildMutationVariables>(
+        gql`
+          mutation DeleteBuildMutation($buildId: ID!) {
+            build(buildId: $buildId) {
+              deleteBuild(buildId: $buildId) {
+                id
+              }
+            }
+          }
+        `,
+        { buildId }
+      )
+      .toPromise()
+  );
+  return data.build!.deleteBuild;
+}
+
+export async function selectBuildToDeleteAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  projectDisplayName: string,
+  filters?: {
+    platform?: RequestedPlatform;
+    profile?: string;
+  }
+): Promise<string | null> {
+  const spinner = ora().start('Fetching builds…');
+
+  let builds;
+  try {
+    builds = await fetchBuildsAsync({ graphqlClient, projectId, filters });
+    spinner.stop();
+  } catch (error) {
+    spinner.fail(
+      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
+    );
+    throw error;
+  }
+  if (builds.length === 0) {
+    Log.warn(`We couldn't find any builds for the project ${projectDisplayName}.`);
+    return null;
+  } else {
+    const buildId = await selectAsync<string>(
+      'Which build do you want to delete?',
+      builds.map(build => ({
+        title: formatBuild(build),
+        value: build.id,
+      }))
+    );
+
+    return (await confirmAsync({
+      message: 'Are you sure you want to delete it?',
+    }))
+      ? buildId
+      : null;
+  }
+}
+
+export default class BuildDelete extends EasCommand {
+  static override description = 'delete a build';
+  static override args = [{ name: 'BUILD_ID' }];
+  static override flags = {
+    ...EASNonInteractiveFlag,
+    platform: Flags.enum({
+      char: 'p',
+      description: 'Filter builds by the platform if build ID is not provided',
+      options: Object.values(RequestedPlatform),
+    }),
+    profile: Flags.string({
+      char: 'e',
+      description: 'Filter builds by build profile if build ID is not provided',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      args: { BUILD_ID: buildIdFromArg },
+      flags: { 'non-interactive': nonInteractive, platform, profile },
+    } = await this.parse(BuildDelete);
+
+    if (buildIdFromArg && (platform || profile)) {
+      throw new Error(
+        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
+      );
+    }
+
+    const {
+      privateProjectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(BuildDelete, { nonInteractive });
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+
+    if (buildIdFromArg) {
+      await ensureBuildExistsAsync(graphqlClient, buildIdFromArg);
+    }
+
+    let buildId: string | null = buildIdFromArg;
+    if (!buildId) {
+      if (nonInteractive) {
+        throw new Error('Build ID must be provided in non-interactive mode');
+      }
+
+      buildId = await selectBuildToDeleteAsync(graphqlClient, projectId, displayName, {
+        platform,
+        profile,
+      });
+      if (!buildId) {
+        return;
+      }
+    }
+
+    const spinner = ora().start('Deleting the build...');
+    try {
+      await deleteBuildAsync(graphqlClient, buildId);
+      spinner.succeed('Build deleted');
+    } catch (error) {
+      spinner.fail(`Something went wrong and we couldn't delete your build ${buildId}`);
+      throw error;
+    }
+  }
+}

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

@@ -94,7 +94,9 @@ export default class BuildInspect extends EasCommand {
 
     if (flags.stage === InspectStage.ARCHIVE) {
       await vcsClient.ensureRepoExistsAsync();
-      await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
+      await vcsClient.makeShallowCopyAsync(tmpWorkingdir, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {
       try {

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

@@ -10,6 +10,7 @@ import {
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
 import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import Log from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { buildDistributionTypeToGraphQLDistributionType } from '../../utils/buildDistribution';
@@ -51,6 +52,10 @@ export default class BuildList extends EasCommand {
     ...EasPaginatedQueryFlags,
     limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
     ...EasNonInteractiveAndJsonFlags,
+    simulator: Flags.boolean({
+      description:
+        'Filter only iOS simulator builds. Can only be used with --platform flag set to "ios"',
+    }),
   };
 
   static override contextDefinition = {
@@ -69,6 +74,17 @@ export default class BuildList extends EasCommand {
       distribution: buildDistribution,
       'non-interactive': nonInteractive,
     } = flags;
+    if (buildDistribution === BuildDistributionType.SIMULATOR) {
+      Log.warn(
+        `Using --distribution flag with "simulator" value is deprecated - use --simulator flag instead`
+      );
+    }
+    if (flags.simulator && requestedPlatform !== RequestedPlatform.Ios) {
+      Log.error(
+        `The --simulator flag is only usable with --platform flag set to "ios", as it is used to filter specifically iOS simulator builds`
+      );
+      process.exit(1);
+    }
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -100,6 +116,7 @@ export default class BuildList extends EasCommand {
         appIdentifier: flags.appIdentifier,
         buildProfile: flags.buildProfile,
         gitCommitHash: flags.gitCommitHash,
+        simulator: flags.simulator,
       },
       paginatedQueryOptions,
     });

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

@@ -11,7 +11,7 @@ import {
   PaginatedQueryOptions,
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
-import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
+import { AppPlatform, BuildFragment, BuildStatus } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -200,8 +200,7 @@ async function maybeGetBuildAsync(
   projectId: string,
   paginatedQueryOptions: PaginatedQueryOptions
 ): Promise<BuildFragment | null> {
-  const distributionType =
-    flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
+  const simulator = flags.selectedPlatform === AppPlatform.Ios ? true : undefined;
 
   if (flags.runArchiveFlags.id) {
     const build = await BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
@@ -219,9 +218,9 @@ async function maybeGetBuildAsync(
       } build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
       filter: {
         platform: flags.selectedPlatform,
-        distribution: distributionType,
         status: BuildStatus.Finished,
         buildProfile: flags.profile,
+        simulator,
       },
       paginatedQueryOptions,
       selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
@@ -235,9 +234,9 @@ async function maybeGetBuildAsync(
       projectId,
       filter: {
         platform: flags.selectedPlatform,
-        distribution: distributionType,
         status: BuildStatus.Finished,
         buildProfile: flags.profile,
+        simulator,
       },
     });
 

packages/eas-cli/src/commands/build/version/set.ts

@@ -1,4 +1,4 @@
-import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { getRuntimeVersionNullableAsync } from '@expo/config-plugins/build/utils/Updates';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
@@ -116,7 +116,8 @@ export default class BuildVersionSetView extends EasCommand {
       applicationIdentifier,
       storeVersion: exp.version ?? '1.0.0',
       buildVersion: String(version),
-      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
+      runtimeVersion:
+        (await getRuntimeVersionNullableAsync(projectDir, exp, platform)) ?? undefined,
     });
   }
 }

packages/eas-cli/src/commands/build/version/sync.ts

@@ -109,7 +109,9 @@ export default class BuildVersionSyncView extends EasCommand {
         toAppPlatform(profileInfo.platform),
         applicationIdentifier
       );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient, {
+        useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+      });
       if (!remoteVersions?.buildVersion) {
         Log.warn(
           `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`

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

@@ -4,7 +4,11 @@ import { print } from 'graphql';
 import gql from 'graphql-tag';
 
 import { selectBranchOnAppAsync } from '../../branch/queries';
-import { hasEmptyBranchMap, hasStandardBranchMap } from '../../channel/branch-mapping';
+import {
+  getAlwaysTrueBranchMapping,
+  hasEmptyBranchMap,
+  hasStandardBranchMap,
+} from '../../channel/branch-mapping';
 import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
@@ -124,11 +128,7 @@ export default class ChannelEdit extends EasCommand {
 
     const channel = await updateChannelBranchMappingAsync(graphqlClient, {
       channelId: existingChannel.id,
-      // todo: move branch mapping logic to utility
-      branchMapping: JSON.stringify({
-        data: [{ branchId: branch.id, branchMappingLogic: 'true' }],
-        version: 0,
-      }),
+      branchMapping: JSON.stringify(getAlwaysTrueBranchMapping(branch.id)),
     });
 
     if (json) {

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

@@ -132,7 +132,7 @@ export default class ChannelRollout extends EasCommand {
     const { args, flags } = await this.parse(ChannelRollout);
     const argsAndFlags = this.sanitizeArgsAndFlags({ ...flags, ...args });
     const {
-      privateProjectConfig: { exp, projectId },
+      privateProjectConfig: { exp, projectId, projectDir },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelRollout, {
       nonInteractive: argsAndFlags.nonInteractive,
@@ -141,9 +141,8 @@ export default class ChannelRollout extends EasCommand {
       enableJsonOutput();
     }
 
-    const app = { projectId, exp };
+    const app = { projectId, exp, projectDir };
     const ctx = {
-      projectId,
       nonInteractive: argsAndFlags.nonInteractive,
       graphqlClient,
       app,

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

@@ -50,9 +50,7 @@ export default class Config extends EasCommand {
       maybeProfile ??
       (await selectAsync(
         'Select build profile',
-        (
-          await EasJsonUtils.getBuildProfileNamesAsync(accessor)
-        ).map(profileName => ({
+        (await EasJsonUtils.getBuildProfileNamesAsync(accessor)).map(profileName => ({
           title: profileName,
           value: profileName,
         }))

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

@@ -50,8 +50,12 @@ export default class Diagnostics extends EasCommand {
   }
 
   private async printWorkflowAsync(projectDir: string, vcsClient: Client): Promise<void> {
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient, {
+      useEASIgnoreIfAvailableWhenEvaluatingFileIgnores: true,
+    });
 
     if (androidWorkflow === iosWorkflow) {
       Log.log(`    Project workflow: ${androidWorkflow}`);

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

@@ -37,7 +37,6 @@ export default class Open extends EasCommand {
       } else {
         spinner.fail(failedMessage);
       }
-      return;
     } catch (error) {
       spinner.fail(failedMessage);
       throw error;

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

@@ -1,30 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { instance, mock } from 'ts-mockito';
-
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { ensureEASUpdateIsConfiguredAsync } from '../../../update/configure';
-import { Client } from '../../../vcs/vcs';
-
-describe(ensureEASUpdateIsConfiguredAsync, () => {
-  it('errors with "useClassicUpdates" set and no app.json', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
-    const vcsClient = instance(mock<Client>({}));
-    const exp: ExpoConfig = {
-      name: 'test',
-      slug: 'test',
-      updates: { useClassicUpdates: true },
-    };
-
-    await expect(async () => {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
-        exp,
-        projectId: 'test',
-        projectDir: '/tmp/test',
-        platform: null,
-        vcsClient,
-      });
-    }).rejects.toThrow(
-      `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`
-    );
-  });
-});

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

@@ -324,7 +324,7 @@ function mockTestExport({
     uniqueUploadedAssetPaths: [],
   });
 
-  jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+  jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
   return { inputDir: exportDir, platforms, runtimeVersion };
 }

packages/eas-cli/src/commands/update/__tests__/roll-back-to-embedded.test.ts

@@ -84,7 +84,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
     mockTestProject();
     const platforms = ['android', 'ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
       branchId: 'branch123',
@@ -106,7 +106,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
     const { projectId } = mockTestProject();
     const platforms = ['android', 'ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
@@ -154,7 +154,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
 
     const platforms = ['ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     // Mock an existing branch, so we don't create a new one
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({

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

@@ -35,7 +35,6 @@ export default class UpdateConfigure extends EasCommand {
     const platform = flags.platform as RequestedPlatform;
     const {
       privateProjectConfig: { projectId, exp, projectDir },
-      loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(UpdateConfigure, {
       nonInteractive: flags['non-interactive'],
@@ -47,7 +46,7 @@ export default class UpdateConfigure extends EasCommand {
 
     await vcsClient.ensureRepoExistsAsync();
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp,
       projectId,
       projectDir,

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

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
 import { ensureBranchExistsAsync } from '../../branch/queries';
+import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -29,7 +30,6 @@ import {
   collectAssetsAsync,
   defaultPublishPlatforms,
   filterExportedPlatformsByFlag,
-  generateEasMetadataAsync,
   getBranchNameForCommandAsync,
   getRequestedPlatform,
   getRuntimeToPlatformMappingFromRuntimeVersions,
@@ -56,7 +56,6 @@ import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 
 type RawUpdateFlags = {
   auto: boolean;
-  dev: boolean;
   branch?: string;
   channel?: string;
   message?: string;
@@ -75,7 +74,6 @@ type RawUpdateFlags = {
 
 type UpdateFlags = {
   auto: boolean;
-  dev: boolean;
   platform: ExpoCLIExportPlatformFlag;
   branchName?: string;
   channelName?: string;
@@ -136,10 +134,6 @@ export default class UpdatePublish extends EasCommand {
       default: 'all',
       required: false,
     }),
-    dev: Flags.boolean({
-      description: 'Publish a development bundle',
-      default: false,
-    }),
     auto: Flags.boolean({
       description:
         'Use the current git branch and commit message for the EAS branch and update message',
@@ -165,7 +159,6 @@ export default class UpdatePublish extends EasCommand {
       auto: autoFlag,
       platform: platformFlag,
       channelName: channelNameArg,
-      dev,
       updateMessage: updateMessageArg,
       inputDir,
       skipBundler,
@@ -189,6 +182,9 @@ export default class UpdatePublish extends EasCommand {
       enableJsonOutput();
     }
 
+    await vcsClient.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(vcsClient, nonInteractive);
+
     const {
       exp: expPossiblyWithoutEasUpdateConfigured,
       projectId,
@@ -197,7 +193,7 @@ export default class UpdatePublish extends EasCommand {
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp: expPossiblyWithoutEasUpdateConfigured,
       platform: getRequestedPlatform(platformFlag),
       projectDir,
@@ -231,7 +227,7 @@ export default class UpdatePublish extends EasCommand {
     if (!skipBundler) {
       const bundleSpinner = ora().start('Exporting...');
       try {
-        await buildBundlesAsync({ projectDir, inputDir, dev, exp, platformFlag, clearCache });
+        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache });
         bundleSpinner.succeed('Exported bundle(s)');
       } catch (e) {
         bundleSpinner.fail('Export failed');
@@ -363,12 +359,13 @@ export default class UpdatePublish extends EasCommand {
       throw e;
     }
 
-    const runtimeVersions = await getRuntimeVersionObjectAsync(
+    const runtimeVersions = await getRuntimeVersionObjectAsync({
       exp,
-      realizedPlatforms,
+      platforms: realizedPlatforms,
       projectDir,
-      vcsClient
-    );
+      vcsClient,
+      nonInteractive,
+    });
     const runtimeToPlatformMapping =
       getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
 
@@ -469,9 +466,6 @@ export default class UpdatePublish extends EasCommand {
       throw e;
     }
 
-    if (!skipBundler) {
-      await generateEasMetadataAsync(distRoot, getUpdateJsonInfosForUpdates(newUpdates));
-    }
     if (jsonFlag) {
       printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
     } else {
@@ -547,7 +541,7 @@ export default class UpdatePublish extends EasCommand {
   private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
     const nonInteractive = flags['non-interactive'] ?? false;
 
-    const { auto, branch: branchName, channel: channelName, dev, message: updateMessage } = flags;
+    const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
     if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
       Errors.error(
         '--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified',
@@ -576,7 +570,6 @@ export default class UpdatePublish extends EasCommand {
       auto,
       branchName,
       channelName,
-      dev,
       updateMessage,
       inputDir: flags['input-dir'],
       skipBundler: flags['skip-bundler'],

packages/eas-cli/src/commands/update/roll-back-to-embedded.ts

@@ -148,7 +148,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp: expPossiblyWithoutEasUpdateConfigured,
       platform: getRequestedPlatform(platformFlag),
       projectDir,
@@ -201,12 +201,13 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     const gitCommitHash = await vcsClient.getCommitHashAsync();
     const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
 
-    const runtimeVersions = await getRuntimeVersionObjectAsync(
+    const runtimeVersions = await getRuntimeVersionObjectAsync({
       exp,
-      realizedPlatforms,
+      platforms: realizedPlatforms,
       projectDir,
-      vcsClient
-    );
+      vcsClient,
+      nonInteractive,
+    });
 
     let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
     const publishSpinner = ora('Publishing...').start();

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

@@ -1,9 +1,9 @@
 import { Flags } from '@oclif/core';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { promptAsync } from '../../prompts';
 import UpdateRepublish from './republish';
 import UpdateRollBackToEmbedded from './roll-back-to-embedded';
+import EasCommand from '../../commandUtils/EasCommand';
+import { promptAsync } from '../../prompts';
 
 export default class UpdateRollback extends EasCommand {
   static override description = 'roll back to an embedded update or an existing update';

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

@@ -1,3 +1,9 @@
+import {
+  testKeystore2Base64,
+  testKeystoreBase64,
+  testPKCS12KeystoreBase64,
+  testPKCS12KeystoreEmptyPasswordBase64,
+} from './fixtures-base64-data';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidFcmFragment,
@@ -11,12 +17,6 @@ import {
 } from '../../graphql/generated';
 import * as AndroidGraphqlClient from '../android/api/GraphqlClient';
 import { Keystore } from '../android/credentials';
-import {
-  testKeystore2Base64,
-  testKeystoreBase64,
-  testPKCS12KeystoreBase64,
-  testPKCS12KeystoreEmptyPasswordBase64,
-} from './fixtures-base64-data';
 
 const now = new Date();
 

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

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

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

@@ -1,5 +1,6 @@
 import { UserRole } from '@expo/apple-utils';
 
+import { testProvisioningProfileBase64 } from './fixtures-base64-data';
 import {
   AppFragment,
   AppStoreConnectApiKeyFragment,
@@ -21,7 +22,6 @@ import {
   ProvisioningProfile,
 } from '../ios/appstore/Credentials.types';
 import { Target } from '../ios/types';
-import { testProvisioningProfileBase64 } from './fixtures-base64-data';
 
 const now = new Date();
 

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

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

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

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

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

@@ -6,7 +6,7 @@ import Log from '../../../log';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 
-export class AssignGoogleServiceAccountKey {
+export class AssignGoogleServiceAccountKeyForSubmissions {
   constructor(private app: AppLookupParams) {}
 
   public async runAsync(

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

@@ -46,7 +46,7 @@ export class CreateGoogleServiceAccountKey {
 
     Log.log(
       `${chalk.bold(
-        'A Google Service Account JSON key is required to upload your app to Google Play Store'
+        'A Google Service Account JSON key is required for uploading your app to Google Play Store, and for sending Android Notifications via FCM V1.'
       )}.\n` +
         `If you're not sure what this is or how to create one, ${learnMore(
           'https://expo.fyi/creating-google-service-account',

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

@@ -1,11 +1,11 @@
 import chalk from 'chalk';
 
+import { BackupKeystore } from './DownloadKeystore';
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-import { BackupKeystore } from './DownloadKeystore';
 
 export class RemoveKeystore {
   constructor(private app: AppLookupParams) {}

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

@@ -1,5 +1,11 @@
 import nullthrows from 'nullthrows';
 
+import {
+  canCopyLegacyCredentialsAsync,
+  createOrUpdateDefaultAndroidAppBuildCredentialsAsync,
+  promptUserAndCopyLegacyCredentialsAsync,
+} from './BuildCredentialsUtils';
+import { CreateKeystore } from './CreateKeystore';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidKeystoreFragment,
@@ -9,12 +15,6 @@ import { ora } from '../../../ora';
 import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
-import {
-  canCopyLegacyCredentialsAsync,
-  createOrUpdateDefaultAndroidAppBuildCredentialsAsync,
-  promptUserAndCopyLegacyCredentialsAsync,
-} from './BuildCredentialsUtils';
-import { CreateKeystore } from './CreateKeystore';
 
 interface Options {
   app: AppLookupParams;

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

@@ -1,3 +1,4 @@
+import { BackupKeystore } from './DownloadKeystore';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidKeystoreType,
@@ -12,7 +13,6 @@ import {
 } from '../../manager/SelectAndroidBuildCredentials';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { getKeystoreWithType } from '../utils/keystoreNew';
-import { BackupKeystore } from './DownloadKeystore';
 
 export class SetUpBuildCredentialsFromCredentialsJson {
   constructor(private app: AppLookupParams) {}

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

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

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

@@ -1,5 +1,8 @@
 import nullthrows from 'nullthrows';
 
+import { AssignGoogleServiceAccountKeyForSubmissions } from './AssignGoogleServiceAccountKeyForSubmissions';
+import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
+import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';
 import {
   CommonAndroidAppCredentialsFragment,
   GoogleServiceAccountKeyFragment,
@@ -9,11 +12,8 @@ import { promptAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
-import { AssignGoogleServiceAccountKey } from './AssignGoogleServiceAccountKey';
-import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
-import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';
 
-export class SetUpGoogleServiceAccountKey {
+export class SetUpGoogleServiceAccountKeyForSubmissions {
   constructor(private app: AppLookupParams) {}
 
   public async runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment> {
@@ -46,7 +46,10 @@ export class SetUpGoogleServiceAccountKey {
     } else {
       googleServiceAccountKey = await this.createOrUseExistingKeyAsync(ctx);
     }
-    return await new AssignGoogleServiceAccountKey(this.app).runAsync(ctx, googleServiceAccountKey);
+    return await new AssignGoogleServiceAccountKeyForSubmissions(this.app).runAsync(
+      ctx,
+      googleServiceAccountKey
+    );
   }
 
   private async isGoogleServiceAccountKeySetupAsync(ctx: CredentialsContext): Promise<boolean> {

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

@@ -2,12 +2,12 @@ import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { testGoogleServiceAccountKeyFragment } from '../../../__tests__/fixtures-android';
 import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
-import { AssignGoogleServiceAccountKey } from '../AssignGoogleServiceAccountKey';
+import { AssignGoogleServiceAccountKeyForSubmissions } from '../AssignGoogleServiceAccountKeyForSubmissions';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 
 jest.mock('../../../../graphql/queries/AppQuery');
 
-describe(AssignGoogleServiceAccountKey, () => {
+describe(AssignGoogleServiceAccountKeyForSubmissions, () => {
   beforeEach(() => {
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
   });
@@ -16,7 +16,9 @@ describe(AssignGoogleServiceAccountKey, () => {
       nonInteractive: false,
     });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
+    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKeyForSubmissions(
+      appLookupParams
+    );
     await assignGoogleServiceAccountKeyAction.runAsync(ctx, testGoogleServiceAccountKeyFragment);
 
     // expect app credentials to be fetched/created, then updated
@@ -30,7 +32,9 @@ describe(AssignGoogleServiceAccountKey, () => {
       nonInteractive: true,
     });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKey(appLookupParams);
+    const assignGoogleServiceAccountKeyAction = new AssignGoogleServiceAccountKeyForSubmissions(
+      appLookupParams
+    );
 
     // dont fail if users are running in non-interactive mode
     await expect(

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

@@ -11,7 +11,7 @@ import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants'
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
-import { SetUpGoogleServiceAccountKey } from '../SetUpGoogleServiceAccountKey';
+import { SetUpGoogleServiceAccountKeyForSubmissions } from '../SetUpGoogleServiceAccountKeyForSubmissions';
 
 jest.mock('../../../../prompts');
 jest.mock('fs');
@@ -24,7 +24,7 @@ beforeEach(() => {
   vol.reset();
 });
 
-describe(SetUpGoogleServiceAccountKey, () => {
+describe(SetUpGoogleServiceAccountKeyForSubmissions, () => {
   beforeEach(() => {
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
   });
@@ -39,7 +39,9 @@ describe(SetUpGoogleServiceAccountKey, () => {
       },
     });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKeyForSubmissions(
+      appLookupParams
+    );
     await setupGoogleServiceAccountKeyAction.runAsync(ctx);
 
     expect(ctx.android.createGoogleServiceAccountKeyAsync).not.toHaveBeenCalled();
@@ -62,7 +64,9 @@ describe(SetUpGoogleServiceAccountKey, () => {
       },
     });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKeyForSubmissions(
+      appLookupParams
+    );
     await setupGoogleServiceAccountKeyAction.runAsync(ctx);
 
     expect(ctx.android.createGoogleServiceAccountKeyAsync).toHaveBeenCalledTimes(1);
@@ -73,7 +77,9 @@ describe(SetUpGoogleServiceAccountKey, () => {
       nonInteractive: true,
     });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKeyForSubmissions(
+      appLookupParams
+    );
     await expect(setupGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError(
       MissingCredentialsNonInteractiveError
     );

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

@@ -1,3 +1,10 @@
+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';
+import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   AccountFragment,
@@ -11,13 +18,6 @@ import {
 } from '../../../graphql/generated';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 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';
-import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
 
 export interface AppLookupParams {
   account: AccountFragment;
@@ -106,9 +106,11 @@ export async function updateAndroidAppCredentialsAsync(
   {
     androidFcmId,
     googleServiceAccountKeyForSubmissionsId,
+    googleServiceAccountKeyForFcmV1Id,
   }: {
     androidFcmId?: string;
     googleServiceAccountKeyForSubmissionsId?: string;
+    googleServiceAccountKeyForFcmV1Id?: string;
   }
 ): Promise<CommonAndroidAppCredentialsFragment> {
   let updatedAppCredentials = appCredentials;
@@ -127,6 +129,14 @@ export async function updateAndroidAppCredentialsAsync(
         googleServiceAccountKeyForSubmissionsId
       );
   }
+  if (googleServiceAccountKeyForFcmV1Id) {
+    updatedAppCredentials =
+      await AndroidAppCredentialsMutation.setGoogleServiceAccountKeyForFcmV1Async(
+        graphqlClient,
+        appCredentials.id,
+        googleServiceAccountKeyForFcmV1Id
+      );
+  }
   return updatedAppCredentials;
 }
 

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

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

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

@@ -3,8 +3,8 @@
 exports[`print credentials prints the AndroidAppCredentials fragment 1`] = `
 "Android Credentials     
 Project                 testApp
-Application Identifier  test.com.appPush Notifications (FCM)  Key      abcd...efgh
-Updated  0 second agoGoogle Service Account Key For Submissions  Project ID      sdf.sdf.sdf
+Application Identifier  test.com.appPush Notifications (FCM Legacy)  Key      abcd...efgh
+Updated  0 second agoPush Notifications (FCM V1): Google Service Account Key For FCM V1    None assigned yetSubmissions: Google Service Account Key for Play Store Submissions  Project ID      sdf.sdf.sdf
 Client Email    [email protected]
 Client ID       test-client-identifier
 Private Key ID  test-private-key-identifier