Skip to content

Commit e3f2934

Browse files
authored
Merge 19.1 code freeze (#17806)
2 parents e56bbde + 1a91e9c commit e3f2934

File tree

9 files changed

+57
-41
lines changed

9 files changed

+57
-41
lines changed

Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def wordpress_ui
4747
end
4848

4949
def wordpress_kit
50-
pod 'WordPressKit', '~> 4.46.0-beta'
50+
pod 'WordPressKit', '~> 4.46.0'
5151
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
5252
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
5353
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
@@ -210,15 +210,15 @@ abstract_target 'Apps' do
210210

211211
pod 'NSURL+IDN', '~> 0.4'
212212

213-
pod 'WPMediaPicker', '~> 1.8.2-beta.2'
213+
pod 'WPMediaPicker', '~> 1.8.2'
214214
# pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
215215
## while PR is in review:
216216
# pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''
217217
# pod 'WPMediaPicker', :path => '../MediaPicker-iOS'
218218

219219
pod 'Gridicons', '~> 1.1.0'
220220

221-
pod 'WordPressAuthenticator', '~> 1.43.0-beta.2'
221+
pod 'WordPressAuthenticator', '~> 1.43.0'
222222
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
223223
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
224224
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ PODS:
454454
- WordPress-Aztec-iOS (1.19.7)
455455
- WordPress-Editor-iOS (1.19.7):
456456
- WordPress-Aztec-iOS (= 1.19.7)
457-
- WordPressAuthenticator (1.43.0-beta.2):
457+
- WordPressAuthenticator (1.43.0):
458458
- Alamofire (~> 4.8)
459459
- CocoaLumberjack (~> 3.5)
460460
- GoogleSignIn (~> 6.0.1)
@@ -465,7 +465,7 @@ PODS:
465465
- WordPressKit (~> 4.18-beta)
466466
- WordPressShared (~> 1.12-beta)
467467
- WordPressUI (~> 1.7-beta)
468-
- WordPressKit (4.46.0-beta.2):
468+
- WordPressKit (4.46.0):
469469
- Alamofire (~> 4.8.0)
470470
- CocoaLumberjack (~> 3.4)
471471
- NSObject-SafeExpectations (= 0.0.4)
@@ -477,7 +477,7 @@ PODS:
477477
- CocoaLumberjack (~> 3.4)
478478
- FormatterKit/TimeIntervalFormatter (~> 1.8)
479479
- WordPressUI (1.12.3)
480-
- WPMediaPicker (1.8.2-beta.2)
480+
- WPMediaPicker (1.8.2)
481481
- wpxmlrpc (0.9.0)
482482
- Yoga (1.14.0)
483483
- ZendeskCommonUISDK (6.1.1)
@@ -568,20 +568,19 @@ DEPENDENCIES:
568568
- Starscream (= 3.0.6)
569569
- SVProgressHUD (= 2.2.5)
570570
- WordPress-Editor-iOS (~> 1.19.7)
571-
- WordPressAuthenticator (~> 1.43.0-beta.2)
572-
- WordPressKit (~> 4.46.0-beta)
571+
- WordPressAuthenticator (~> 1.43.0)
572+
- WordPressKit (~> 4.46.0)
573573
- WordPressMocks (~> 0.0.15)
574574
- WordPressShared (~> 1.17.0)
575575
- WordPressUI (~> 1.12.3)
576-
- WPMediaPicker (~> 1.8.2-beta.2)
576+
- WPMediaPicker (~> 1.8.2)
577577
- Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.70.0/third-party-podspecs/Yoga.podspec.json`)
578578
- ZendeskSupportSDK (= 5.3.0)
579579
- ZIPFoundation (~> 0.9.8)
580580

581581
SPEC REPOS:
582582
https://github.com/wordpress-mobile/cocoapods-specs.git:
583583
- WordPressAuthenticator
584-
- WordPressKit
585584
trunk:
586585
- Alamofire
587586
- AlamofireImage
@@ -620,6 +619,7 @@ SPEC REPOS:
620619
- UIDeviceIdentifier
621620
- WordPress-Aztec-iOS
622621
- WordPress-Editor-iOS
622+
- WordPressKit
623623
- WordPressMocks
624624
- WordPressShared
625625
- WordPressUI
@@ -832,12 +832,12 @@ SPEC CHECKSUMS:
832832
UIDeviceIdentifier: d0fee204f467dacf8808b7ac14ce43affeb271a5
833833
WordPress-Aztec-iOS: 144f124148079084860368dfd27cb96e0952853e
834834
WordPress-Editor-iOS: 20551d5a5e51f29832064f08faaaae8e1da7e1e2
835-
WordPressAuthenticator: 0b3423546d92a976e3ce627d2e5a0350716b1f5b
836-
WordPressKit: e623ffb39b2b9d7730a9be63e26fa77929e6e43b
835+
WordPressAuthenticator: e4a43745a647e4dc4b35d21b1353bc4f07f9f3c9
836+
WordPressKit: 67cc1b0bda0d114c806a631ad726027d535d28a8
837837
WordPressMocks: 6b52b0764d9939408151367dd9c6e8a910877f4d
838838
WordPressShared: a4b0308a6345d4dda20c8f7ad9317df4246b4a00
839839
WordPressUI: 45591178e843ecb82e65e868ec766148befe9f9f
840-
WPMediaPicker: 95682a64d24d2a1de4e140e7da68da79030f8173
840+
WPMediaPicker: a34b708a7b995a0889bd5098e3b79f4a50a7a9bd
841841
wpxmlrpc: bf55a43a7e710bd2a4fb8c02dfe83b1246f14f13
842842
Yoga: 2ca978c40e0fd6d7f54bcb1602bc0cbbc79454a7
843843
ZendeskCommonUISDK: 5808802951ad2bb424f0bed4259dc3c0ce9b52ec
@@ -849,6 +849,6 @@ SPEC CHECKSUMS:
849849
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
850850
ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
851851

852-
PODFILE CHECKSUM: 2198bf3dcf133317995199bc08b6af69a74ee863
852+
PODFILE CHECKSUM: beb884dd6980a8f4ff8ba7753cddc4a9206c9da5
853853

854854
COCOAPODS: 1.11.2

RELEASE-NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
19.2
2+
-----
3+
4+
15
19.1
26
-----
37
* [*] Signup: Fixed bug where username selection screen could be pushed twice. [#17624]

WordPress/Jetpack/Resources/release_notes.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
What time is it? Our brand-new time zone selection screen knows. Get a suggested time zone based on your device and improve search while you’re at it.
1+
* [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17758]
2+
* [**] Accessibility: VoiceOver and Dynamic Type improvements on Activity Log and Schedule Post calendars [#17756, #17761, #17780]
3+
* [*] Weekly Roundup: Fix a crash which was preventing weekly roundup notifications from appearing [#17765]
4+
* [*] Share Sheet from Photos: Fix an issue where certain filenames would not upload or render in Post [#16773]
5+
* [*] Block editor: Fixed an issue where video thumbnails could show when selecting images, and vice versa. [#17670]
6+
* [**] Media: If a user has only enabled limited device media access, we now show a prompt to allow the user to change their selection. [#17795]
7+
* [**] Block editor: Fix content justification attribute in Buttons block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4451]
8+
* [*] Block editor: Hide help button from Unsupported Block Editor. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4352]
9+
* [*] Block editor: Add contrast checker to text-based blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4357]
10+
* [*] Block editor: Fix missing Featured Image translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4464]
11+
* [*] Block editor: Fix missing translations of color settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4479]
12+
* [*] Block editor: Fix cut-off setting labels by properly wrapping the text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4475]
13+
* [*] Block editor: Highlight text: fix applying formatting for non-selected text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4471]
14+
* [**] Block editor: Fix Android handling of Hebrew and Indonesian translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4397]
15+
* [*] Publicize: Fixed an issue where a successful login was not automatically detected when connecting a Facebook account to Publicize. [#17803]
216

3-
If you’re using a free plan, video uploads are now limited to five minutes per file. Don’t worry, that won’t affect any videos you’ve already uploaded to your site.
4-
5-
We’ve also made some changes to the block editor:
6-
7-
- We solved translation issues that caused some user interface elements (like text alignment information and the block editor modal window) to only appear in English.
8-
- We added language translation for Jetpack and Layout Grid blocks.
9-
- We fixed a bug that would reset text formatting to default after hitting backspace. Bold on, friends.
10-
- Multi-line block titles are now center-aligned in the inserter menu.
11-
12-
Finally, the “Share WordPress with a friend” row is back where it belongs on the Me screen. Reunited and it feels so good.
7.22 KB
Binary file not shown.

WordPress/Resources/release_notes.txt

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
What time is it? Our brand-new time zone selection screen knows. Get a suggested time zone based on your device and improve search while you’re at it.
1+
* [*] Signup: Fixed bug where username selection screen could be pushed twice. [#17624]
2+
* [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17758]
3+
* [**] Reader post details Comments snippet: added ability to manage conversation subscription and notifications. [#17749]
4+
* [**] Accessibility: VoiceOver and Dynamic Type improvements on Activity Log and Schedule Post calendars [#17756, #17761, #17780]
5+
* [*] Weekly Roundup: Fix a crash which was preventing weekly roundup notifications from appearing [#17765]
6+
* [*] Self-hosted login: Improved error messages. [#17724]
7+
* [*] Share Sheet from Photos: Fix an issue where certain filenames would not upload or render in Post [#16773]
8+
* [*] Block editor: Fixed an issue where video thumbnails could show when selecting images, and vice versa. [#17670]
9+
* [**] Media: If a user has only enabled limited device media access, we now show a prompt to allow the user to change their selection. [#17795]
10+
* [**] Block editor: Fix content justification attribute in Buttons block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4451]
11+
* [*] Block editor: Hide help button from Unsupported Block Editor. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4352]
12+
* [*] Block editor: Add contrast checker to text-based blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4357]
13+
* [*] Block editor: Fix missing Featured Image translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4464]
14+
* [*] Block editor: Fix missing translations of color settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4479]
15+
* [*] Block editor: Fix cut-off setting labels by properly wrapping the text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4475]
16+
* [*] Block editor: Highlight text: fix applying formatting for non-selected text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4471]
17+
* [**] Block editor: Fix Android handling of Hebrew and Indonesian translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4397]
18+
* [***] Self-hosted sites: Fixed a crash when saving media and no Internet connection was available. [#17759]
19+
* [*] Publicize: Fixed an issue where a successful login was not automatically detected when connecting a Facebook account to Publicize. [#17803]
220

3-
If you’re using a free plan, video uploads are now limited to five minutes per file. Don’t worry, that won’t affect any videos you’ve already uploaded to your site.
4-
5-
We’ve also made some changes to the block editor:
6-
7-
- We solved translation issues that caused some user interface elements (like text alignment information and the block editor modal window) to only appear in English.
8-
- We added language translation for Jetpack and Layout Grid blocks.
9-
- We fixed a bug that would reset text formatting to default after hitting backspace. Bold on, friends.
10-
- Multi-line block titles are now center-aligned in the inserter menu.
11-
12-
Finally, the “Share WordPress with a friend” row is back where it belongs on the Me screen. Reunited and it feels so good.

config/Version.internal.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_SHORT=19.0
1+
VERSION_SHORT=19.1
22

33
// Internal long version example: VERSION_LONG=9.9.0.20180423
4-
VERSION_LONG=19.0.0.20220122
4+
VERSION_LONG=19.1.0.20220124

config/Version.public.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_SHORT=19.0
1+
VERSION_SHORT=19.1
22

33
// Public long version example: VERSION_LONG=9.9.0.0
4-
VERSION_LONG=19.0.0.5
4+
VERSION_LONG=19.1.0.0

fastlane/download_metadata.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import Foundation
44

55
let glotPressSubtitleKey = "app_store_subtitle"
6-
let glotPressWhatsNewKey = "v19.0-whats-new"
6+
let glotPressWhatsNewKey = "v19.1-whats-new"
77
let glotPressDescriptionKey = "app_store_desc"
88
let glotPressKeywordsKey = "app_store_keywords"
99

0 commit comments

Comments
 (0)