From fe00aa9bae504aed530a829cef345894d3ba9294 Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Thu, 31 Oct 2019 23:01:58 -0300 Subject: [PATCH 1/8] Include post autosave in core data Post autosave properties are now persisted via Core Data to `AbstractPost`. --- MIGRATIONS.md | 6 + WordPress/Classes/Models/AbstractPost.h | 8 + WordPress/Classes/Models/AbstractPost.m | 4 + WordPress/Classes/Services/PostService.m | 5 + .../WordPress.xcdatamodeld/.xccurrentversion | 2 +- .../WordPress 93.xcdatamodel/contents | 842 ++++++++++++++++++ WordPress/WordPress.xcodeproj/project.pbxproj | 4 +- 7 files changed, 869 insertions(+), 2 deletions(-) create mode 100644 WordPress/Classes/WordPress.xcdatamodeld/WordPress 93.xcdatamodel/contents diff --git a/MIGRATIONS.md b/MIGRATIONS.md index bce800aade79..2c30aac2716d 100644 --- a/MIGRATIONS.md +++ b/MIGRATIONS.md @@ -3,6 +3,12 @@ This file documents changes in the data model. Please explain any changes to the data model as well as any custom migrations. +## WordPress 93 + +@guarani 2019-10-27 + +- `AbstractPost` added `autosaveTitle` (`nullable` `String`), `autosaveExcerpt` (`nullable` `String`), `autosaveContent` (`nullable` `String`), and `autosaveModifiedDate` (`nullable` `Date`) properties. + ## WordPress 92 @jklausa 2019-08-19 diff --git a/WordPress/Classes/Models/AbstractPost.h b/WordPress/Classes/Models/AbstractPost.h index bbcd686ccda6..407f0532a8ed 100644 --- a/WordPress/Classes/Models/AbstractPost.h +++ b/WordPress/Classes/Models/AbstractPost.h @@ -49,6 +49,14 @@ typedef NS_ENUM(NSUInteger, AbstractPostRemoteStatus) { */ @property (nonatomic, strong, nonnull) NSNumber *autoUploadAttemptsCount; +/** + Autosave attributes hold a snapshot of the post's content. + */ +@property (nonatomic, copy, nullable) NSString *autosaveContent; +@property (nonatomic, copy, nullable) NSString *autosaveExcerpt; +@property (nonatomic, copy, nullable) NSString *autosaveTitle; +@property (nonatomic, copy, nullable) NSDate *autosaveModifiedDate; + // Revision management - (AbstractPost *)createRevision; - (void)deleteRevision; diff --git a/WordPress/Classes/Models/AbstractPost.m b/WordPress/Classes/Models/AbstractPost.m index 285a7fcbb876..c7a86672f5b5 100644 --- a/WordPress/Classes/Models/AbstractPost.m +++ b/WordPress/Classes/Models/AbstractPost.m @@ -33,6 +33,10 @@ @implementation AbstractPost @dynamic confirmedChangesHash; @dynamic confirmedChangesTimestamp; @dynamic autoUploadAttemptsCount; +@dynamic autosaveContent; +@dynamic autosaveExcerpt; +@dynamic autosaveTitle; +@dynamic autosaveModifiedDate; @synthesize restorableStatus; diff --git a/WordPress/Classes/Services/PostService.m b/WordPress/Classes/Services/PostService.m index 236de8036fd1..fd959e00abc7 100644 --- a/WordPress/Classes/Services/PostService.m +++ b/WordPress/Classes/Services/PostService.m @@ -736,6 +736,11 @@ - (void)updatePost:(AbstractPost *)post withRemotePost:(RemotePost *)remotePost [self updateCommentsForPost:post]; } + post.autosaveTitle = remotePost.autosave.title; + post.autosaveExcerpt = remotePost.autosave.excerpt; + post.autosaveContent = remotePost.autosave.content; + post.autosaveModifiedDate = remotePost.autosave.modifiedDate; + if ([post isKindOfClass:[Page class]]) { Page *pagePost = (Page *)post; pagePost.parentID = remotePost.parentID; diff --git a/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion b/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion index d0e34e3ed5e7..63d4048a9798 100644 --- a/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion +++ b/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - WordPress 92.xcdatamodel + WordPress 93.xcdatamodel diff --git a/WordPress/Classes/WordPress.xcdatamodeld/WordPress 93.xcdatamodel/contents b/WordPress/Classes/WordPress.xcdatamodeld/WordPress 93.xcdatamodel/contents new file mode 100644 index 000000000000..b5ea7c9172e1 --- /dev/null +++ b/WordPress/Classes/WordPress.xcdatamodeld/WordPress 93.xcdatamodel/contents @@ -0,0 +1,842 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 302d7462739b..6321779b35a7 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -2444,6 +2444,7 @@ 31EC15061A5B6675009FC8B3 /* WPStyleGuide+Suggestions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WPStyleGuide+Suggestions.h"; sourceTree = ""; }; 31EC15071A5B6675009FC8B3 /* WPStyleGuide+Suggestions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WPStyleGuide+Suggestions.m"; sourceTree = ""; }; 31FA16CC1A49B3C0003E1887 /* WordPress 25.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 25.xcdatamodel"; sourceTree = ""; }; + 32A29A16236BC8BC009488C2 /* WordPress 93.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 93.xcdatamodel"; sourceTree = ""; }; 33D5016BDA00B45DFCAF3818 /* Pods-WordPressNotificationServiceExtension.release-internal.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressNotificationServiceExtension.release-internal.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressNotificationServiceExtension/Pods-WordPressNotificationServiceExtension.release-internal.xcconfig"; sourceTree = ""; }; 368127CE6F1CA15EC198147D /* Pods-WordPressTodayWidget.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressTodayWidget.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressTodayWidget/Pods-WordPressTodayWidget.debug.xcconfig"; sourceTree = ""; }; 37022D8F1981BF9200F322B7 /* VerticallyStackedButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VerticallyStackedButton.h; sourceTree = ""; }; @@ -14761,6 +14762,7 @@ E125443B12BF5A7200D87A0A /* WordPress.xcdatamodeld */ = { isa = XCVersionGroup; children = ( + 32A29A16236BC8BC009488C2 /* WordPress 93.xcdatamodel */, 57CCB37E2358E5DC003ECD0C /* WordPress 92.xcdatamodel */, E63EC3632356633B008CEB16 /* WordPress 91.xcdatamodel */, F14E844C2317252200D0C63E /* WordPress 90.xcdatamodel */, @@ -14854,7 +14856,7 @@ 8350E15911D28B4A00A7B073 /* WordPress.xcdatamodel */, E125443D12BF5A7200D87A0A /* WordPress 2.xcdatamodel */, ); - currentVersion = 57CCB37E2358E5DC003ECD0C /* WordPress 92.xcdatamodel */; + currentVersion = 32A29A16236BC8BC009488C2 /* WordPress 93.xcdatamodel */; name = WordPress.xcdatamodeld; path = Classes/WordPress.xcdatamodeld; sourceTree = ""; From 47112cc3a5e69b68fd2cd071bf123d02a0cbf6e5 Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Fri, 1 Nov 2019 00:28:25 -0300 Subject: [PATCH 2/8] Add autosave as default meta when fetching posts It is desirable for all post service API calls to fetch autosave data, so `autosave` has been set as the default value for `meta`. --- WordPress/Classes/Services/PostServiceOptions.h | 1 + WordPress/Classes/Services/PostServiceOptions.m | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/WordPress/Classes/Services/PostServiceOptions.h b/WordPress/Classes/Services/PostServiceOptions.h index 334a88101bc5..76e4f3e03c0d 100644 --- a/WordPress/Classes/Services/PostServiceOptions.h +++ b/WordPress/Classes/Services/PostServiceOptions.h @@ -24,5 +24,6 @@ @property (nonatomic, assign) PostServiceResultsOrdering orderBy; @property (nonatomic, strong) NSNumber *authorID; @property (nonatomic, copy) NSString *search; +@property (nonatomic, copy) NSString *meta; @end diff --git a/WordPress/Classes/Services/PostServiceOptions.m b/WordPress/Classes/Services/PostServiceOptions.m index ea12a0eaef8e..9dc0e8cf8b1f 100644 --- a/WordPress/Classes/Services/PostServiceOptions.m +++ b/WordPress/Classes/Services/PostServiceOptions.m @@ -2,4 +2,13 @@ @implementation PostServiceSyncOptions +- (instancetype)init +{ + self = [super init]; + if (self) { + self.meta = @"autosave"; + } + return self; +} + @end From 0bf3a49a1a73dd40a3454465152cdad88cc55ce4 Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Sat, 2 Nov 2019 16:22:13 -0300 Subject: [PATCH 3/8] Temporarily poining Podfile to feature branch This allows CircleCI to build the feature branch. --- Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index 6f059cc39506..8721c82596d2 100644 --- a/Podfile +++ b/Podfile @@ -43,8 +43,8 @@ def wordpress_ui end def wordpress_kit - pod 'WordPressKit', '~> 4.5.2-beta.1' - #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => '' + #pod 'WordPressKit', '~> 4.5.2-beta.1' + pod 'WordPressKit', :git => 'https://github.com/guarani/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog' #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' #pod 'WordPressKit', :path => '../WordPressKit-iOS' end From b718c2d6c43526a0f407701ffd9503450ebe5f2a Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Sat, 2 Nov 2019 16:55:59 -0300 Subject: [PATCH 4/8] Correcting build error, Podfile.lock update The lock file had to be commited to allow CirclCI do make the build. --- Podfile.lock | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 03637a0b3df9..a4b257bcb709 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -222,7 +222,7 @@ PODS: - WordPressKit (~> 4.5.1) - WordPressShared (~> 1.8) - WordPressUI (~> 1.4-beta.1) - - WordPressKit (4.5.2-beta.2): + - WordPressKit (4.5.2-beta.1): - Alamofire (~> 4.7.3) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -300,7 +300,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.11.0) - WordPressAuthenticator (~> 1.10.2-beta.1) - - WordPressKit (~> 4.5.2-beta.2) + - WordPressKit (from `https://github.com/guarani/WordPressKit-iOS.git`, branch `issue/12141-restore-revision-dialog`) - WordPressMocks (~> 0.0.6) - WordPressShared (~> 1.8.8) - WordPressUI (~> 1.5-beta.1) @@ -343,7 +343,6 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressAuthenticator - - WordPressKit - WordPressMocks - WordPressShared - WordPressUI @@ -409,6 +408,9 @@ EXTERNAL SOURCES: RNTAztecView: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 + WordPressKit: + :branch: issue/12141-restore-revision-dialog + :git: https://github.com/guarani/WordPressKit-iOS.git yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.16.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json ZendeskSDK: @@ -425,6 +427,9 @@ CHECKOUT OPTIONS: RNTAztecView: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 + WordPressKit: + :commit: f8aaff88217f1d246916681406f3f60517901f46 + :git: https://github.com/guarani/WordPressKit-iOS.git ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.1-swift5.1-GM @@ -489,7 +494,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 WordPressAuthenticator: 51102958ea3b0b33a5476c508a458361dc5ef2e4 - WordPressKit: b5b9e1f2018116d3ad5c060e519150f7f0442f78 + WordPressKit: 096fb17b8bd4a97d25f2fd7417ec52eab0b7d4ac WordPressMocks: 5913bd04586a360212e07a8ccbcb36068d4425a3 WordPressShared: 64332b24b8a70b7796ee137847cd0d66bdb6b4c1 WordPressUI: 0675808d243bbbda003d4604b0ae161508b6e49f @@ -499,6 +504,6 @@ SPEC CHECKSUMS: ZendeskSDK: 07977c9aa708ea64461a1b18b7b3cfec3f496785 ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef -PODFILE CHECKSUM: 148c1b30a6d2dd339a197295ca5de3594d48f729 +PODFILE CHECKSUM: fc897721f5b731711f03aef26388325aee35056e COCOAPODS: 1.8.4 From 4279af19d1bd0e815248758d112bdf1bdd327a7e Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Sat, 2 Nov 2019 18:05:30 -0300 Subject: [PATCH 5/8] Update fork with latest from upstream --- Podfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index a4b257bcb709..3888f81d3fe1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -222,7 +222,7 @@ PODS: - WordPressKit (~> 4.5.1) - WordPressShared (~> 1.8) - WordPressUI (~> 1.4-beta.1) - - WordPressKit (4.5.2-beta.1): + - WordPressKit (4.5.2-beta.2): - Alamofire (~> 4.7.3) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -428,7 +428,7 @@ CHECKOUT OPTIONS: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 WordPressKit: - :commit: f8aaff88217f1d246916681406f3f60517901f46 + :commit: 6a6ef4bc344ab75e8a1209cc0d11641a8e75f047 :git: https://github.com/guarani/WordPressKit-iOS.git ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios @@ -494,7 +494,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 WordPressAuthenticator: 51102958ea3b0b33a5476c508a458361dc5ef2e4 - WordPressKit: 096fb17b8bd4a97d25f2fd7417ec52eab0b7d4ac + WordPressKit: b5b9e1f2018116d3ad5c060e519150f7f0442f78 WordPressMocks: 5913bd04586a360212e07a8ccbcb36068d4425a3 WordPressShared: 64332b24b8a70b7796ee137847cd0d66bdb6b4c1 WordPressUI: 0675808d243bbbda003d4604b0ae161508b6e49f From a3f469743668a83ab53d3e0e273a15cb632ef194 Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Tue, 5 Nov 2019 21:56:29 -0300 Subject: [PATCH 6/8] Point to updated WordPressKit pod version --- Podfile | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index 4da539c3580d..ca7fb59697ba 100644 --- a/Podfile +++ b/Podfile @@ -44,7 +44,7 @@ end def wordpress_kit #pod 'WordPressKit', '~> 4.5.3-beta.1' - pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog' + pod 'WordPressKit', :git => 'https://github.com/guarani/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog' #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' #pod 'WordPressKit', :path => '../WordPressKit-iOS' end diff --git a/Podfile.lock b/Podfile.lock index 44db4f916566..3d5a605e4801 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -222,7 +222,7 @@ PODS: - WordPressKit (~> 4.5.1) - WordPressShared (~> 1.8) - WordPressUI (~> 1.4-beta.1) - - WordPressKit (4.5.3-beta.1): + - WordPressKit (4.5.3-beta.2): - Alamofire (~> 4.7.3) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -428,7 +428,7 @@ CHECKOUT OPTIONS: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 WordPressKit: - :commit: 6a6ef4bc344ab75e8a1209cc0d11641a8e75f047 + :commit: bfb8412e36db12da2e4b7f87a9662a90f49fc104 :git: https://github.com/guarani/WordPressKit-iOS.git ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios @@ -494,7 +494,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 WordPressAuthenticator: af8a2b733b8a33d2ad04cdd30f5410bfe772f439 - WordPressKit: 6e02d166cbc6c6482987f5107f53d6cc1e8cbc87 + WordPressKit: 620bff49011b1e888a6132410c700a25dd059f2d WordPressMocks: 5913bd04586a360212e07a8ccbcb36068d4425a3 WordPressShared: 64332b24b8a70b7796ee137847cd0d66bdb6b4c1 WordPressUI: 4a4adafd2b052e94e4846c0a0203761773dc4fd5 @@ -504,6 +504,6 @@ SPEC CHECKSUMS: ZendeskSDK: 35b16898fae049f6ebffba96793f209b03a41495 ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef -PODFILE CHECKSUM: f0c0f973e03d32d504ef8ec8d6532b61f97761a8 +PODFILE CHECKSUM: b8f62ee96974f30a8071ec1dca917e35f4b1b157 COCOAPODS: 1.8.4 From b7c47bda9267d3300926be1787fb67f729f8f1d8 Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Tue, 5 Nov 2019 23:33:12 -0300 Subject: [PATCH 7/8] Point to latest WordPressKit pod commit --- Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile.lock b/Podfile.lock index 3d5a605e4801..b822e940274d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -428,7 +428,7 @@ CHECKOUT OPTIONS: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 WordPressKit: - :commit: bfb8412e36db12da2e4b7f87a9662a90f49fc104 + :commit: 851cc8debeb4150c8fa35442434029f89d5e19de :git: https://github.com/guarani/WordPressKit-iOS.git ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios From d22e68ba923b3d0b8dd41cece361c03ab0d6a39e Mon Sep 17 00:00:00 2001 From: Paul Von Schrottky Date: Wed, 6 Nov 2019 20:06:39 -0300 Subject: [PATCH 8/8] Point WordPressKit-iOS pod to new release --- Podfile | 4 ++-- Podfile.lock | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index ca7fb59697ba..948c97e2c6d2 100644 --- a/Podfile +++ b/Podfile @@ -43,8 +43,8 @@ def wordpress_ui end def wordpress_kit - #pod 'WordPressKit', '~> 4.5.3-beta.1' - pod 'WordPressKit', :git => 'https://github.com/guarani/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog' + pod 'WordPressKit', '~> 4.5.3-beta.2' + #pod 'WordPressKit', :git => 'https://github.com/guarani/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog' #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '' #pod 'WordPressKit', :path => '../WordPressKit-iOS' end diff --git a/Podfile.lock b/Podfile.lock index b822e940274d..6b153a29773a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -300,7 +300,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.11.0) - WordPressAuthenticator (~> 1.10.2) - - WordPressKit (from `https://github.com/guarani/WordPressKit-iOS.git`, branch `issue/12141-restore-revision-dialog`) + - WordPressKit (~> 4.5.3-beta.2) - WordPressMocks (~> 0.0.6) - WordPressShared (~> 1.8.8) - WordPressUI (~> 1.5.0) @@ -343,6 +343,7 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressAuthenticator + - WordPressKit - WordPressMocks - WordPressShared - WordPressUI @@ -408,9 +409,6 @@ EXTERNAL SOURCES: RNTAztecView: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 - WordPressKit: - :branch: issue/12141-restore-revision-dialog - :git: https://github.com/guarani/WordPressKit-iOS.git yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.16.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json ZendeskSDK: @@ -427,9 +425,6 @@ CHECKOUT OPTIONS: RNTAztecView: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.16.0 - WordPressKit: - :commit: 851cc8debeb4150c8fa35442434029f89d5e19de - :git: https://github.com/guarani/WordPressKit-iOS.git ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.2 @@ -504,6 +499,6 @@ SPEC CHECKSUMS: ZendeskSDK: 35b16898fae049f6ebffba96793f209b03a41495 ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef -PODFILE CHECKSUM: b8f62ee96974f30a8071ec1dca917e35f4b1b157 +PODFILE CHECKSUM: 6a663fb0ac12175246b87a8c071b48000e3e97bc COCOAPODS: 1.8.4