From 6033a88d0768c89afa58d81e603e3c2756a75393 Mon Sep 17 00:00:00 2001 From: Derek Blank Date: Tue, 23 Jan 2024 10:35:09 +1000 Subject: [PATCH 1/5] Update gutenberg-mobile ref to 1.110.1 --- Gutenberg/config.yml | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 1d1311433fcf..32be97aea32e 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - tag: v1.110.0 + commit: 801c7c041d3448cf25539577dfecbeb530cb3e8d github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 35f8ccf85a0c..5e5f392cd3b3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - FSInteractiveMap (0.1.0) - Gifu (3.3.1) - Gridicons (1.2.0) - - Gutenberg (1.110.0) + - Gutenberg (1.110.1) - JTAppleCalendar (8.0.5) - Kanvas (1.4.9): - CropViewController @@ -107,7 +107,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.0.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-801c7c041d3448cf25539577dfecbeb530cb3e8d.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -176,7 +176,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.0.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-801c7c041d3448cf25539577dfecbeb530cb3e8d.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -199,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 0e64ef7d9c46ba0a681c82f5969622f3db9bf033 + Gutenberg: 6a74fdd2fb6a9280241bc1e960b552c84b8d99f1 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From b994f8399a12dc8bd58a89479475dd4fe328efed Mon Sep 17 00:00:00 2001 From: Derek Blank Date: Tue, 23 Jan 2024 10:35:51 +1000 Subject: [PATCH 2/5] Update RELEASE-NOTES.txt --- RELEASE-NOTES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e97ee3c00edc..347757241f3b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,9 @@ 24.1 ----- +24.0.1 +----- +* [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563] 24.0 ----- From 2e325dab60ee1ead208e2f19f78ab92dd19a504c Mon Sep 17 00:00:00 2001 From: Derek Blank Date: Tue, 23 Jan 2024 12:37:13 +1000 Subject: [PATCH 3/5] Update Gutenberg ref to 1.110.1 tag --- Gutenberg/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 32be97aea32e..aca862de9d55 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 801c7c041d3448cf25539577dfecbeb530cb3e8d + tag: v1.110.1 github_org: wordpress-mobile repo_name: gutenberg-mobile From 1b67c0eea339dff8fda85198aac355f79b9d7b1c Mon Sep 17 00:00:00 2001 From: Derek Blank Date: Tue, 23 Jan 2024 12:52:09 +1000 Subject: [PATCH 4/5] Update Podfile.lock --- Podfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 5e5f392cd3b3..a4a2a91c6183 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -107,7 +107,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-801c7c041d3448cf25539577dfecbeb530cb3e8d.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.1.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -176,7 +176,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-801c7c041d3448cf25539577dfecbeb530cb3e8d.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.110.1.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -199,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 6a74fdd2fb6a9280241bc1e960b552c84b8d99f1 + Gutenberg: 8447da3bcd1f27d4fc7559ad0c78eebb8521352b JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From 51b02626913521008b0b23a6bb8a931136c82b53 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Mon, 22 Jan 2024 22:12:37 -0800 Subject: [PATCH 5/5] Bump version number --- config/Version.internal.xcconfig | 4 ++-- config/Version.public.xcconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig index 1ee9c570d67e..4d022141aa6b 100644 --- a/config/Version.internal.xcconfig +++ b/config/Version.internal.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 24.0.0.20240118 -VERSION_SHORT = 24.0 +VERSION_LONG = 24.0.1.20240122 +VERSION_SHORT = 24.0.1 diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig index 769ddae0edb0..2227e6118166 100644 --- a/config/Version.public.xcconfig +++ b/config/Version.public.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 24.0.0.3 -VERSION_SHORT = 24.0 +VERSION_LONG = 24.0.1.0 +VERSION_SHORT = 24.0.1