Skip to content

Fix Noto font family not loaded correctly #19898

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Jan 16, 2023
Merged

Fix Noto font family not loaded correctly #19898

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08848cd
Update WordPressShared to 2.0.1-beta.1
dvdchr Jan 12, 2023
646e434
Fix lint issues
dvdchr Jan 12, 2023
f2b9778
Update lint issues for the wordpress_shared method
dvdchr Jan 12, 2023
6acdeb4
Update Podfile.lock
dvdchr Jan 13, 2023
f0471c1
Update WordPressShared dependency to 2.0.1-beta.1
dvdchr Jan 16, 2023
c49de6e
Merge remote-tracking branch 'origin/release/21.5' into fix/noto-font…
dvdchr Jan 16, 2023
e05980f
Update Podfile.lock
dvdchr Jan 16, 2023
c5a973f
Fix lint issues
dvdchr Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ workspace 'WordPress.xcworkspace'
## ===================================
##
def wordpress_shared
pod 'WordPressShared', '~> 2.0.0'
# 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 => 'delete-cocoalumberjack'
# pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit => ''
# pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
# pod 'WordPressShared', '~> 2.0.0'
# 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: 'fix/font-resource-bundle-not-found'
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
# pod 'WordPressShared', path: '../WordPress-iOS-Shared'
end

def aztec
Expand Down
15 changes: 10 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ PODS:
- UIDeviceIdentifier (~> 2.0)
- WordPressShared (~> 2.0-beta)
- wpxmlrpc (~> 0.9)
- WordPressShared (2.0.0)
- WordPressShared (2.0.1-beta.1)
- WordPressUI (1.12.5)
- WPMediaPicker (1.8.7)
- wpxmlrpc (0.10.0)
Expand Down Expand Up @@ -611,7 +611,7 @@ DEPENDENCIES:
- WordPress-Editor-iOS (~> 1.19.8)
- WordPressAuthenticator (~> 5.0)
- WordPressKit (~> 5.0)
- WordPressShared (~> 2.0.0)
- WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `fix/font-resource-bundle-not-found`)
- WordPressUI (~> 1.12.5)
- WPMediaPicker (~> 1.8.7)
- Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.87.0/third-party-podspecs/Yoga.podspec.json`)
Expand Down Expand Up @@ -658,7 +658,6 @@ SPEC REPOS:
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressKit
- WordPressShared
- WordPressUI
- WPMediaPicker
- wpxmlrpc
Expand Down Expand Up @@ -775,6 +774,9 @@ EXTERNAL SOURCES:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
:tag: v1.87.0
WordPressShared:
:branch: fix/font-resource-bundle-not-found
:git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
Yoga:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.87.0/third-party-podspecs/Yoga.podspec.json

Expand All @@ -790,6 +792,9 @@ CHECKOUT OPTIONS:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
:tag: v1.87.0
WordPressShared:
:commit: 6ff58bb2d8a4366e01db8de285f3762faf2abfae
:git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git

SPEC CHECKSUMS:
Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
Expand Down Expand Up @@ -878,7 +883,7 @@ SPEC CHECKSUMS:
WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4
WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
WordPressShared: 35d41bdf0927e714af1fc85fa9cb692f934473be
WordPressShared: 5ba89467f7ba468c023c441045bb70b4933ff6d4
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand All @@ -892,6 +897,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37

PODFILE CHECKSUM: 0bbcfda4406f0ca65dddda30c6e95e4f99fe33e3
PODFILE CHECKSUM: 7d88dd5a19c7ea3eb803ebe267b3588f9dc4f4b0

COCOAPODS: 1.11.2