Skip to content

Commit 17fd7c0

Browse files
committed
Merge release/19.9 into hotfix 19.8.1
Got only the expected conflicts on the config files: - `config/Version.internal.xcconfig` - `config/Version.public.xcconfig` I resolved them using `git checkout --theirs`, i.e. by keeping the value from the `release/19.9` branch, which is the appropriate one for 19.9.
2 parents 4b55704 + d01fbc7 commit 17fd7c0

File tree

310 files changed

+6469
-3163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+6469
-3163
lines changed

Podfile

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

4949
def wordpress_kit
50-
pod 'WordPressKit', '~> 4.51.0'
50+
pod 'WordPressKit', '~> 4.52.0'
5151
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
52-
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'feature/stats-last-post-insight-featured-image'
52+
# 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 => ''
5454
# pod 'WordPressKit', :path => '../WordPressKit-iOS'
5555
end
@@ -169,12 +169,12 @@ abstract_target 'Apps' do
169169
## Gutenberg (React Native)
170170
## =====================
171171
##
172-
gutenberg :tag => 'v1.75.1'
172+
gutenberg :tag => 'v1.76.0'
173173

174174
## Third party libraries
175175
## =====================
176176
##
177-
pod 'Charts', '~> 3.2.2'
177+
pod 'Charts', '~> 3.6'
178178
pod 'Gifu', '3.2.0'
179179

180180
app_center_version = '~> 4.1'
@@ -210,7 +210,7 @@ abstract_target 'Apps' do
210210

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

213-
pod 'WPMediaPicker', '~> 1.8.3'
213+
pod 'WPMediaPicker', '~> 1.8.4'
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 => ''

Podfile.lock

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

RELEASE-NOTES.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
19.9
1+
20.0
22
-----
33

44

5+
19.9
6+
-----
7+
* [*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
8+
* [*] Media Picker: Fixed an issue where the empty state view was being displayed incorrectly. [#18471]
9+
* [*] Quick Start: We are now showing a different set of Quick Start tasks for existing sites and new sites. The existing sites checklist includes new tours such as: "Check your notifications" and "Upload photos or videos". [#18395, #18412, #18443, #18471]
10+
* [*] Site Creation: we fixed an issue where the navigation buttons were not scaling when large fonts were selected on the device [#18559]
11+
* [**] Block Editor: Cover Block: Improve color contrast between background and text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4808]
12+
* [***] Block Editor: Add drag & drop blocks feature [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4832]
13+
* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
14+
* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
15+
* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
16+
* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
17+
* [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
18+
519
19.8
620
-----
721
* [**] Self hosted sites are not restricted by video length during media uploads [https://github.com/wordpress-mobile/WordPress-iOS/pull/18414]

Scripts/BuildPhases/LintAppLocalizedStringsUsage.rb

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash -eu
2+
3+
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
4+
SCRIPT_SRC="${SCRIPT_DIR}/LintAppLocalizedStringsUsage.swift"
5+
6+
LINTER_BUILD_DIR="${BUILD_DIR:-${TMPDIR}}"
7+
LINTER_EXEC="${LINTER_BUILD_DIR}/$(basename "${SCRIPT_SRC}" .swift)"
8+
9+
if [ ! -x "${LINTER_EXEC}" ] || ! (shasum -c "${LINTER_EXEC}.shasum" >/dev/null 2>/dev/null); then
10+
echo "Pre-compiling linter script to ${LINTER_EXEC}..."
11+
swiftc -sdk "$(xcrun --sdk macosx --show-sdk-path)" "${SCRIPT_SRC}" -o "${LINTER_EXEC}"
12+
shasum "${SCRIPT_SRC}" >"${LINTER_EXEC}.shasum"
13+
chmod +x "${LINTER_EXEC}"
14+
echo "Pre-compiled linter script ready"
15+
fi
16+
17+
"$LINTER_EXEC" "${PROJECT_FILE_PATH:-$1}" # "${TARGET_NAME:-$2}"

0 commit comments

Comments
 (0)