From d4022b7df0d15263be710c5900a42bd1514454b9 Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 14:41:22 +0200 Subject: [PATCH 1/6] [eas-cli] Update eas.schema.json Updated the eas.schema.json with the current image values for Android images See: https://linear.app/expo/issue/ENG-11310/fix-warnings-errors-that-come-up-when-adding-eas-to-a-react-native-cli --- packages/eas-json/schema/eas.schema.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 8764db57be..0cfb9365a6 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -239,10 +239,15 @@ "anyOf": [ { "enum": [ - "auto", + "default", "latest", + "stable", + "sdk-51", "sdk-50", "sdk-49", + "ubuntu-22.04-jdk-17-ndk-r25b", + "ubuntu-22.04-jdk-11-ndk-r23b", + "ubuntu-20.04-jdk-11-ndk-r23b", "ubuntu-22.04-jdk-17-ndk-r21e", "ubuntu-22.04-jdk-11-ndk-r21e", "ubuntu-20.04-jdk-11-ndk-r21e", From 85c63e338a3e22bb2d68783701ae716b09502cff Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 14:45:56 +0200 Subject: [PATCH 2/6] [eas-cli] Update eas.schema.json Updated the eas.schema.json with the current image values for Android images See: https://linear.app/expo/issue/ENG-11602/preinstall-gradle-and-ndks-used-in-the-3-latests-sdks-on-android --- packages/eas-json/schema/eas.schema.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 0cfb9365a6..be65145f84 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -258,9 +258,9 @@ ], "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`" + "The latest Android image currently available. It is resolved to `ubuntu-22.04-jdk-17-ndk-r25b`. 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-r25b`", + "The recommended image for SDK 49 builds: `ubuntu-22.04-jdk-11-ndk-r23b`" ] }, { From 8689a6aadc8ea0a12d36b23abbae1e688dd686b3 Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 14:53:47 +0200 Subject: [PATCH 3/6] [eas-cli] Update eas.schema.json Returned the auto option See: https://linear.app/expo/issue/ENG-11602/preinstall-gradle-and-ndks-used-in-the-3-latests-sdks-on-android --- packages/eas-json/schema/eas.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index be65145f84..e93dd9c54a 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -239,7 +239,7 @@ "anyOf": [ { "enum": [ - "default", + "auto", "latest", "stable", "sdk-51", From 36de2840cb212b225c3d3113f66df79f26ebb291 Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 14:56:10 +0200 Subject: [PATCH 4/6] [eas-cli] Update eas.schema.json Updated descriptions See: https://linear.app/expo/issue/ENG-11602/preinstall-gradle-and-ndks-used-in-the-3-latests-sdks-on-android --- packages/eas-json/schema/eas.schema.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index e93dd9c54a..1d0129178e 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -259,6 +259,8 @@ "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-r25b`. The `latest` to image mapping will be updated as new images are released.", + "The latest Android image available that is considered stable. It is resolved to `ubuntu-22.04-jdk-17-ndk-r21e`. The `stable` to image mapping will be updated as new images are released.", + "The recommended image for SDK 51 builds: `ubuntu-22.04-jdk-17-ndk-r25b`", "The recommended image for SDK 50 builds: `ubuntu-22.04-jdk-17-ndk-r25b`", "The recommended image for SDK 49 builds: `ubuntu-22.04-jdk-11-ndk-r23b`" ] From 8b94c3cf53f5bba088e3814503180f2b35c1fc13 Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 14:56:57 +0200 Subject: [PATCH 5/6] [eas-cli] Update eas.schema.json Removed stable option See: https://linear.app/expo/issue/ENG-11602/preinstall-gradle-and-ndks-used-in-the-3-latests-sdks-on-android --- packages/eas-json/schema/eas.schema.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/eas-json/schema/eas.schema.json b/packages/eas-json/schema/eas.schema.json index 1d0129178e..1703320595 100644 --- a/packages/eas-json/schema/eas.schema.json +++ b/packages/eas-json/schema/eas.schema.json @@ -241,7 +241,6 @@ "enum": [ "auto", "latest", - "stable", "sdk-51", "sdk-50", "sdk-49", @@ -259,7 +258,6 @@ "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-r25b`. The `latest` to image mapping will be updated as new images are released.", - "The latest Android image available that is considered stable. It is resolved to `ubuntu-22.04-jdk-17-ndk-r21e`. The `stable` to image mapping will be updated as new images are released.", "The recommended image for SDK 51 builds: `ubuntu-22.04-jdk-17-ndk-r25b`", "The recommended image for SDK 50 builds: `ubuntu-22.04-jdk-17-ndk-r25b`", "The recommended image for SDK 49 builds: `ubuntu-22.04-jdk-11-ndk-r23b`" From fe37820f0cc4376831b449eef9a91706b46d9941 Mon Sep 17 00:00:00 2001 From: Radoslaw Krzemien Date: Tue, 23 Apr 2024 18:11:28 +0000 Subject: [PATCH 6/6] update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b8afadd31..1c585827b7 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 +- Update the list of available Android images. ([#2337](https://github.com/expo/eas-cli/pull/2337) by [@radoslawkrzemien](https://github.com/radoslawkrzemien)) + ## [7.8.3](https://github.com/expo/eas-cli/releases/tag/v7.8.3) - 2024-04-23 ### ๐Ÿ› Bug fixes