Skip to content

Commit 4755133

Browse files
committed
Fix WordPressKit API breaking changes
1 parent ee2fe1d commit 4755133

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Podfile

Lines changed: 2 additions & 2 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', '~> 5.0'
50+
# pod 'WordPressKit', '~> 5.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 => ''
52+
pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'task/bump-5.0.1-beta.1'
5353
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
5454
# pod 'WordPressKit', :path => '../WordPressKit-iOS'
5555
end

Podfile.lock

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,9 @@ PODS:
510510
- WordPressKit (~> 5.0-beta)
511511
- WordPressShared (~> 2.0-beta)
512512
- WordPressUI (~> 1.7-beta)
513-
- WordPressKit (5.0.0):
513+
- WordPressKit (5.0.1-beta.1):
514514
- Alamofire (~> 4.8.0)
515-
- NSObject-SafeExpectations (= 0.0.4)
515+
- NSObject-SafeExpectations (~> 0.0.4)
516516
- UIDeviceIdentifier (~> 2.0)
517517
- WordPressShared (~> 2.0-beta)
518518
- wpxmlrpc (~> 0.9)
@@ -610,7 +610,7 @@ DEPENDENCIES:
610610
- SVProgressHUD (= 2.2.5)
611611
- WordPress-Editor-iOS (~> 1.19.8)
612612
- WordPressAuthenticator (~> 5.0)
613-
- WordPressKit (~> 5.0)
613+
- WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `task/bump-5.0.1-beta.1`)
614614
- WordPressShared (~> 2.0.0-beta.1)
615615
- WordPressUI (~> 1.12.5)
616616
- WPMediaPicker (~> 1.8.7)
@@ -657,7 +657,6 @@ SPEC REPOS:
657657
- UIDeviceIdentifier
658658
- WordPress-Aztec-iOS
659659
- WordPress-Editor-iOS
660-
- WordPressKit
661660
- WordPressShared
662661
- WordPressUI
663662
- WPMediaPicker
@@ -775,6 +774,9 @@ EXTERNAL SOURCES:
775774
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
776775
:submodules: true
777776
:tag: v1.86.0
777+
WordPressKit:
778+
:branch: task/bump-5.0.1-beta.1
779+
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
778780
Yoga:
779781
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.86.0/third-party-podspecs/Yoga.podspec.json
780782

@@ -790,6 +792,9 @@ CHECKOUT OPTIONS:
790792
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
791793
:submodules: true
792794
:tag: v1.86.0
795+
WordPressKit:
796+
:commit: 413c4b26a738b95594681bdd4d03222f2493c504
797+
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
793798

794799
SPEC CHECKSUMS:
795800
Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
@@ -877,7 +882,7 @@ SPEC CHECKSUMS:
877882
WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
878883
WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
879884
WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4
880-
WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
885+
WordPressKit: 5f280518135257e970bb91377844d5bc356b925a
881886
WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
882887
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
883888
WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
@@ -892,6 +897,6 @@ SPEC CHECKSUMS:
892897
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
893898
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
894899

895-
PODFILE CHECKSUM: 0868f232c488e3fae041fc136bc30eeb4b7ba6ae
900+
PODFILE CHECKSUM: 471e535f35957c1f9bf7a8b0275aafaa0150fc6f
896901

897902
COCOAPODS: 1.11.2

WordPress/Classes/Models/ReaderSiteInfoSubscriptions.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import CoreData
77
@NSManaged open var sendPosts: Bool
88

99
class func createOrUpdate(from remoteSiteInfo: RemoteReaderSiteInfo, topic: ReaderSiteTopic, context: NSManagedObjectContext) -> ReaderSiteInfoSubscriptionPost? {
10-
guard remoteSiteInfo.postSubscription.wp_isValidObject() else {
10+
guard let remotePostSubscription = remoteSiteInfo.postSubscription, remotePostSubscription.wp_isValidObject() else {
1111
return nil
1212
}
1313

@@ -17,7 +17,7 @@ import CoreData
1717
}
1818

1919
subscription?.siteTopic = topic
20-
subscription?.sendPosts = remoteSiteInfo.postSubscription.sendPosts
20+
subscription?.sendPosts = remotePostSubscription.sendPosts
2121

2222
return subscription
2323
}

0 commit comments

Comments
 (0)