Skip to content

Commit ff2b852

Browse files
committed
merge trunk
2 parents 135ca2e + 198b081 commit ff2b852

File tree

93 files changed

+2333
-1188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2333
-1188
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!--
22
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
33
-->
4+
## 11.6
5+
Good news! We added a new analytics section to the app! Simply click on the See More button under the store stats to check more detailed information on Revenue and Orders. This isn’t the last of it – more updates to come in the next few weeks!
6+
47
## 11.5
58
This release includes a few bug fixes and improvements to make your experience smoother. Stay tuned for exciting updates in the coming weeks!
69

Hardware/Hardware/CardReader/CardReaderEvent.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ public enum CardReaderEvent: Equatable {
1818
/// A card was removed after client-side payment capture.
1919
case cardRemovedAfterClientSidePaymentCapture
2020

21+
/// Card details were collected, and can be used to process a payment.
22+
case cardDetailsCollected
23+
2124
/// Low battery warning.
2225
case lowBattery
2326

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ extension StripeCardReaderService: CardReaderService {
228228
return promise(.success(()))
229229
}
230230

231+
// When this is used for a new payment, there is a new subscription to readerEvents, which won't rely the
232+
// old `.removeCard` message. If there is a card inserted, we manually send a display message prompting to
233+
// remove the card, and wait for that before continuing.
234+
self.sendReaderEvent(CardReaderEvent.make(displayMessage: .removeCard))
235+
231236
self.timerCancellable = Timer.publish(every: 1, tolerance: 0.1, on: .main, in: .default)
232237
.autoconnect()
233238
.receive(on: DispatchQueue.main)
@@ -260,12 +265,6 @@ extension StripeCardReaderService: CardReaderService {
260265
// steps produce a Future.
261266

262267
// If a card was left from a previous payment attempt, we want that removed before we initiate a new payment.
263-
// However, a new payment probably means a new subscription to readerEvents, which won't rely the old `.removeCard`
264-
// message. If there is a card inserted, we manually send a display message prompting to remove the card,
265-
// and wait for that before continuing.
266-
if isChipCardInserted {
267-
sendReaderEvent(CardReaderEvent.make(displayMessage: .removeCard))
268-
}
269268
return waitForInsertedCardToBeRemoved()
270269
.flatMap {
271270
self.createPaymentIntent(parameters)
@@ -524,6 +523,7 @@ private extension StripeCardReaderService {
524523
}
525524

526525
if let intent = intent {
526+
self?.sendReaderEvent(.cardDetailsCollected)
527527
promise(.success(intent))
528528
}
529529
}

Networking/Networking.xcodeproj/project.pbxproj

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
68F48B1328E3E5750045C15B /* wc-analytics-customers.json in Resources */ = {isa = PBXBuildFile; fileRef = 68F48B1228E3E5750045C15B /* wc-analytics-customers.json */; };
370370
68FBC5B828928C8C00A05461 /* WooFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68FBC5B728928C8C00A05461 /* WooFoundation.framework */; };
371371
74002D6A2118B26100A63C19 /* SiteVisitStatsMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74002D692118B26000A63C19 /* SiteVisitStatsMapperTests.swift */; };
372-
74002D6C2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74002D6B2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift */; };
372+
74002D6C2118B88200A63C19 /* SiteStatsRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74002D6B2118B88200A63C19 /* SiteStatsRemoteTests.swift */; };
373373
740211DF2193985A002248DA /* comment-moderate-spam.json in Resources */ = {isa = PBXBuildFile; fileRef = 740211DE2193985A002248DA /* comment-moderate-spam.json */; };
374374
740211E121939908002248DA /* CommentRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 740211E021939908002248DA /* CommentRemoteTests.swift */; };
375375
740211E321939C84002248DA /* CommentResultMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 740211E221939C83002248DA /* CommentResultMapper.swift */; };
@@ -419,7 +419,7 @@
419419
74A1D26821189A7100931DFA /* SiteVisitStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A1D26721189A7000931DFA /* SiteVisitStats.swift */; };
420420
74A1D26B21189B8100931DFA /* SiteVisitStatsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A1D26A21189B8100931DFA /* SiteVisitStatsItem.swift */; };
421421
74A1D26D21189DFF00931DFA /* SiteVisitStatsMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A1D26C21189DFE00931DFA /* SiteVisitStatsMapper.swift */; };
422-
74A1D26F21189EA100931DFA /* SiteVisitStatsRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A1D26E21189EA000931DFA /* SiteVisitStatsRemote.swift */; };
422+
74A1D26F21189EA100931DFA /* SiteStatsRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A1D26E21189EA000931DFA /* SiteStatsRemote.swift */; };
423423
74A7B4BC217A807400E85A8B /* SiteSettingsMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A7B4BB217A807400E85A8B /* SiteSettingsMapperTests.swift */; };
424424
74A7B4BE217A841400E85A8B /* broken-settings-general.json in Resources */ = {isa = PBXBuildFile; fileRef = 74A7B4BD217A841400E85A8B /* broken-settings-general.json */; };
425425
74AB0ACA21948CE4008220CD /* CommentResultMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74AB0AC921948CE4008220CD /* CommentResultMapperTests.swift */; };
@@ -725,6 +725,7 @@
725725
E1BAB2C32913FA6400C3982B /* ResponseDataValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BAB2C22913FA6400C3982B /* ResponseDataValidator.swift */; };
726726
E1BAB2C52913FB1800C3982B /* WordPressApiValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BAB2C42913FB1800C3982B /* WordPressApiValidator.swift */; };
727727
E1BAB2C72913FB5800C3982B /* WordPressApiError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BAB2C62913FB5800C3982B /* WordPressApiError.swift */; };
728+
EE54C8942947229800A9BF61 /* ApplicationPasswordUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE54C8932947229800A9BF61 /* ApplicationPasswordUseCase.swift */; };
728729
EE8A86F1286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json in Resources */ = {isa = PBXBuildFile; fileRef = EE8A86F0286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json */; };
729730
EECB7EE8286555180028C888 /* media-update-product-id.json in Resources */ = {isa = PBXBuildFile; fileRef = EECB7EE7286555180028C888 /* media-update-product-id.json */; };
730731
FE28F6E226840DED004465C7 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE28F6E126840DED004465C7 /* User.swift */; };
@@ -1119,7 +1120,7 @@
11191120
68FBC5B728928C8C00A05461 /* WooFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WooFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11201121
69314EDE650855CAF927057E /* Pods_NetworkingTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NetworkingTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11211122
74002D692118B26000A63C19 /* SiteVisitStatsMapperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStatsMapperTests.swift; sourceTree = "<group>"; };
1122-
74002D6B2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStatsRemoteTests.swift; sourceTree = "<group>"; };
1123+
74002D6B2118B88200A63C19 /* SiteStatsRemoteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteStatsRemoteTests.swift; sourceTree = "<group>"; };
11231124
740211DE2193985A002248DA /* comment-moderate-spam.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "comment-moderate-spam.json"; sourceTree = "<group>"; };
11241125
740211E021939908002248DA /* CommentRemoteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentRemoteTests.swift; sourceTree = "<group>"; };
11251126
740211E221939C83002248DA /* CommentResultMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentResultMapper.swift; sourceTree = "<group>"; };
@@ -1169,7 +1170,7 @@
11691170
74A1D26721189A7000931DFA /* SiteVisitStats.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStats.swift; sourceTree = "<group>"; };
11701171
74A1D26A21189B8100931DFA /* SiteVisitStatsItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStatsItem.swift; sourceTree = "<group>"; };
11711172
74A1D26C21189DFE00931DFA /* SiteVisitStatsMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStatsMapper.swift; sourceTree = "<group>"; };
1172-
74A1D26E21189EA000931DFA /* SiteVisitStatsRemote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteVisitStatsRemote.swift; sourceTree = "<group>"; };
1173+
74A1D26E21189EA000931DFA /* SiteStatsRemote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteStatsRemote.swift; sourceTree = "<group>"; };
11731174
74A7B4BB217A807400E85A8B /* SiteSettingsMapperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteSettingsMapperTests.swift; sourceTree = "<group>"; };
11741175
74A7B4BD217A841400E85A8B /* broken-settings-general.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "broken-settings-general.json"; sourceTree = "<group>"; };
11751176
74AB0AC921948CE4008220CD /* CommentResultMapperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentResultMapperTests.swift; sourceTree = "<group>"; };
@@ -1482,6 +1483,7 @@
14821483
E1BAB2C22913FA6400C3982B /* ResponseDataValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseDataValidator.swift; sourceTree = "<group>"; };
14831484
E1BAB2C42913FB1800C3982B /* WordPressApiValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressApiValidator.swift; sourceTree = "<group>"; };
14841485
E1BAB2C62913FB5800C3982B /* WordPressApiError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressApiError.swift; sourceTree = "<group>"; };
1486+
EE54C8932947229800A9BF61 /* ApplicationPasswordUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordUseCase.swift; sourceTree = "<group>"; };
14851487
EE8A86F0286C5226003E8AA4 /* media-update-product-id-in-wordpress-site.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "media-update-product-id-in-wordpress-site.json"; sourceTree = "<group>"; };
14861488
EECB7EE7286555180028C888 /* media-update-product-id.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "media-update-product-id.json"; sourceTree = "<group>"; };
14871489
F3F25DC15EC1D7C631169CB5 /* Pods_Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1730,7 +1732,7 @@
17301732
31D27C942602B737002EDB1D /* SitePluginsRemoteTests.swift */,
17311733
453305EE2459E46000264E50 /* SitePostsRemoteTests.swift */,
17321734
74D5BECD217E0F98007B0348 /* SiteSettingsRemoteTests.swift */,
1733-
74002D6B2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift */,
1735+
74002D6B2118B88200A63C19 /* SiteStatsRemoteTests.swift */,
17341736
45ED4F13239E8F2E004F1BE3 /* TaxClassRemoteTests.swift */,
17351737
74CF5E8321402C04000CED0A /* TopEarnerStatsRemoteTests.swift */,
17361738
AE2D6622272A8F6E004A2C3A /* TelemetryRemoteTests.swift */,
@@ -1805,6 +1807,7 @@
18051807
B557D9E5209753AA005962F4 /* Networking */ = {
18061808
isa = PBXGroup;
18071809
children = (
1810+
EE54C8922947227900A9BF61 /* ApplicationPassword */,
18081811
B5A0369F214C0F4C00774E2C /* Internal */,
18091812
B5BB1D0A20A204F400112D92 /* Extensions */,
18101813
B567AF2720A0FA0A00AB6C62 /* Mapper */,
@@ -1873,7 +1876,7 @@
18731876
7426CA0C21AF27B9004E9FFC /* SiteAPIRemote.swift */,
18741877
31D27C802602889C002EDB1D /* SitePluginsRemote.swift */,
18751878
74046E1A217A684D007DD7BF /* SiteSettingsRemote.swift */,
1876-
74A1D26E21189EA000931DFA /* SiteVisitStatsRemote.swift */,
1879+
74A1D26E21189EA000931DFA /* SiteStatsRemote.swift */,
18771880
4568E2212459ADC60007E478 /* SitePostsRemote.swift */,
18781881
4501068E2399B19500E24722 /* TaxClassRemote.swift */,
18791882
74ABA1D0213F22CA00FFAD30 /* TopEarnersStatsRemote.swift */,
@@ -2563,6 +2566,14 @@
25632566
path = SystemStatusDetails;
25642567
sourceTree = "<group>";
25652568
};
2569+
EE54C8922947227900A9BF61 /* ApplicationPassword */ = {
2570+
isa = PBXGroup;
2571+
children = (
2572+
EE54C8932947229800A9BF61 /* ApplicationPasswordUseCase.swift */,
2573+
);
2574+
path = ApplicationPassword;
2575+
sourceTree = "<group>";
2576+
};
25662577
/* End PBXGroup section */
25672578

25682579
/* Begin PBXHeadersBuildPhase section */
@@ -3048,6 +3059,7 @@
30483059
743E84EE2217244C00FAC9D7 /* ShipmentTrackingListMapper.swift in Sources */,
30493060
451A97E5260B631E0059D135 /* ShippingLabelPredefinedPackage.swift in Sources */,
30503061
BAB373722795A1FB00837B4A /* OrderTaxLine.swift in Sources */,
3062+
EE54C8942947229800A9BF61 /* ApplicationPasswordUseCase.swift in Sources */,
30513063
B567AF2520A0CCA300AB6C62 /* AuthenticatedRequest.swift in Sources */,
30523064
453305E92459DF2100264E50 /* PostMapper.swift in Sources */,
30533065
E12552C526385B05001CEE70 /* ShippingLabelAddressValidationSuccess.swift in Sources */,
@@ -3125,7 +3137,7 @@
31253137
7412A8EC21B6E286005D182A /* ReportOrderTotalsMapper.swift in Sources */,
31263138
451A97CD260A01A40059D135 /* ShippingLabelStoreOptions.swift in Sources */,
31273139
02C254A8256373AB00A04423 /* ShippingLabel.swift in Sources */,
3128-
74A1D26F21189EA100931DFA /* SiteVisitStatsRemote.swift in Sources */,
3140+
74A1D26F21189EA100931DFA /* SiteStatsRemote.swift in Sources */,
31293141
029BA4F4255D72EC006171FD /* ShippingLabelPrintData.swift in Sources */,
31303142
24F98C562502EA4800F49B68 /* FeatureFlag.swift in Sources */,
31313143
02AF07EA27492DBC00B2D81E /* WordPressMedia.swift in Sources */,
@@ -3442,7 +3454,7 @@
34423454
45152831257A8E1A0076B03C /* ProductAttributeMapperTests.swift in Sources */,
34433455
26B2F74924C55ACE0065CCC8 /* LeaderboardsRemoteTests.swift in Sources */,
34443456
45CCFCE827A2E5020012E8CB /* InboxNoteListMapperTests.swift in Sources */,
3445-
74002D6C2118B88200A63C19 /* SiteVisitStatsRemoteTests.swift in Sources */,
3457+
74002D6C2118B88200A63C19 /* SiteStatsRemoteTests.swift in Sources */,
34463458
0212683524C046CB00F8A892 /* MockNetwork+Path.swift in Sources */,
34473459
68BD37B328D9B8BD00C2A517 /* CustomerRemoteTests.swift in Sources */,
34483460
B554FA932180C17200C54DFF /* NoteHashListMapperTests.swift in Sources */,
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import Foundation
2+
import WordPressShared
3+
4+
struct ApplicationPassword {
5+
/// WordPress org username that the application password belongs to
6+
///
7+
let wpOrgUsername: String
8+
9+
/// Application password
10+
///
11+
let password: Secret<String>
12+
}
13+
14+
protocol ApplicationPasswordUseCase {
15+
/// Returns the locally saved ApplicationPassword if available
16+
///
17+
var applicationPassword: ApplicationPassword? { get }
18+
19+
/// Generates new ApplicationPassword
20+
///
21+
/// - Returns: Generated `ApplicationPassword` instance
22+
///
23+
func generateNewPassword() async throws -> ApplicationPassword
24+
25+
/// Deletes the application password
26+
///
27+
/// Deletes locally and also sends an API request to delete it from the site
28+
///
29+
func deletePassword() async throws
30+
}

Networking/Networking/Remote/SiteVisitStatsRemote.swift renamed to Networking/Networking/Remote/SiteStatsRemote.swift

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Foundation
22

3-
/// SiteVisitStats: Remote Endpoints
3+
/// SiteStats: Remote Endpoints
44
///
5-
public class SiteVisitStatsRemote: Remote {
5+
public class SiteStatsRemote: Remote {
66

77
/// Fetch the visitor stats for a given site up to the current day, week, month, or year (depending on the given granularity of the `unit` parameter).
88
///
@@ -19,15 +19,15 @@ public class SiteVisitStatsRemote: Remote {
1919
latestDateToInclude: Date,
2020
quantity: Int,
2121
completion: @escaping (Result<SiteVisitStats, Error>) -> Void) {
22-
let path = "\(Constants.sitesPath)/\(siteID)/\(Constants.siteVisitStatsPath)/"
22+
let path = "\(Path.sites)/\(siteID)/\(Path.siteVisitStats)/"
2323
let dateFormatter = DateFormatter.Stats.statsDayFormatter
2424
if let siteTimezone = siteTimezone {
2525
dateFormatter.timeZone = siteTimezone
2626
}
2727
let parameters = [ParameterKeys.unit: unit.rawValue,
2828
ParameterKeys.date: dateFormatter.string(from: latestDateToInclude),
2929
ParameterKeys.quantity: String(quantity),
30-
ParameterKeys.statFields: Constants.visitorStatFieldValue]
30+
ParameterKeys.statFields: ParameterValues.visitors]
3131
let request = DotcomRequest(wordpressApiVersion: .mark1_1, method: .get, path: path, parameters: parameters)
3232
let mapper = SiteVisitStatsMapper(siteID: siteID)
3333
enqueue(request, mapper: mapper, completion: completion)
@@ -37,11 +37,10 @@ public class SiteVisitStatsRemote: Remote {
3737

3838
// MARK: - Constants!
3939
//
40-
private extension SiteVisitStatsRemote {
41-
enum Constants {
42-
static let sitesPath: String = "sites"
43-
static let siteVisitStatsPath: String = "stats/visits"
44-
static let visitorStatFieldValue: String = "visitors"
40+
private extension SiteStatsRemote {
41+
enum Path {
42+
static let sites: String = "sites"
43+
static let siteVisitStats: String = "stats/visits"
4544
}
4645

4746
enum ParameterKeys {
@@ -50,4 +49,8 @@ private extension SiteVisitStatsRemote {
5049
static let quantity: String = "quantity"
5150
static let statFields: String = "stat_fields"
5251
}
52+
53+
enum ParameterValues {
54+
static let visitors: String = "visitors"
55+
}
5356
}

Networking/NetworkingTests/Remote/SiteVisitStatsRemoteTests.swift renamed to Networking/NetworkingTests/Remote/SiteStatsRemoteTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import XCTest
22
@testable import Networking
33

44

5-
/// SiteVisitStatsRemote Unit Tests
5+
/// SiteStatsRemote Unit Tests
66
///
7-
class SiteVisitStatsRemoteTests: XCTestCase {
7+
class SiteStatsRemoteTests: XCTestCase {
88

99
/// Dummy Network Wrapper
1010
///
@@ -25,7 +25,7 @@ class SiteVisitStatsRemoteTests: XCTestCase {
2525
///
2626
func test_loadSiteVisitorStats_properly_returns_parsed_stats() throws {
2727
// Given
28-
let remote = SiteVisitStatsRemote(network: network)
28+
let remote = SiteStatsRemote(network: network)
2929
network.simulateResponse(requestUrlSuffix: "sites/\(sampleSiteID)/stats/visits/", filename: "site-visits-day")
3030

3131
// When
@@ -45,7 +45,7 @@ class SiteVisitStatsRemoteTests: XCTestCase {
4545
///
4646
func test_loadSiteVisitorStats_properly_relays_netwoking_errors() {
4747
// Given
48-
let remote = SiteVisitStatsRemote(network: network)
48+
let remote = SiteStatsRemote(network: network)
4949

5050
// When
5151
let result: Result<SiteVisitStats, Error> = waitFor { promise in

Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ end
3535

3636
def wordpress_kit
3737
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
38-
pod 'WordPressKit', '~> 4.49.0'
38+
pod 'WordPressKit', '~> 5.0.0'
3939
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
4040
end
4141

@@ -71,12 +71,12 @@ target 'WooCommerce' do
7171
pod 'Gridicons', '~> 1.2.0'
7272

7373
# To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
74-
pod 'WordPressAuthenticator', '~> 4.3.0'
75-
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
74+
pod 'WordPressAuthenticator', '~> 5.0.0'
75+
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
7676
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
7777
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
7878

79-
pod 'WordPressShared', '~> 1.15'
79+
pod 'WordPressShared', '~> 2.0'
8080

8181
pod 'WordPressUI', '~> 1.12.5'
8282
# pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''

0 commit comments

Comments
 (0)