From ab12b36482ade376fd1051609fe1eeb89da39587 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 16:06:50 +0100 Subject: [PATCH 01/11] [eas-cli] mark `default` image tag as deprecated --- .../eas-cli/src/build/runBuildAndSubmit.ts | 12 +++++++++ packages/eas-json/schema/eas.schema.json | 25 +++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index 8080a1b3b0..51a93b7e10 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -132,6 +132,18 @@ export async function runBuildAndSubmitAsync( }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}` ); + for (const buildProfile of buildProfiles) { + if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) { + Log.warn( + `The "image" field in the build profile "${buildProfile.profileName}" is set to "${ + buildProfile.profile.image + }". This tag is deprecated and will be removed in the future. ${learnMore( + 'https://docs.expo.dev/TBA-when-docs-are-updated' + )}` + ); + } + } + await ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive: flags.nonInteractive, diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 6b3beb29b9..62d9cdb1ef 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -239,9 +239,7 @@ "anyOf": [ { "enum": [ - "default", "latest", - "stable", "ubuntu-22.04-jdk-17-ndk-r21e", "ubuntu-22.04-jdk-11-ndk-r21e", "ubuntu-22.04-jdk-8-ndk-r21e", @@ -250,14 +248,15 @@ "ubuntu-20.04-jdk-11-ndk-r19c", "ubuntu-20.04-jdk-8-ndk-r19c" ], - "markdownEnumDescriptions": [ - "- React Native `>=0.68.0` - `ubuntu-22.04-jdk-11-ndk-r21e`\n- React Native `<0.68.0` - `ubuntu-20.04-jdk-8-ndk-r19c`", - "`ubuntu-22.04-jdk-17-ndk-r21e`", - "`ubuntu-22.04-jdk-11-ndk-r21e`" - ] + "markdownEnumDescriptions": ["`ubuntu-22.04-jdk-17-ndk-r21e`"] }, { - "type": "string" + "deprecated": true, + "enum": ["default", "stable"], + "markdownEnumDescriptions": [ + "This image tag is deprecated, please use other image tags or images directly instead.", + "This image tag is deprecated, please use other image tags or images directly instead." + ] } ] }, @@ -363,7 +362,6 @@ "anyOf": [ { "enum": [ - "default", "latest", "macos-sonoma-14.4-xcode-15.3", "macos-ventura-13.6-xcode-15.2", @@ -375,19 +373,20 @@ "macos-monterey-12.6-xcode-14.1", "macos-monterey-12.6-xcode-14.0" ], - "markdownEnumDescriptions": [ - "`macos-ventura-13.4-xcode-14.3.1`", - "`macos-sonoma-14.4-xcode-15.3`" - ] + "markdownEnumDescriptions": ["`macos-sonoma-14.4-xcode-15.3`"] }, { "deprecated": true, "enum": [ + "default", + "stable", "macos-monterey-12.4-xcode-13.4", "macos-monterey-12.3-xcode-13.3", "macos-monterey-12.1-xcode-13.2" ], "markdownEnumDescriptions": [ + "This image tag is deprecated, please use other image tags or images directly instead.", + "This image tag is deprecated, please use other image tags or images directly instead.", "This image is deprecated, please use one of the more recent images instead.", "This image is deprecated, please use one of the more recent images instead.", "This image is deprecated, please use one of the more recent images instead." From e5cd46fba7a4a3dc33b457e98db8f175a3e77da1 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 16:21:33 +0100 Subject: [PATCH 02/11] add new image tags to `eas.schema.json` --- packages/eas-json/schema/eas.schema.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 62d9cdb1ef..be83917f1b 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -239,7 +239,10 @@ "anyOf": [ { "enum": [ + "auto", "latest", + "sdk-50", + "sdk-49", "ubuntu-22.04-jdk-17-ndk-r21e", "ubuntu-22.04-jdk-11-ndk-r21e", "ubuntu-22.04-jdk-8-ndk-r21e", @@ -248,7 +251,12 @@ "ubuntu-20.04-jdk-11-ndk-r19c", "ubuntu-20.04-jdk-8-ndk-r19c" ], - "markdownEnumDescriptions": ["`ubuntu-22.04-jdk-17-ndk-r21e`"] + "markdownEnumDescriptions": [ + "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.", + "The latest Android image currently available. It is resolved to `ubuntu-22.04-jdk-17-ndk-r21e`. The `latest` to image mapping will be updated as new images are released.", + "The recommended image for SDK 50 builds: `ubuntu-22.04-jdk-17-ndk-r21e`", + "The recommended image for SDK 49 builds: `ubuntu-22.04-jdk-11-ndk-r21e`" + ] }, { "deprecated": true, @@ -362,7 +370,10 @@ "anyOf": [ { "enum": [ + "auto", "latest", + "sdk-50", + "sdk-49", "macos-sonoma-14.4-xcode-15.3", "macos-ventura-13.6-xcode-15.2", "macos-ventura-13.6-xcode-15.1", @@ -373,7 +384,12 @@ "macos-monterey-12.6-xcode-14.1", "macos-monterey-12.6-xcode-14.0" ], - "markdownEnumDescriptions": ["`macos-sonoma-14.4-xcode-15.3`"] + "markdownEnumDescriptions": [ + "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.", + "The latest iOS image currently available. It is resolved to `macos-sonoma-14.4-xcode-15.3`. The `latest` to image mapping will be updated as new images are released.", + "The recommended image for SDK 50 builds: `macos-ventura-13.6-xcode-15.2`", + "The recommended image for SDK 49 builds: `macos-ventura-13.6-xcode-15.2`" + ] }, { "deprecated": true, From 8bd5d6e3f9651a5261dde4bfb4524bfc379d5fa2 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 15:24:18 +0000 Subject: [PATCH 03/11] update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 790cb57ba7..0b60524906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ This is the log of notable changes to EAS CLI and related packages. ### ๐Ÿงน Chores +- Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) + ## [7.7.0](https://github.com/expo/eas-cli/releases/tag/v7.7.0) - 2024-04-05 ### ๐ŸŽ‰ New features From c8a68610c76d5972804a73bb4724ae4fb28f6d64 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 15:24:46 +0000 Subject: [PATCH 04/11] update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b60524906..db4c149c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This is the log of notable changes to EAS CLI and related packages. ### ๐ŸŽ‰ New features +- Add `auto`, `sdk-50` and `sdk-49` image tags. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) + ### ๐Ÿ› Bug fixes ### ๐Ÿงน Chores From b5f12f085c47d74c0e0be9a2d9ea4fff9e1e21a0 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 17:33:19 +0100 Subject: [PATCH 05/11] deprecate JDK 8 and NDK r19c images --- .../eas-cli/src/build/runBuildAndSubmit.ts | 19 +++++++++++++++-- packages/eas-json/schema/eas.schema.json | 21 ++++++++++++------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index 51a93b7e10..2e4b650706 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -133,11 +133,26 @@ export async function runBuildAndSubmitAsync( ); for (const buildProfile of buildProfiles) { - if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) { + if ( + buildProfile.profile.image && + [ + 'default', + 'stable', + 'ubuntu-22.04-jdk-8-ndk-r21e', + 'ubuntu-20.04-jdk-8-ndk-r21e', + 'ubuntu-20.04-jdk-11-ndk-r19c', + 'ubuntu-20.04-jdk-8-ndk-r19c', + 'macos-monterey-12.4-xcode-13.4', + 'macos-monterey-12.3-xcode-13.3', + 'macos-monterey-12.1-xcode-13.2', + ].includes(buildProfile.profile.image) + ) { Log.warn( `The "image" field in the build profile "${buildProfile.profileName}" is set to "${ buildProfile.profile.image - }". This tag is deprecated and will be removed in the future. ${learnMore( + }". This ${ + ['default', 'stable'].includes(buildProfile.profile.image) ? 'tag' : 'image' + } is deprecated and will be removed in the future. ${learnMore( 'https://docs.expo.dev/TBA-when-docs-are-updated' )}` ); diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index be83917f1b..2dda956e89 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -245,11 +245,7 @@ "sdk-49", "ubuntu-22.04-jdk-17-ndk-r21e", "ubuntu-22.04-jdk-11-ndk-r21e", - "ubuntu-22.04-jdk-8-ndk-r21e", - "ubuntu-20.04-jdk-11-ndk-r21e", - "ubuntu-20.04-jdk-8-ndk-r21e", - "ubuntu-20.04-jdk-11-ndk-r19c", - "ubuntu-20.04-jdk-8-ndk-r19c" + "ubuntu-20.04-jdk-11-ndk-r21e" ], "markdownEnumDescriptions": [ "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.", @@ -260,10 +256,21 @@ }, { "deprecated": true, - "enum": ["default", "stable"], + "enum": [ + "default", + "stable", + "ubuntu-22.04-jdk-8-ndk-r21e", + "ubuntu-20.04-jdk-8-ndk-r21e", + "ubuntu-20.04-jdk-11-ndk-r19c", + "ubuntu-20.04-jdk-8-ndk-r19c" + ], "markdownEnumDescriptions": [ "This image tag is deprecated, please use other image tags or images directly instead.", - "This image tag is deprecated, please use other image tags or images directly instead." + "This image tag is deprecated, please use other image tags or images directly instead.", + "This image is deprecated, please use one of the more recent images instead.", + "This image is deprecated, please use one of the more recent images instead.", + "This image is deprecated, please use one of the more recent images instead.", + "This image is deprecated, please use one of the more recent images instead." ] } ] From 30be73b9669c86e2812f40d2fb024c10f6b12a7b Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 25 Mar 2024 16:36:09 +0000 Subject: [PATCH 06/11] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db4c149c8b..12f632b7f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This is the log of notable changes to EAS CLI and related packages. ### ๐Ÿงน Chores - Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) +- Deprecate Android images with JDK 8 and NDK `r19c`. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) ## [7.7.0](https://github.com/expo/eas-cli/releases/tag/v7.7.0) - 2024-04-05 From 645c7ac5f8c3d9914c007c1f17422642f7ff7d3a Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Fri, 29 Mar 2024 13:33:44 +0100 Subject: [PATCH 07/11] use better warn message for Xcode < 14 images and link to our changelog post --- .../eas-cli/src/build/runBuildAndSubmit.ts | 25 ++++++++++++++++--- packages/eas-json/schema/eas.schema.json | 25 +++++++++++-------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index 2e4b650706..ca3ac1338f 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -142,9 +142,6 @@ export async function runBuildAndSubmitAsync( 'ubuntu-20.04-jdk-8-ndk-r21e', 'ubuntu-20.04-jdk-11-ndk-r19c', 'ubuntu-20.04-jdk-8-ndk-r19c', - 'macos-monterey-12.4-xcode-13.4', - 'macos-monterey-12.3-xcode-13.3', - 'macos-monterey-12.1-xcode-13.2', ].includes(buildProfile.profile.image) ) { Log.warn( @@ -157,6 +154,28 @@ export async function runBuildAndSubmitAsync( )}` ); } + + if ( + buildProfile.profile.image && + [ + 'macos-monterey-12.4-xcode-13.4', + 'macos-monterey-12.3-xcode-13.3', + 'macos-monterey-12.1-xcode-13.2', + 'macos-ventura-13.4-xcode-14.3.1', + 'macos-ventura-13.3-xcode-14.3', + 'macos-monterey-12.6-xcode-14.2', + 'macos-monterey-12.6-xcode-14.1', + 'macos-monterey-12.6-xcode-14.0', + ].includes(buildProfile.profile.image) + ) { + Log.warn( + `The "image" field in the build profile "${buildProfile.profileName}" is set to "${ + buildProfile.profile.image + }". This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting macos-ventura-13.6-xcode-15.2 or latest as your image value. This image will be removed from EAS Build on May 29th, 2024. ${learnMore( + 'https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates' + )}` + ); + } } await ensureExpoDevClientInstalledForDevClientBuildsAsync({ diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 2dda956e89..31ec7db9c1 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -384,12 +384,7 @@ "macos-sonoma-14.4-xcode-15.3", "macos-ventura-13.6-xcode-15.2", "macos-ventura-13.6-xcode-15.1", - "macos-ventura-13.6-xcode-15.0", - "macos-ventura-13.4-xcode-14.3.1", - "macos-ventura-13.3-xcode-14.3", - "macos-monterey-12.6-xcode-14.2", - "macos-monterey-12.6-xcode-14.1", - "macos-monterey-12.6-xcode-14.0" + "macos-ventura-13.6-xcode-15.0" ], "markdownEnumDescriptions": [ "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.", @@ -405,14 +400,24 @@ "stable", "macos-monterey-12.4-xcode-13.4", "macos-monterey-12.3-xcode-13.3", - "macos-monterey-12.1-xcode-13.2" + "macos-monterey-12.1-xcode-13.2", + "macos-ventura-13.4-xcode-14.3.1", + "macos-ventura-13.3-xcode-14.3", + "macos-monterey-12.6-xcode-14.2", + "macos-monterey-12.6-xcode-14.1", + "macos-monterey-12.6-xcode-14.0" ], "markdownEnumDescriptions": [ "This image tag is deprecated, please use other image tags or images directly instead.", "This image tag is deprecated, please use other image tags or images directly instead.", - "This image is deprecated, please use one of the more recent images instead.", - "This image is deprecated, please use one of the more recent images instead.", - "This image is deprecated, please use one of the more recent images instead." + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates." ] } ] From 651d8909ffa85af17c7b86c96ff5835f346d1f8a Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Fri, 29 Mar 2024 13:42:54 +0100 Subject: [PATCH 08/11] update warn message --- packages/eas-cli/src/build/runBuildAndSubmit.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index ca3ac1338f..073adb95ec 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -149,9 +149,7 @@ export async function runBuildAndSubmitAsync( buildProfile.profile.image }". This ${ ['default', 'stable'].includes(buildProfile.profile.image) ? 'tag' : 'image' - } is deprecated and will be removed in the future. ${learnMore( - 'https://docs.expo.dev/TBA-when-docs-are-updated' - )}` + } is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/` ); } From 5c9dbd336bc2f2195cd0ffcff57b4df98cf3d734 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 8 Apr 2024 10:45:05 +0200 Subject: [PATCH 09/11] don't deprecate Androdi images in this PR --- .../eas-cli/src/build/runBuildAndSubmit.ts | 18 +-------- packages/eas-json/schema/eas.schema.json | 37 ++++++++----------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index 073adb95ec..acf826f5f6 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -133,23 +133,9 @@ export async function runBuildAndSubmitAsync( ); for (const buildProfile of buildProfiles) { - if ( - buildProfile.profile.image && - [ - 'default', - 'stable', - 'ubuntu-22.04-jdk-8-ndk-r21e', - 'ubuntu-20.04-jdk-8-ndk-r21e', - 'ubuntu-20.04-jdk-11-ndk-r19c', - 'ubuntu-20.04-jdk-8-ndk-r19c', - ].includes(buildProfile.profile.image) - ) { + if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) { Log.warn( - `The "image" field in the build profile "${buildProfile.profileName}" is set to "${ - buildProfile.profile.image - }". This ${ - ['default', 'stable'].includes(buildProfile.profile.image) ? 'tag' : 'image' - } is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/` + `The "image" field in the build profile "${buildProfile.profileName}" is set to "${buildProfile.profile.image}". This tag is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/` ); } diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 31ec7db9c1..2abe7f1dcc 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -245,7 +245,11 @@ "sdk-49", "ubuntu-22.04-jdk-17-ndk-r21e", "ubuntu-22.04-jdk-11-ndk-r21e", - "ubuntu-20.04-jdk-11-ndk-r21e" + "ubuntu-20.04-jdk-11-ndk-r21e", + "ubuntu-22.04-jdk-8-ndk-r21e", + "ubuntu-20.04-jdk-8-ndk-r21e", + "ubuntu-20.04-jdk-11-ndk-r19c", + "ubuntu-20.04-jdk-8-ndk-r19c" ], "markdownEnumDescriptions": [ "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.", @@ -256,21 +260,10 @@ }, { "deprecated": true, - "enum": [ - "default", - "stable", - "ubuntu-22.04-jdk-8-ndk-r21e", - "ubuntu-20.04-jdk-8-ndk-r21e", - "ubuntu-20.04-jdk-11-ndk-r19c", - "ubuntu-20.04-jdk-8-ndk-r19c" - ], + "enum": ["default", "stable"], "markdownEnumDescriptions": [ "This image tag is deprecated, please use other image tags or images directly instead.", - "This image tag is deprecated, please use other image tags or images directly instead.", - "This image is deprecated, please use one of the more recent images instead.", - "This image is deprecated, please use one of the more recent images instead.", - "This image is deprecated, please use one of the more recent images instead.", - "This image is deprecated, please use one of the more recent images instead." + "This image tag is deprecated, please use other image tags or images directly instead." ] } ] @@ -410,14 +403,14 @@ "markdownEnumDescriptions": [ "This image tag is deprecated, please use other image tags or images directly instead.", "This image tag is deprecated, please use other image tags or images directly instead.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates." + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates." ] } ] From 82d48426e1fcd7dfbba1d531c760b926eadc5127 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 8 Apr 2024 10:46:40 +0200 Subject: [PATCH 10/11] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12f632b7f8..2728d58d5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ This is the log of notable changes to EAS CLI and related packages. ### ๐Ÿงน Chores - Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) -- Deprecate Android images with JDK 8 and NDK `r19c`. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) +- Deprecate iOS images with Xcode version lower then 15. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic)) ## [7.7.0](https://github.com/expo/eas-cli/releases/tag/v7.7.0) - 2024-04-05 From 9b905aa7bd1a5669207a05f80a61ef374238e97c Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 8 Apr 2024 11:56:31 +0200 Subject: [PATCH 11/11] use correct latest image --- packages/eas-cli/src/build/runBuildAndSubmit.ts | 2 +- packages/eas-json/schema/eas.schema.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index acf826f5f6..d16b808463 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -155,7 +155,7 @@ export async function runBuildAndSubmitAsync( Log.warn( `The "image" field in the build profile "${buildProfile.profileName}" is set to "${ buildProfile.profile.image - }". This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting macos-ventura-13.6-xcode-15.2 or latest as your image value. This image will be removed from EAS Build on May 29th, 2024. ${learnMore( + }". This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting "macos-sonoma-14.4-xcode-15.3" or "latest" as your image value. This image will be removed from EAS Build on May 29th, 2024. ${learnMore( 'https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates' )}` ); diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 2abe7f1dcc..8764db57be 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -403,14 +403,14 @@ "markdownEnumDescriptions": [ "This image tag is deprecated, please use other image tags or images directly instead.", "This image tag is deprecated, please use other image tags or images directly instead.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", - "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-ventura-13.6-xcode-15.2` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates." + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates.", + "This image is using Xcode in version lower then 15. Apple's new requirement states that starting on April 29th, 2024, apps uploaded to App Store Connect must be built with Xcode 15 for iOS 17, iPadOS 17, tvOS 17, or watchOS 10. Start using Xcode 15 image today by setting `macos-sonoma-14.4-xcode-15.3` or `latest` as your image value. This image will be removed from EAS Build on May 29th, 2024. Learn more: https://expo.dev/changelog/2024/03-29-eas-build-upcoming-ios-images-updates." ] } ]