-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge beta 19.7.0.2 into trunk
#18463
Conversation
…with a minimum scale factor of 0.75
…-input-smaller-screens Fix Site Name screen layout on smaller iPhones
Moved `description.txt`, `keywords.txt`, `name.txt` and `subtitle.txt` from `fastlane/appstoreres/*metadata/source` to `fastlane/*metadata/default` for consistency as a source of truth. Note that `release_notes.txt` will be copied to `fastlane/*metadata/default` from `WordPress/Resources/release_notes.txt` on each sprint during the `download_*_localized_app_store_metadata` lanes (until we make that location the new source of truth for release notes later too)
`ios_bump_version_release` would otherwise try to update the `let glotPressWhatsNewKey` constant from `download_metadata.swift` file when bumping the release version.
To prevent a locale folder which we have listed in our Fastfile for WordPress/Jetpack to be ignored by `deliver` if it ends up empty because no translation is available in GlotPress
h/t @mokagio for noticing! Co-authored-by: Gio Lodi <[email protected]>
Co-authored-by: Gio Lodi <[email protected]>
Co-authored-by: Gio Lodi <[email protected]>
…elease_1.74.1 Integrate gutenberg-mobile release 1.74.1
…nto-trunk Got a conflict in `WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift` because: - 0caf937 changed it on `trunk` - 3be617f changed in on `release/19.7` The commit on `trunk` was older (by one day) but the code it results with seems better to me because it doesn't use arbitrary emojis as delimiters for the selected site name. I ensured the app built, but did not run the tests locally or manually verified the how the screen where `SiteNameView` is used renders. The conflict was: ```diff diff --cc WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift index 28af882df1,85375f6e2b..0000000000 --- a/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift +++ b/WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift @@@ -144,15 -142,11 +144,23 @@@ private extension SiteNameView /// Highlghts the site name in blue func setupTitleColors() { ++<<<<<<< HEAD + // enclose the vertical name between two characters that are not in the title + // (and reasonably never will..) to distinguish it from any substring in the title + let selectedVerticalName = "😎" + siteVerticalName + "🙃" + let fullTitle = String(format: TextContent.title, selectedVerticalName) + var attributedTitle = NSMutableAttributedString(string: fullTitle) + // Use default title if the vertical name is empty or too long + guard let range = fullTitle.nsRange(of: selectedVerticalName), + !siteVerticalName.isEmpty, + siteVerticalName.count <= Metrics.verticalNameDisplayLimit else { ++======= + // find the index where the vertical name goes, so that it won't be confused + // with any word in the title + let replacementIndex = NSString(string: TextContent.title).range(of: "%@") + + guard !siteVerticalName.isEmpty, replacementIndex.length > 0 else { ++>>>>>>> origin/trunk titleLabel.setText(TextContent.defaultTitle) return } ```
Generated by 🚫 dangerJS |
You can test the changes in Jetpack from this Pull Request by:
|
You can test the changes in WordPress from this Pull Request by:
|
@@ -9497,6 +9494,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */ | |||
/* Sentence to justify why the app asks permission from the user to access their Media Library. */ | |||
"infoplist.NSPhotoLibraryUsageDescription" = "لإضافة صور أو مقاطع فيديو إلى مقالاتك."; | |||
|
|||
/* Footer text for Invite Links section of the Invite People screen. */ | |||
"invite_people_invite_link_footer" = "استخدم هذا الرابط لضم أعضاء فريقك من دون دعوتهم واحدًا تلو الآخر. سيتمكن أي شخص يزور عنوان URL هذا من التسجيل في مؤسستك، حتى إذا تلقى الرابط من شخص آخر، لذا تأكَّد من مشاركته مع أشخاص موثوق بهم."; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pair of removed and added key is a result of the change from this commit. Same for all the other locales.
"To use this app for %@ you'll need to have the Jetpack plugin installed and activated." = "要将此应用用于 %@,您需要安装并启用 Jetpack 插件。"; | ||
"To use this app for %@ you'll need to have the Jetpack plugin installed and activated." = "要将此应用用于 %@,您需要安装并启用 Jetpack 插件。"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The previous version had the wrong %
character which wouldn't have worked in String(format:)
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Properly flagged by the linter, I presume?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Updates to the localization files (
.strings
and Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress - Version update in
.xcconfig
- Diffs from the PRs that made it into this beta
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On the release management side of things (.strings
updates, version bump in xcconfig
etc) all looks good 👍
But I'll leave the honor of approving (or not) to @Gio2018 so he can double check and validate the conflict resolution is correct
I got conflicts on `Podfile` and `Podfile.lock` because of the 1.74.1 hotfix merged in `release/19.7` (#18445) and the 1.75.0 stable being merged on `trunk` (#18451). I resolved them using the `trunk` version, via `git checkout --their Podfile*`. Afterwards, I run `bundle exec pod install` to verify the resulting version of the `Podfile.lock` was consistent. It was. The conflicts were: ```diff diff --cc Podfile index e72f46c8ae,5fa4c42cdc..0000000000 --- a/Podfile +++ b/Podfile @@@ -169,7 -169,7 +169,11 @@@ abstract_target 'Apps' d ## Gutenberg (React Native) ## ===================== ## ++<<<<<<< HEAD + gutenberg :tag => 'v1.74.1' ++======= + gutenberg :tag => 'v1.75.0' ++>>>>>>> origin/trunk ## Third party libraries ## ===================== diff --cc Podfile.lock index ccd9edcf87,28b77167d3..0000000000 --- a/Podfile.lock +++ b/Podfile.lock @@@ -61,7 -61,7 +61,11 @@@ PODS - AppAuth/Core (~> 1.4) - GTMSessionFetcher/Core (~> 1.5) - GTMSessionFetcher/Core (1.7.0) ++<<<<<<< HEAD + - Gutenberg (1.74.1): ++======= + - Gutenberg (1.75.0): ++>>>>>>> origin/trunk - React (= 0.66.2) - React-CoreModules (= 0.66.2) - React-RCTImage (= 0.66.2) @@@ -464,7 -464,7 +468,11 @@@ - React-Core - RNSVG (9.13.6): - React-Core ++<<<<<<< HEAD + - RNTAztecView (1.74.1): ++======= + - RNTAztecView (1.75.0): ++>>>>>>> origin/trunk - React-Core - WordPress-Aztec-iOS (~> 1.19.8) - Sentry (6.2.1): @@@ -525,19 -525,19 +533,34 @@@ DEPENDENCIES - AppCenter (~> 4.1) - AppCenter/Distribute (~> 4.1) - Automattic-Tracks-iOS (~> 0.11.1) ++<<<<<<< HEAD + - boost (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/boost.podspec.json`) + - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/BVLinearGradient.podspec.json`) ++======= + - boost (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/boost.podspec.json`) + - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/BVLinearGradient.podspec.json`) ++>>>>>>> origin/trunk - Charts (~> 3.2.2) - CocoaLumberjack (~> 3.0) - CropViewController (= 2.5.3) - Down (~> 0.6.6) ++<<<<<<< HEAD + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`) + - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) + - Gifu (= 3.2.0) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/glog.podspec.json`) + - Gridicons (~> 1.1.0) + - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.74.1`) ++======= + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`) + - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) + - Gifu (= 3.2.0) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/glog.podspec.json`) + - Gridicons (~> 1.1.0) + - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.75.0`) ++>>>>>>> origin/trunk - JTAppleCalendar (~> 8.0.2) - Kanvas (~> 1.2.7) - MediaEditor (~> 1.2.1) @@@ -547,46 -547,46 +570,89 @@@ - "NSURL+IDN (~> 0.4)" - OCMock (~> 3.4.3) - OHHTTPStubs/Swift (~> 9.1.0) ++<<<<<<< HEAD + - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCT-Folly.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCTTypeSafety.podspec.json`) + - Reachability (= 3.2) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React.podspec.json`) + - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-callinvoker.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsinspector.podspec.json`) + - React-logger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-logger.podspec.json`) + - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-blur.podspec.json`) + - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-get-random-values.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-safe-area-context.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-video.podspec.json`) + - react-native-webview (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-webview.podspec.json`) + - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-perflogger.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTVibration.podspec.json`) + - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-runtimeexecutor.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/ReactCommon.podspec.json`) + - RNCClipboard (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNCClipboard.podspec.json`) + - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNCMaskedView.podspec.json`) + - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNGestureHandler.podspec.json`) + - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNReanimated.podspec.json`) + - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNScreens.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.74.1`) ++======= + - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCT-Folly.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCTTypeSafety.podspec.json`) + - Reachability (= 3.2) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React.podspec.json`) + - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-callinvoker.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsinspector.podspec.json`) + - React-logger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-logger.podspec.json`) + - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-blur.podspec.json`) + - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-get-random-values.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-safe-area-context.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-video.podspec.json`) + - react-native-webview (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-webview.podspec.json`) + - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-perflogger.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTVibration.podspec.json`) + - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-runtimeexecutor.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/ReactCommon.podspec.json`) + - RNCClipboard (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNCClipboard.podspec.json`) + - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNCMaskedView.podspec.json`) + - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNGestureHandler.podspec.json`) + - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNReanimated.podspec.json`) + - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNScreens.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.75.0`) ++>>>>>>> origin/trunk - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.19.8) @@@ -596,7 -596,7 +662,11 @@@ - WordPressShared (~> 1.17.1) - WordPressUI (~> 1.12.5) - WPMediaPicker (~> 1.8.3) ++<<<<<<< HEAD + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/Yoga.podspec.json`) ++======= + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/Yoga.podspec.json`) ++>>>>>>> origin/trunk - ZendeskSupportSDK (= 5.3.0) - ZIPFoundation (~> 0.9.8) @@@ -657,104 -657,104 +727,204 @@@ SPEC REPOS EXTERNAL SOURCES: boost: ++<<<<<<< HEAD + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/boost.podspec.json + BVLinearGradient: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/BVLinearGradient.podspec.json + FBLazyVector: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/FBLazyVector.podspec.json + FBReactNativeSpec: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json ++======= + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/boost.podspec.json + BVLinearGradient: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/BVLinearGradient.podspec.json + FBLazyVector: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/FBLazyVector.podspec.json + FBReactNativeSpec: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json ++>>>>>>> origin/trunk FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 glog: ++<<<<<<< HEAD + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/glog.podspec.json + Gutenberg: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.74.1 + RCT-Folly: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCT-Folly.podspec.json + RCTRequired: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCTRequired.podspec.json + RCTTypeSafety: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RCTTypeSafety.podspec.json + React: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React.podspec.json + React-callinvoker: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-callinvoker.podspec.json + React-Core: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-Core.podspec.json + React-CoreModules: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-CoreModules.podspec.json + React-cxxreact: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-cxxreact.podspec.json + React-jsi: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsi.podspec.json + React-jsiexecutor: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsiexecutor.podspec.json + React-jsinspector: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-jsinspector.podspec.json + React-logger: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-logger.podspec.json + react-native-blur: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-blur.podspec.json + react-native-get-random-values: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-get-random-values.podspec.json + react-native-keyboard-aware-scroll-view: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + react-native-safe-area: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-safe-area.podspec.json + react-native-safe-area-context: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-safe-area-context.podspec.json + react-native-slider: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-slider.podspec.json + react-native-video: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-video.podspec.json + react-native-webview: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/react-native-webview.podspec.json + React-perflogger: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-perflogger.podspec.json + React-RCTActionSheet: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTActionSheet.podspec.json + React-RCTAnimation: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTAnimation.podspec.json + React-RCTBlob: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTBlob.podspec.json + React-RCTImage: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTImage.podspec.json + React-RCTLinking: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTLinking.podspec.json + React-RCTNetwork: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTNetwork.podspec.json + React-RCTSettings: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTSettings.podspec.json + React-RCTText: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTText.podspec.json + React-RCTVibration: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-RCTVibration.podspec.json + React-runtimeexecutor: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/React-runtimeexecutor.podspec.json + ReactCommon: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/ReactCommon.podspec.json + RNCClipboard: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNCClipboard.podspec.json + RNCMaskedView: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNCMaskedView.podspec.json + RNGestureHandler: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNGestureHandler.podspec.json + RNReanimated: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNReanimated.podspec.json + RNScreens: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNScreens.podspec.json + RNSVG: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/RNSVG.podspec.json + RNTAztecView: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.74.1 + Yoga: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.74.1/third-party-podspecs/Yoga.podspec.json ++======= + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/glog.podspec.json + Gutenberg: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.75.0 + RCT-Folly: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCT-Folly.podspec.json + RCTRequired: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCTRequired.podspec.json + RCTTypeSafety: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RCTTypeSafety.podspec.json + React: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React.podspec.json + React-callinvoker: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-callinvoker.podspec.json + React-Core: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-Core.podspec.json + React-CoreModules: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-CoreModules.podspec.json + React-cxxreact: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-cxxreact.podspec.json + React-jsi: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsi.podspec.json + React-jsiexecutor: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsiexecutor.podspec.json + React-jsinspector: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-jsinspector.podspec.json + React-logger: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-logger.podspec.json + react-native-blur: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-blur.podspec.json + react-native-get-random-values: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-get-random-values.podspec.json + react-native-keyboard-aware-scroll-view: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + react-native-safe-area: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-safe-area.podspec.json + react-native-safe-area-context: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-safe-area-context.podspec.json + react-native-slider: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-slider.podspec.json + react-native-video: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-video.podspec.json + react-native-webview: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/react-native-webview.podspec.json + React-perflogger: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-perflogger.podspec.json + React-RCTActionSheet: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTActionSheet.podspec.json + React-RCTAnimation: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTAnimation.podspec.json + React-RCTBlob: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTBlob.podspec.json + React-RCTImage: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTImage.podspec.json + React-RCTLinking: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTLinking.podspec.json + React-RCTNetwork: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTNetwork.podspec.json + React-RCTSettings: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTSettings.podspec.json + React-RCTText: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTText.podspec.json + React-RCTVibration: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-RCTVibration.podspec.json + React-runtimeexecutor: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/React-runtimeexecutor.podspec.json + ReactCommon: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/ReactCommon.podspec.json + RNCClipboard: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNCClipboard.podspec.json + RNCMaskedView: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNCMaskedView.podspec.json + RNGestureHandler: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNGestureHandler.podspec.json + RNReanimated: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNReanimated.podspec.json + RNScreens: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNScreens.podspec.json + RNSVG: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/RNSVG.podspec.json + RNTAztecView: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.75.0 + Yoga: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.75.0/third-party-podspecs/Yoga.podspec.json ++>>>>>>> origin/trunk CHECKOUT OPTIONS: FSInteractiveMap: @@@ -763,11 -763,11 +933,19 @@@ Gutenberg: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true ++<<<<<<< HEAD + :tag: v1.74.1 + RNTAztecView: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.74.1 ++======= + :tag: v1.75.0 + RNTAztecView: + :git: https://github.com/wordpress-mobile/gutenberg-mobile.git + :submodules: true + :tag: v1.75.0 ++>>>>>>> origin/trunk SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@@ -795,7 -795,7 +973,11 @@@ Gridicons: 17d660b97ce4231d582101b02f8280628b141c9a GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 ++<<<<<<< HEAD + Gutenberg: b7eac5de68793974ada3dffcd71c36efd04f80ce ++======= + Gutenberg: fad4baac1a8fb2474bab90c65b6069f5cf71162c ++>>>>>>> origin/trunk JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99 Kanvas: 9eab00cc89669b38858d42d5f30c810876b31344 MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a @@@ -844,7 -844,7 +1026,11 @@@ RNReanimated: ce406e6a3de52d00d2a1c3a0b2bb5e09227d8ba5 RNScreens: bd1f43d7dfcd435bc11d4ee5c60086717c45a113 RNSVG: 259ef12cbec2591a45fc7c5f09d7aa09e6692533 ++<<<<<<< HEAD + RNTAztecView: d5626e8bd6116468da40728a7b92273bd643830c ++======= + RNTAztecView: 097a8d12a7cb1566ce3a384983906e5994086eed ++>>>>>>> origin/trunk Sentry: 9b922b396b0e0bca8516a10e36b0ea3ebea5faf7 Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 @@@ -869,6 -869,6 +1055,10 @@@ ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 ++<<<<<<< HEAD +PODFILE CHECKSUM: 8886a663b08f5bf55de306ffcb6a229f4694900e ++======= + PODFILE CHECKSUM: a7ae8e10cd04d593d0975e33ff124062b1306f1c ++>>>>>>> origin/trunk COCOAPODS: 1.11.2 ```
👋 @mokagio your conflict resolution looks good to me as it matches the comment here that initiated it. 👍 |
I'm going to consider @twstokes and @AliSoftware 's comments a combined approval and |
Includes:
Got a conflicts in
WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift
because:trunk
release/19.7
The commit on
trunk
was older (by one day) but the code it results with seems better to me because it doesn't use arbitrary emojis as delimiters for the selected site name.I ensured the app built, but did not run the tests locally or manually verified the how the screen where
SiteNameView
is used renders.The conflict was:
@Gio2018 can you take a look at my conflicts resolution and validate it was correct? Thanks!
Update: While waiting for feedback, this PR got conflicts with
trunk
.0fe4b03
resolves them. They were the usual Gutenberg hotfix vs stable conflicts. Please refer to the commit message for more details.