From 3d9837c84da9aa3f91543e3a678e04bcba3c8435 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Jan 2024 15:44:58 -0500 Subject: [PATCH 1/6] Release script: Update gutenberg submodule --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 2858e13fbc..f3569d0a17 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 2858e13fbc1182dc1d70231436b3c2d06b39c684 +Subproject commit f3569d0a17052f8c5a9521ba9a52ae1c56f7931d From 999c8dea47c4b59185f418a5ea6259cbb5be2f78 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Jan 2024 15:46:22 -0500 Subject: [PATCH 2/6] 1.110.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3259c01d5c..0b01b5e4d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gutenberg-mobile", - "version": "1.110.0", + "version": "1.110.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gutenberg-mobile", - "version": "1.110.0", + "version": "1.110.1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/package.json b/package.json index 767f9b084a..8ac8c51ddb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gutenberg-mobile", - "version": "1.110.0", + "version": "1.110.1", "private": true, "config": { "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js", From d7a7dc351809972969a9a7033ae68524909ea3f1 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Jan 2024 15:54:30 -0500 Subject: [PATCH 3/6] Release script: Sync XCFramework `Podfile.lock` with 1.110.1 --- ios-xcframework/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock index 0988fc9bd8..683266a9db 100644 --- a/ios-xcframework/Podfile.lock +++ b/ios-xcframework/Podfile.lock @@ -424,7 +424,7 @@ PODS: - React-RCTImage - RNSVG (13.9.0): - React-Core - - RNTAztecView (1.110.0): + - RNTAztecView (1.110.1): - React-Core - WordPress-Aztec-iOS (= 1.19.9) - SDWebImage (5.11.1): @@ -659,7 +659,7 @@ SPEC CHECKSUMS: RNReanimated: 21e1e71d7f1ac9f2fa11df37c06a8ec52ed06232 RNScreens: e3ffdd78ff5afe8ec82c2566ee2410857ed5ce75 RNSVG: 29dd0ac32d83774d4b0953ae92a5cd8205a782d7 - RNTAztecView: 75ea6f071cbdd0f0afe83de7b93c0691a2bebd21 + RNTAztecView: dbfc3b0f8e5ac309fbce408e7a2921f00d31e836 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb From 86ed50e4778c9730201f75200e50fd2fb0928552 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Jan 2024 15:56:53 -0500 Subject: [PATCH 4/6] Release script: Update release notes for version 1.110.1 --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 941cfa12c0..8285fed36a 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,10 @@ Unreleased --- +1.110.1 +--- +* [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563] + 1.110.0 --- * [**] Fix crash when sharing unsupported media types on Android [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6444] From 801c7c041d3448cf25539577dfecbeb530cb3e8d Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 10 Jan 2024 11:57:23 +1100 Subject: [PATCH 5/6] Use HTTPS Git URLs in Git submodules (#6525) --- .buildkite/commands/build-ios.sh | 11 ++++------- .buildkite/pipeline.yml | 2 +- .gitmodules | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.buildkite/commands/build-ios.sh b/.buildkite/commands/build-ios.sh index 18a7d7f833..a4675c7d9b 100755 --- a/.buildkite/commands/build-ios.sh +++ b/.buildkite/commands/build-ios.sh @@ -7,13 +7,10 @@ echo '--- :ios: Set env var for iOS E2E testing' set -x export TEST_RN_PLATFORM=ios export TEST_ENV=sauce -CONFIG_FILE="$(pwd)/gutenberg/packages/react-native-editor/__device-tests__/helpers/device-config.json" -# Uses the local deviceName since SauceLabs uses a different one. -IOS_DEVICE_NAME=$(jq -r '.ios.local.deviceName' "$CONFIG_FILE") -IOS_PLATFORM_VERSION=$(jq -r '.ios.buildkite.platformVersion' "$CONFIG_FILE") -# Set a destination different from the hardcoded one which only works in the -# older Xcode-setup used by CircleCI -export RN_EDITOR_E2E_IOS_DESTINATION="platform=iOS Simulator,name=$IOS_DEVICE_NAME,OS=$IOS_PLATFORM_VERSION" +# We must use a simulator that's available on the selected Xcode version +# otherwsie Xcode fallbacks to "generic destination" which requires provision +# profiles to built the Demo app. +export RN_EDITOR_E2E_IOS_DESTINATION="platform=iOS Simulator,name=iPhone 15,OS=17.2" set +x echo '--- :react: Build iOS app for E2E testing' diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 61a784cc55..e4dd2db932 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -28,7 +28,7 @@ x-common-params: - &ci_toolkit_plugin automattic/a8c-ci-toolkit#2.18.2 - &xcode_agent_env - IMAGE_ID: xcode-14.3.1 + IMAGE_ID: xcode-15.1 - &is_branch_for_full_ui_tests build.branch == 'trunk' || build.branch =~ /^release.*/ || build.branch =~ /^dependabot\/submodules.*/ - &is_branch_for_quick_ui_tests diff --git a/.gitmodules b/.gitmodules index 033104bc66..9add6d9656 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "gutenberg"] path = gutenberg - url = ../../WordPress/gutenberg.git + url = https://github.com/WordPress/gutenberg.git shallow = true [submodule "jetpack"] path = jetpack - url = ../../Automattic/jetpack.git + url = https://github.com/Automattic/jetpack.git shallow = true [submodule "block-experiments"] path = block-experiments - url = ../../Automattic/block-experiments.git + url = https://github.com/Automattic/block-experiments.git shallow = true From 09299129335feb0134ec523034cd11d74fcaeb59 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 12:02:52 +0100 Subject: [PATCH 6/6] Update Gutenberg ref with merge commit --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index f3569d0a17..65c1f46db7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f3569d0a17052f8c5a9521ba9a52ae1c56f7931d +Subproject commit 65c1f46db7ed277e5932c81664e57558d9a981c6