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

Commit dadde96

Browse files
ScoutHarrisScoutHarris
committed
Merge branch 'develop'
2 parents 16282b7 + f02653f commit dadde96

File tree

4 files changed

+32
-46
lines changed

4 files changed

+32
-46
lines changed

‎Podfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ def wordpress_authenticator_pods
1212
##
1313
pod 'Gridicons', '~> 0.15'
1414
pod 'WordPressUI', '~> 1.0'
15-
pod 'WordPressKit', '~> 4.0.0-beta'
15+
pod 'WordPressKit', '~> 4.1.0-beta'
1616
pod 'WordPressShared', '~> 1.4'
1717

1818
## Third party libraries
1919
## =====================
2020
##
2121
pod '1PasswordExtension', '1.8.5'
2222
pod 'Alamofire', '4.7.3'
23-
pod 'CocoaLumberjack', '3.4.2'
24-
pod 'GoogleSignIn', '4.1.2'
23+
pod 'CocoaLumberjack', '3.5.2'
24+
pod 'GoogleSignIn', '4.4.0'
2525
pod 'lottie-ios', '2.5.2'
2626
pod 'NSURL+IDN', '0.3'
2727
pod 'SVProgressHUD', '2.2.5'
@@ -42,8 +42,8 @@ target 'WordPressAuthenticatorTests' do
4242
project 'WordPressAuthenticator.xcodeproj'
4343
wordpress_authenticator_pods
4444

45-
pod 'OHHTTPStubs', '6.1.0'
46-
pod 'OHHTTPStubs/Swift', '6.1.0'
45+
pod 'OHHTTPStubs', '8.0.0'
46+
pod 'OHHTTPStubs/Swift', '8.0.0'
4747
pod 'OCMock', '~> 3.4'
4848
pod 'Expecta', '1.0.6'
4949
pod 'Specta', '1.0.7'

‎Podfile.lock‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
PODS:
22
- 1PasswordExtension (1.8.5)
33
- Alamofire (4.7.3)
4-
- CocoaLumberjack (3.4.2):
5-
- CocoaLumberjack/Default (= 3.4.2)
6-
- CocoaLumberjack/Extensions (= 3.4.2)
7-
- CocoaLumberjack/Default (3.4.2)
8-
- CocoaLumberjack/Extensions (3.4.2):
9-
- CocoaLumberjack/Default
4+
- CocoaLumberjack (3.5.2):
5+
- CocoaLumberjack/Core (= 3.5.2)
6+
- CocoaLumberjack/Core (3.5.2)
107
- Expecta (1.0.6)
118
- FormatterKit/Resources (1.8.2)
129
- FormatterKit/TimeIntervalFormatter (1.8.2):
1310
- FormatterKit/Resources
14-
- GoogleSignIn (4.1.2):
11+
- GoogleSignIn (4.4.0):
1512
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
1613
- "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
17-
- GTMOAuth2 (~> 1.0)
1814
- GTMSessionFetcher/Core (~> 1.1)
1915
- GoogleToolboxForMac/DebugUtils (2.2.0):
2016
- GoogleToolboxForMac/Defines (= 2.2.0)
@@ -25,43 +21,37 @@ PODS:
2521
- "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
2622
- "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
2723
- Gridicons (0.18)
28-
- GTMOAuth2 (1.1.6):
29-
- GTMSessionFetcher (~> 1.1)
30-
- GTMSessionFetcher (1.2.1):
31-
- GTMSessionFetcher/Full (= 1.2.1)
3224
- GTMSessionFetcher/Core (1.2.1)
33-
- GTMSessionFetcher/Full (1.2.1):
34-
- GTMSessionFetcher/Core (= 1.2.1)
3525
- lottie-ios (2.5.2)
3626
- NSObject-SafeExpectations (0.0.3)
3727
- "NSURL+IDN (0.3)"
3828
- OCMock (3.4.3)
39-
- OHHTTPStubs (6.1.0):
40-
- OHHTTPStubs/Default (= 6.1.0)
41-
- OHHTTPStubs/Core (6.1.0)
42-
- OHHTTPStubs/Default (6.1.0):
29+
- OHHTTPStubs (8.0.0):
30+
- OHHTTPStubs/Default (= 8.0.0)
31+
- OHHTTPStubs/Core (8.0.0)
32+
- OHHTTPStubs/Default (8.0.0):
4333
- OHHTTPStubs/Core
4434
- OHHTTPStubs/JSON
4535
- OHHTTPStubs/NSURLSession
4636
- OHHTTPStubs/OHPathHelpers
47-
- OHHTTPStubs/JSON (6.1.0):
37+
- OHHTTPStubs/JSON (8.0.0):
4838
- OHHTTPStubs/Core
49-
- OHHTTPStubs/NSURLSession (6.1.0):
39+
- OHHTTPStubs/NSURLSession (8.0.0):
5040
- OHHTTPStubs/Core
51-
- OHHTTPStubs/OHPathHelpers (6.1.0)
52-
- OHHTTPStubs/Swift (6.1.0):
41+
- OHHTTPStubs/OHPathHelpers (8.0.0)
42+
- OHHTTPStubs/Swift (8.0.0):
5343
- OHHTTPStubs/Default
5444
- Specta (1.0.7)
5545
- SVProgressHUD (2.2.5)
5646
- UIDeviceIdentifier (1.1.4)
57-
- WordPressKit (4.0.0-beta.1):
47+
- WordPressKit (4.1.0-beta.1):
5848
- Alamofire (~> 4.7.3)
5949
- CocoaLumberjack (~> 3.4)
6050
- NSObject-SafeExpectations (= 0.0.3)
6151
- UIDeviceIdentifier (~> 1.1.4)
6252
- WordPressShared (~> 1.4)
6353
- wpxmlrpc (= 0.8.4)
64-
- WordPressShared (1.7.2):
54+
- WordPressShared (1.7.4):
6555
- CocoaLumberjack (~> 3.4)
6656
- FormatterKit/TimeIntervalFormatter (= 1.8.2)
6757
- WordPressUI (1.2.0)
@@ -70,18 +60,18 @@ PODS:
7060
DEPENDENCIES:
7161
- 1PasswordExtension (= 1.8.5)
7262
- Alamofire (= 4.7.3)
73-
- CocoaLumberjack (= 3.4.2)
63+
- CocoaLumberjack (= 3.5.2)
7464
- Expecta (= 1.0.6)
75-
- GoogleSignIn (= 4.1.2)
65+
- GoogleSignIn (= 4.4.0)
7666
- Gridicons (~> 0.15)
7767
- lottie-ios (= 2.5.2)
7868
- "NSURL+IDN (= 0.3)"
7969
- OCMock (~> 3.4)
80-
- OHHTTPStubs (= 6.1.0)
81-
- OHHTTPStubs/Swift (= 6.1.0)
70+
- OHHTTPStubs (= 8.0.0)
71+
- OHHTTPStubs/Swift (= 8.0.0)
8272
- Specta (= 1.0.7)
8373
- SVProgressHUD (= 2.2.5)
84-
- WordPressKit (~> 4.0.0-beta)
74+
- WordPressKit (~> 4.1.0-beta)
8575
- WordPressShared (~> 1.4)
8676
- WordPressUI (~> 1.0)
8777

@@ -95,7 +85,6 @@ SPEC REPOS:
9585
- GoogleSignIn
9686
- GoogleToolboxForMac
9787
- Gridicons
98-
- GTMOAuth2
9988
- GTMSessionFetcher
10089
- lottie-ios
10190
- NSObject-SafeExpectations
@@ -113,27 +102,26 @@ SPEC REPOS:
113102
SPEC CHECKSUMS:
114103
1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
115104
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
116-
CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
105+
CocoaLumberjack: 118bf4a820efc641f79fa487b75ed928dccfae23
117106
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
118107
FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
119-
GoogleSignIn: d9ef55b10f0aa401a5de2747f59b725e4b9732ac
108+
GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
120109
GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
121110
Gridicons: 04261236382e9c62c62c9a104f2f532c1bdf6a78
122-
GTMOAuth2: e8b6512c896235149df975c41d9a36c868ab7fba
123111
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
124112
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
125113
NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129
126114
"NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3
127115
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
128-
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
116+
OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881
129117
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
130118
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
131119
UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
132-
WordPressKit: eba19968587a2e088b6eb097c309710a1be11869
133-
WordPressShared: 63d57a4a07ad9f9a1ee5e8a7162e48fbb5192014
120+
WordPressKit: ab450fc37b54d8fe6839fb6e4074962980480cc0
121+
WordPressShared: e707496f12f29d69aa66b1fcd3b55f0b8b70f2f6
134122
WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
135123
wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
136124

137-
PODFILE CHECKSUM: 848201f7ff6e344d19066be1a6cb86eaddd1ab9e
125+
PODFILE CHECKSUM: 3948c11558517fa428dbde47440a11ef0f274986
138126

139127
COCOAPODS: 1.6.1

‎WordPressAuthenticator.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WordPressAuthenticator"
3-
s.version = "1.4.0"
3+
s.version = "1.4.1-beta.1"
44
s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
55

66
s.description = <<-DESC
@@ -41,6 +41,6 @@ Pod::Spec.new do |s|
4141
s.dependency 'Gridicons', '~> 0.15'
4242
s.dependency 'GoogleSignIn', '4.1.2'
4343
s.dependency 'WordPressUI', '~> 1.0'
44-
s.dependency 'WordPressKit', '~> 4.0.0-beta'
44+
s.dependency 'WordPressKit', '~> 4.1.0-beta'
4545
s.dependency 'WordPressShared', '~> 1.4'
4646
end

‎WordPressAuthenticator.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,6 @@
776776
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
777777
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
778778
"${BUILT_PRODUCTS_DIR}/FormatterKit/FormatterKit.framework",
779-
"${BUILT_PRODUCTS_DIR}/GTMOAuth2/GTMOAuth2.framework",
780779
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
781780
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
782781
"${BUILT_PRODUCTS_DIR}/Gridicons/Gridicons.framework",
@@ -800,7 +799,6 @@
800799
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
801800
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
802801
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FormatterKit.framework",
803-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMOAuth2.framework",
804802
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
805803
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
806804
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gridicons.framework",

0 commit comments

Comments
 (0)