Skip to content

Commit

Permalink
Merge 19.2 code freeze changes (#17900)
Browse files Browse the repository at this point in the history
  • Loading branch information
mokagio authored Feb 8, 2022
2 parents ecef425 + fe79495 commit 06de9c0
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 58 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -338,4 +338,4 @@ DEPENDENCIES
xcpretty-travis-formatter

BUNDLED WITH
2.2.32
2.3.6
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ workspace 'WordPress.xcworkspace'
## ===================================
##
def wordpress_shared
pod 'WordPressShared', '~> 1.17.1-beta.1'
pod 'WordPressShared', '~> 1.17.1'
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit => ''
Expand All @@ -39,7 +39,7 @@ def aztec
end

def wordpress_ui
pod 'WordPressUI', '~> 1.12.3'
pod 'WordPressUI', '~> 1.12.4'
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :tag => ''
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :commit => ''
Expand Down
16 changes: 8 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,10 @@ PODS:
- WordPressShared (~> 1.15-beta)
- wpxmlrpc (~> 0.9)
- WordPressMocks (0.0.15)
- WordPressShared (1.17.1-beta.1):
- WordPressShared (1.17.1):
- CocoaLumberjack (~> 3.4)
- FormatterKit/TimeIntervalFormatter (~> 1.8)
- WordPressUI (1.12.3)
- WordPressUI (1.12.4)
- WPMediaPicker (1.8.2)
- wpxmlrpc (0.9.0)
- Yoga (1.14.0)
Expand Down Expand Up @@ -569,8 +569,8 @@ DEPENDENCIES:
- WordPressAuthenticator (~> 1.43.0)
- WordPressKit (~> 4.47.0)
- WordPressMocks (~> 0.0.15)
- WordPressShared (~> 1.17.1-beta.1)
- WordPressUI (~> 1.12.3)
- WordPressShared (~> 1.17.1)
- WordPressUI (~> 1.12.4)
- WPMediaPicker (~> 1.8.2)
- Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.71.0/third-party-podspecs/Yoga.podspec.json`)
- ZendeskSupportSDK (= 5.3.0)
Expand All @@ -579,7 +579,6 @@ DEPENDENCIES:
SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPressAuthenticator
- WordPressShared
trunk:
- Alamofire
- AlamofireImage
Expand Down Expand Up @@ -620,6 +619,7 @@ SPEC REPOS:
- WordPress-Editor-iOS
- WordPressKit
- WordPressMocks
- WordPressShared
- WordPressUI
- WPMediaPicker
- wpxmlrpc
Expand Down Expand Up @@ -833,8 +833,8 @@ SPEC CHECKSUMS:
WordPressAuthenticator: e4a43745a647e4dc4b35d21b1353bc4f07f9f3c9
WordPressKit: 46f0580eb097ddfab7ab143208f94b44def42632
WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
WordPressShared: bc50e38a31e05134a7c643cef9cf6a7e28e9cf34
WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
WordPressShared: 0c4bc5e25765732fcf5d07f28c81970ab28493fb
WordPressUI: 9e470758bc3a4a25e94478c2babe106f4ae7315a
WPMediaPicker: a34b708a7b995a0889bd5098e3b79f4a50a7a9bd
wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
Expand All @@ -847,6 +847,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e

PODFILE CHECKSUM: 2c319e5050f65f4ff0df871854908c5bde0dd94a
PODFILE CHECKSUM: ca4d734683bfbe3120236b9255854f51086f6c0b

COCOAPODS: 1.11.2
26 changes: 8 additions & 18 deletions WordPress/Jetpack/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
Only gave the app limited access to your media library? No big deal, but we added a prompt to the media picker in case you want to change your settings and allow more access. The prompt even comes in Dynamic Type for easy reading.

We also made VoiceOver and Dynamic Type more accurate on Activity Log and Schedule Post calendars. We’re happy to report that this improves the user experience for folks who need better visual accessibility.

We made some useful updates to the Block Editor.

- We solved an issue where buttons weren’t justifying left, right, or center in the Buttons block.
- We added translation for color settings in Cover blocks.
- Selecting an image will no longer show you a video thumbnail, and vice versa.
- We hid the help button in the bottom right of the unsupported block editor to avoid confusion.
- When you’re using different text and background colors in text blocks, you’ll get a notification if the color combo might make it hard for some people to read.
- We fixed a handful of edge case problems when changing the color of non-selected text.

We also solved a few smaller issues and crashes.

- Weekly roundup notifications are now showing up, making it easier to stay on top of the latest news.
- When you connect your Facebook account to Publicize, you’ll now be logged in successfully.
- Images with a copyright symbol in the file name will now upload or appear in the Share Sheet properly.
* [*] Block editor: Replacing the media for an image set as featured prompts to update the featured image [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3930]
* [***] Block editor: Font size and line-height support for text-based blocks used in block-based themes [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4519]
* [**] Some of the screens of the app has a new, fresh and more modern visual, including the initial one: My Site. [#17812]
* [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]
* [**] People: you can now manage Email Followers on the People section! [#17854]
* [*] Stats: fix navigation between Stats tab. [#17856]
* [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17888]
* [*] Stats: Users can now add a new Insights card from the navigation bar. [#17867]
Binary file modified WordPress/Resources/en.lproj/Localizable.strings
Binary file not shown.
35 changes: 11 additions & 24 deletions WordPress/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
We solved a problem where self-hosted sites would crash while trying to upload media without an Internet connection. Big yikes, but big fix.
* [*] Site creation: Fixed bug where sites created within the app were not given the correct time zone, leading to post scheduling issues. [#17821]
* [*] Block editor: Replacing the media for an image set as featured prompts to update the featured image [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3930]
* [***] Block editor: Font size and line-height support for text-based blocks used in block-based themes [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4519]
* [**] Some of the screens of the app has a new, fresh and more modern visual, including the initial one: My Site. [#17812]
* [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840]
* [**] People: you can now manage Email Followers on the People section! [#17854]
* [*] Stats: fix navigation between Stats tab. [#17856]
* [*] Quick Start: Fixed a bug where a user logging in via a self-hosted site not connected to Jetpack would see Quick Start when selecting "No thanks" on the Quick Start prompt. [#17855]
* [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17888]
* [*] Stats: Users can now add a new Insights card from the navigation bar. [#17867]
* [*] Site creation: The checkbox that appears when choosing a design no longer flickers when toggled. [#17868]

Speaking of media, we know you might have given the app limited access to your media library. No big deal, but we added a prompt to the media picker in case you want to change your settings and allow more access. The prompt even comes in Dynamic Type for easy reading.

We also made VoiceOver and Dynamic Type more accurate on Activity Log and Schedule Post calendars. We’re happy to report that this improves the user experience for folks who need better visual accessibility.

Big news for Comments: you can now follow a conversation using a button in the Comments header.

We made some useful updates to the Block Editor.

- We solved an issue where buttons weren’t justifying left, right, or center in the Buttons block.
- We added translation for color settings in Cover blocks.
- Selecting an image will no longer show you a video thumbnail, and vice versa.
- We hid the help button in the bottom right of the unsupported block editor to avoid confusion.
- When you’re using different text and background colors in text blocks, you’ll get a notification if the color combo might make it hard for some people to read.
- We fixed a handful of edge case problems when changing the color of non-selected text.

We also solved a few smaller issues and crashes.

- Weekly roundup notifications weren’t always being displayed for all users, but now they are.
- The username selection screen is no longer loading twice.
- When you connect your Facebook account to Publicize, you’ll now be logged in successfully.
- Images with a copyright symbol in the file name will now upload or appear in the Share Sheet properly.

Last but not least, we improved error messages on the login screen for self-hosted websites.
4 changes: 2 additions & 2 deletions config/Version.internal.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=19.1
VERSION_SHORT=19.2

// Internal long version example: VERSION_LONG=9.9.0.20180423
VERSION_LONG=19.1.0.20220204
VERSION_LONG=19.2.0.20220207
4 changes: 2 additions & 2 deletions config/Version.public.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=19.1
VERSION_SHORT=19.2

// Public long version example: VERSION_LONG=9.9.0.0
VERSION_LONG=19.1.0.4
VERSION_LONG=19.2.0.0
2 changes: 1 addition & 1 deletion fastlane/download_metadata.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Foundation

let glotPressSubtitleKey = "app_store_subtitle"
let glotPressWhatsNewKey = "v19.1-whats-new"
let glotPressWhatsNewKey = "v19.2-whats-new"
let glotPressDescriptionKey = "app_store_desc"
let glotPressKeywordsKey = "app_store_keywords"

Expand Down

0 comments on commit 06de9c0

Please sign in to comment.