From 0229e22dc656f8faa34def791c93949f3bc832b6 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 09:41:07 +0000 Subject: [PATCH 1/9] Release script: Update gutenberg submodule --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 9a80ddde2c..2198346b5e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 9a80ddde2c5c4d9c0c296f582b27a7a3a6bf1ddd +Subproject commit 2198346b5e99517d2f8e442df8907813e9b266ca From c5735ce5d50822a19aa05300a1f8e5b8b785a0ed Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 09:42:35 +0000 Subject: [PATCH 2/9] 1.114.0 --- 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 718f443ed3..45e154488b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gutenberg-mobile", - "version": "1.112.0", + "version": "1.114.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gutenberg-mobile", - "version": "1.112.0", + "version": "1.114.0", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/package.json b/package.json index 0e22b19f68..632ef25967 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gutenberg-mobile", - "version": "1.112.0", + "version": "1.114.0", "private": true, "config": { "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js", From dc3471073cb4abbc0ecb0d35c45c1cdfbd7126ac Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 09:48:47 +0000 Subject: [PATCH 3/9] Release script: Update i18n files for 1.114.0 --- bundle/android/strings.xml | 6 +++++- bundle/ios/GutenbergNativeTranslations.swift | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml index bc92b80078..c5d75c0f56 100644 --- a/bundle/android/strings.xml +++ b/bundle/android/strings.xml @@ -33,6 +33,7 @@ Add URL Add video Address Settings + Alt Text Alternatively, you can convert the content to blocks. Alternatively, you can detach and edit this block separately by tapping “Detach”. @@ -48,7 +49,7 @@ audio file Audio Player - Autoplay may cause usability issues for some users + Autoplay may cause usability issues for some users. Block cannot be rendered because it is deeply nested. Tap here for more details. Block copied @@ -314,6 +315,9 @@ translators: %s: Select control button label e.g. "Button width" --> Replace video Retry Rich text editing + + %s block \'%s\' block converted to blocks diff --git a/bundle/ios/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift index f702168650..04ad8a7bb1 100644 --- a/bundle/ios/GutenbergNativeTranslations.swift +++ b/bundle/ios/GutenbergNativeTranslations.swift @@ -6,6 +6,7 @@ private func dummy() { _ = NSLocalizedString("%1$s transformed to %2$s", comment: "translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header.") _ = NSLocalizedString("%1$s. %2$s is %3$s %4$s.", comment: "translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels)") _ = NSLocalizedString("%1$s. Currently selected: %2$s", comment: "translators: %1$s: Select control button label e.g. \"Button width\". %2$s: Select control option value e.g: \"Auto, 25%\".") + _ = NSLocalizedString("%s block", comment: "translators: Block name. %s: The localized block name\ntranslators: %s: Block name e.g. \"Image block\"") _ = NSLocalizedString("%s block options", comment: "translators: %s: block title e.g: \"Paragraph\".") _ = NSLocalizedString("%s block, newly available", comment: "translators: Newly available block name. %s: The localized block name") _ = NSLocalizedString("%s block. Empty", comment: "translators: accessibility text for the media block empty state. %s: media type") @@ -43,6 +44,7 @@ private func dummy() { _ = NSLocalizedString("Add URL", comment: "") _ = NSLocalizedString("Add video", comment: "") _ = NSLocalizedString("Address Settings", comment: "") + _ = NSLocalizedString("Alt Text", comment: "") _ = NSLocalizedString("Alternatively, you can convert the content to blocks.", comment: "") _ = NSLocalizedString("Alternatively, you can detach and edit this block separately by tapping “Detach”.", comment: "") _ = NSLocalizedString("Alternatively, you can flatten the content by ungrouping the block.", comment: "translators: Alternative option included in a warning related to having blocks deeply nested.") @@ -54,7 +56,7 @@ private func dummy() { _ = NSLocalizedString("Audio caption. Empty", comment: "translators: accessibility text. Empty Audio caption.") _ = NSLocalizedString("audio file", comment: "translators: displays audio file extension. e.g. MP3 audio file") _ = NSLocalizedString("Audio Player", comment: "") - _ = NSLocalizedString("Autoplay may cause usability issues for some users", comment: "") + _ = NSLocalizedString("Autoplay may cause usability issues for some users.", comment: "") _ = NSLocalizedString("Block cannot be rendered because it is deeply nested. Tap here for more details.", comment: "") _ = NSLocalizedString("Block copied", comment: "translators: displayed right after the block is copied.") _ = NSLocalizedString("Block cut", comment: "translators: displayed right after the block is cut.") From a97cf4173b48ac3e38970c356dc4fd378f6faa76 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 09:53:20 +0000 Subject: [PATCH 4/9] Release script: Sync XCFramework `Podfile.lock` with 1.114.0 --- ios-xcframework/Podfile.lock | 4 ++-- .../XCFrameworkScaffold.xcodeproj/project.pbxproj | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ios-xcframework/Podfile.lock b/ios-xcframework/Podfile.lock index 9e609ada32..4e0146c08b 100644 --- a/ios-xcframework/Podfile.lock +++ b/ios-xcframework/Podfile.lock @@ -427,7 +427,7 @@ PODS: - React-RCTImage - RNSVG (13.9.0): - React-Core - - RNTAztecView (1.112.0): + - RNTAztecView (1.114.0): - React-Core - WordPress-Aztec-iOS (= 1.19.9) - SDWebImage (5.11.1): @@ -662,7 +662,7 @@ SPEC CHECKSUMS: RNReanimated: 21e1e71d7f1ac9f2fa11df37c06a8ec52ed06232 RNScreens: e3ffdd78ff5afe8ec82c2566ee2410857ed5ce75 RNSVG: 29dd0ac32d83774d4b0953ae92a5cd8205a782d7 - RNTAztecView: 74c676c87e4a9db79104fcdad9624c1e5c02fe15 + RNTAztecView: 68c970e04c9f7ae81ba64810667a07a66e6ba0b7 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb diff --git a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj index cc463b99df..84f70d06ad 100644 --- a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj +++ b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj @@ -370,11 +370,7 @@ "$(inherited)", _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Debug; @@ -389,11 +385,7 @@ "$(inherited)", _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Release; From 484c9625de682579348ca5f9d24a0c22e2a908c5 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 09:53:21 +0000 Subject: [PATCH 5/9] Release script: Update release notes for version 1.114.0 --- RELEASE-NOTES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 2c4633641d..6e7231b648 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,8 @@ Unreleased --- + +1.114.0 +--- * [**] Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] * [*] Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110] * [*] Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264] From d25601eddc3030ebc76b453cf86f5d79a7aa716a Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 10:39:09 +0000 Subject: [PATCH 6/9] Empty commit to retrigger checks. From a71aa63fcdaa4220e2566344022b2dffffa45eaf Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 14:44:44 +0000 Subject: [PATCH 7/9] Update Gutenberg reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 2198346b5e..971081f2c0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 2198346b5e99517d2f8e442df8907813e9b266ca +Subproject commit 971081f2c0b819c4bd6de4adebf0d94f123cc979 From 29272135494d34e63df1e198fa3474acd1ec9659 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 14:45:52 +0000 Subject: [PATCH 8/9] Update project.pbxproj with Xcode 15 patch See: https://github.com/wordpress-mobile/gutenberg-mobile/pull/6687#discussion_r1507519820 --- .../XCFrameworkScaffold.xcodeproj/project.pbxproj | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj index 84f70d06ad..cc463b99df 100644 --- a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj +++ b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj @@ -370,7 +370,11 @@ "$(inherited)", _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Debug; @@ -385,7 +389,11 @@ "$(inherited)", _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../gutenberg/node_modules/react-native"; }; name = Release; From 025e308247d1b881992cfba684ec8385038cbc1b Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 29 Feb 2024 17:01:58 +0000 Subject: [PATCH 9/9] Update Gutenberg reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 971081f2c0..28295ee43b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 971081f2c0b819c4bd6de4adebf0d94f123cc979 +Subproject commit 28295ee43b04104bbde8cf3014b2daaecade61df