Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 4e5eeff

Browse files
committed
Merge branch 'develop' into pinar-pr
2 parents ae2227b + 90ce712 commit 4e5eeff

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ target 'WordPressKit' do
1818
pod 'OHHTTPStubs', '6.1.0'
1919
pod 'OHHTTPStubs/Swift', '6.1.0'
2020
pod 'OCMock', '~> 3.4.2'
21-
pod 'WordPressShared', '~> 1.2.0'
21+
pod 'WordPressShared', '~> 1.4'
2222
end
2323
end

Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PODS:
1010
- FormatterKit/TimeIntervalFormatter (1.8.2):
1111
- FormatterKit/Resources
1212
- NSObject-SafeExpectations (0.0.3)
13-
- OCMock (3.4.2)
13+
- OCMock (3.4.3)
1414
- OHHTTPStubs (6.1.0):
1515
- OHHTTPStubs/Default (= 6.1.0)
1616
- OHHTTPStubs/Core (6.1.0)
@@ -27,14 +27,14 @@ PODS:
2727
- OHHTTPStubs/Swift (6.1.0):
2828
- OHHTTPStubs/Default
2929
- UIDeviceIdentifier (0.5.0)
30-
- WordPressKit (1.4.3-beta.4):
30+
- WordPressKit (1.4.5-beta.1):
3131
- Alamofire (~> 4.7.3)
3232
- CocoaLumberjack (= 3.4.2)
3333
- NSObject-SafeExpectations (= 0.0.3)
3434
- UIDeviceIdentifier (~> 0.4)
35-
- WordPressShared (~> 1.2.0)
35+
- WordPressShared (~> 1.4)
3636
- wpxmlrpc (= 0.8.3)
37-
- WordPressShared (1.2.0):
37+
- WordPressShared (1.4.0):
3838
- CocoaLumberjack (~> 3.4)
3939
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
4040
- wpxmlrpc (0.8.3)
@@ -44,7 +44,7 @@ DEPENDENCIES:
4444
- OHHTTPStubs (= 6.1.0)
4545
- OHHTTPStubs/Swift (= 6.1.0)
4646
- WordPressKit (from `./`)
47-
- WordPressShared (~> 1.2.0)
47+
- WordPressShared (~> 1.4)
4848

4949
SPEC REPOS:
5050
https://github.com/cocoapods/specs.git:
@@ -67,13 +67,13 @@ SPEC CHECKSUMS:
6767
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
6868
FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
6969
NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129
70-
OCMock: ebe9ee1dca7fbed0ff9193ac0b3e2d8862ea56f6
70+
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
7171
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
7272
UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
73-
WordPressKit: 358fa43d76ee198f507dc4bd33ffb5b003c48568
74-
WordPressShared: 7ef0253d54989b195e020a74100a8500be0a4315
73+
WordPressKit: 6aa14988654e00eb678771b696727944f71cc896
74+
WordPressShared: f55be10963c8f6dbbc8e896450805ba1dd5353f7
7575
wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
7676

77-
PODFILE CHECKSUM: d34cedd3ddf2354ee42932e27ba7d23509fe3146
77+
PODFILE CHECKSUM: a6284d738a2e335fc7b8db139fe8a0ff19c1a138
7878

7979
COCOAPODS: 1.5.3

WordPressKit.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPressKit"
3-
s.version = "1.4.3-beta.4"
4-
3+
s.version = "1.4.5-beta.1"
54
s.summary = "WordPressKit offers a clean and simple WordPress.com and WordPress.org API."
65

76
s.description = <<-DESC
@@ -22,7 +21,7 @@ Pod::Spec.new do |s|
2221

2322
s.dependency 'Alamofire', '~> 4.7.3'
2423
s.dependency 'CocoaLumberjack', '3.4.2'
25-
s.dependency 'WordPressShared', '~> 1.2.0'
24+
s.dependency 'WordPressShared', '~> 1.4'
2625
s.dependency 'NSObject-SafeExpectations', '0.0.3'
2726
s.dependency 'wpxmlrpc', '0.8.3'
2827
s.dependency 'UIDeviceIdentifier', '~> 0.4'

WordPressKit/PostServiceRemoteREST+Revisions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public extension PostServiceRemoteREST {
66
postId: Int,
77
success: @escaping ([RemoteRevision]?) -> Void,
88
failure: @escaping (Error?) -> Void) {
9-
let endpoint = "/sites/\(siteId)/post/\(postId)/diffs"
9+
let endpoint = "sites/\(siteId)/post/\(postId)/diffs"
1010
let path = self.path(forEndpoint: endpoint, withVersion: ._1_1)
1111
wordPressComRestApi.GET(path,
1212
parameters: nil,

WordPressKitTests/PostServiceRemoteRESTRevisionsTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class PostServiceRemoteRESTRevisionsTest: RemoteTestCase, RESTTestable {
1313
private var remote: PostServiceRemoteREST!
1414

1515
private var performEndpoint: String {
16-
return "/sites/\(siteId)/post/\(postId)/diffs"
16+
return "sites/\(siteId)/post/\(postId)/diffs"
1717
}
1818

1919

0 commit comments

Comments
 (0)