Skip to content

Commit 56b4dfa

Browse files
wooj2wooj2
committed
Moving reachability over from datastore to api category
1 parent d962dee commit 56b4dfa

File tree

12 files changed

+112
-64
lines changed

12 files changed

+112
-64
lines changed

‎Amplify.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
2861F5F799C24671B5C4DB8D /* Pods_Amplify_AmplifyTestConfigs_AmplifyTestCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C448F4F6DD01A268675E1C68 /* Pods_Amplify_AmplifyTestConfigs_AmplifyTestCommon.framework */; };
9898
2CFB61C7E80D065C0A885A2F /* Pods_Amplify_AWSPluginsCore_AWSPluginsTestConfigs_AWSPluginsTestCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D5363CAF9EFAA822FED56808 /* Pods_Amplify_AWSPluginsCore_AWSPluginsTestConfigs_AWSPluginsTestCommon.framework */; };
9999
3263D332138415AF42E64FF7 /* Pods_AmplifyTestApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDC7F1C368154B364CB74742 /* Pods_AmplifyTestApp.framework */; };
100+
6B33896823AAACC900561E5B /* ReachabilityUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B33896723AAACC900561E5B /* ReachabilityUpdate.swift */; };
100101
6BB7441023A9954900B0EB6C /* DispatchSource+MakeOneOff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB7440F23A9954900B0EB6C /* DispatchSource+MakeOneOff.swift */; };
101102
6BBECD7123ADA7E100C8DFBE /* AmplifyAWSServiceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BBECD7023ADA7E100C8DFBE /* AmplifyAWSServiceConfiguration.swift */; };
102103
6BBECD7423ADA9D100C8DFBE /* AmplifyAWSServiceConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BBECD7323ADA9D100C8DFBE /* AmplifyAWSServiceConfigurationTests.swift */; };
@@ -652,6 +653,7 @@
652653
65CCD77CBA8619E2E9D41196 /* Pods-AWSPinpointAnalyticsPluginTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AWSPinpointAnalyticsPluginTests.debug.xcconfig"; path = "Target Support Files/Pods-AWSPinpointAnalyticsPluginTests/Pods-AWSPinpointAnalyticsPluginTests.debug.xcconfig"; sourceTree = "<group>"; };
653654
687B09E9348F8D29979A2404 /* Pods-Amplify-AmplifyAWSPlugins-AWSPinpointAnalyticsPlugin-AWSPinpointAnalyticsPluginTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Amplify-AmplifyAWSPlugins-AWSPinpointAnalyticsPlugin-AWSPinpointAnalyticsPluginTests.debug.xcconfig"; path = "Target Support Files/Pods-Amplify-AmplifyAWSPlugins-AWSPinpointAnalyticsPlugin-AWSPinpointAnalyticsPluginTests/Pods-Amplify-AmplifyAWSPlugins-AWSPinpointAnalyticsPlugin-AWSPinpointAnalyticsPluginTests.debug.xcconfig"; sourceTree = "<group>"; };
654655
6AF0E4775809F0866F9C44D9 /* Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSS3StoragePlugin-AWSS3StoragePluginTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSS3StoragePlugin-AWSS3StoragePluginTests.debug.xcconfig"; path = "Target Support Files/Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSS3StoragePlugin-AWSS3StoragePluginTests/Pods-AmplifyAWSPlugins-AWSPluginsCore-AWSS3StoragePlugin-AWSS3StoragePluginTests.debug.xcconfig"; sourceTree = "<group>"; };
656+
6B33896723AAACC900561E5B /* ReachabilityUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReachabilityUpdate.swift; sourceTree = "<group>"; };
655657
6BAC32194A15ACB56F07DC87 /* Pods-AWSS3StoragePlugin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AWSS3StoragePlugin.debug.xcconfig"; path = "Target Support Files/Pods-AWSS3StoragePlugin/Pods-AWSS3StoragePlugin.debug.xcconfig"; sourceTree = "<group>"; };
656658
6BB7440F23A9954900B0EB6C /* DispatchSource+MakeOneOff.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DispatchSource+MakeOneOff.swift"; sourceTree = "<group>"; };
657659
6BBECD7023ADA7E100C8DFBE /* AmplifyAWSServiceConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AmplifyAWSServiceConfiguration.swift; sourceTree = "<group>"; };
@@ -1530,6 +1532,14 @@
15301532
path = ServiceConfiguration;
15311533
sourceTree = "<group>";
15321534
};
1535+
6B33896623AAAC9600561E5B /* Reachability */ = {
1536+
isa = PBXGroup;
1537+
children = (
1538+
6B33896723AAACC900561E5B /* ReachabilityUpdate.swift */,
1539+
);
1540+
path = Reachability;
1541+
sourceTree = "<group>";
1542+
};
15331543
95DAAB00237E63370028544F /* Models */ = {
15341544
isa = PBXGroup;
15351545
children = (
@@ -2197,6 +2207,7 @@
21972207
FAA9FC3C23620CED0012638A /* Interceptor */,
21982208
FA09B9352321A32D000E064D /* Internal */,
21992209
FA6BC873235F5BE80001A882 /* Operation */,
2210+
6B33896623AAAC9600561E5B /* Reachability */,
22002211
FA6BC876235F5C370001A882 /* Request */,
22012212
FAD2A18B2374D5EF0005CD6B /* Response */,
22022213
);
@@ -3476,6 +3487,7 @@
34763487
FAC23545227A055200424678 /* AmplifyConfiguration.swift in Sources */,
34773488
95DAAB84237F13940028544F /* VoiceType.swift in Sources */,
34783489
FAA2E8C223A00D5800E420EA /* APICategory+Resettable.swift in Sources */,
3490+
6B33896823AAACC900561E5B /* ReachabilityUpdate.swift in Sources */,
34793491
FAA2E8CC23A02A5400E420EA /* HubCategory+Resettable.swift in Sources */,
34803492
2142099823721F4400FA140C /* RESTOperationRequest.swift in Sources */,
34813493
6BB7441023A9954900B0EB6C /* DispatchSource+MakeOneOff.swift in Sources */,

‎Amplify/Categories/API/Reachability/ReachabilityUpdate.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// Copyright 2018-2019 Amazon.com,
3+
// Inc. or its affiliates. All Rights Reserved.
4+
//
5+
// SPDX-License-Identifier: Apache-2.0
6+
//
7+
8+
import Foundation
9+
10+
public struct ReachabilityUpdate {
11+
public let isOnline: Bool
12+
public init(isOnline: Bool) {
13+
self.isOnline = isOnline
14+
}
15+
}

‎AmplifyPlugins.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Pod::Spec.new do |s|
2929
ss.source_files = 'AmplifyPlugins/API/AWSAPICategoryPlugin/**/*.swift'
3030
ss.dependency 'AWSPluginsCore', AMPLIFY_VERSION
3131
ss.dependency 'Starscream', '~> 3.0.2'
32+
ss.dependency 'ReachabilitySwift', '~> 5.0.0'
3233
end
3334

3435
s.subspec 'AWSDataStorePlugin' do |ss|
3536
ss.source_files = 'AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/**/*.swift'
3637
ss.dependency 'AWSPluginsCore', AMPLIFY_VERSION
3738
ss.dependency 'SQLite.swift', '~> 0.12.0'
38-
ss.dependency 'ReachabilitySwift', '~> 5.0.0'
3939
end
4040

4141
s.subspec 'AWSPinpointAnalyticsPlugin' do |ss|

‎AmplifyPlugins/API/APICategoryPlugin.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@
101101
34AC2D987AA9068173601F3A /* Pods_HostApp_AWSAPICategoryPluginTestCommon_AWSAPICategoryPluginFunctionalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CAC5A88BE3D8AAD8B926A28 /* Pods_HostApp_AWSAPICategoryPluginTestCommon_AWSAPICategoryPluginFunctionalTests.framework */; };
102102
3B6E48CF20976C6005FCBE37 /* Pods_HostApp_AWSAPICategoryPluginTestCommon_GraphQLWithUserPoolIntegrationTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1AB915DA3F982E560CD6E47 /* Pods_HostApp_AWSAPICategoryPluginTestCommon_GraphQLWithUserPoolIntegrationTests.framework */; };
103103
3ED2D48445E80C9DE69565F4 /* Pods_HostApp_AWSAPICategoryPluginTestCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C55F4412E15F87E84BF3DD3F /* Pods_HostApp_AWSAPICategoryPluginTestCommon.framework */; };
104+
6B2E465823AAA69C0066EDCE /* NetworkReachabilityNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B2E465623AAA69C0066EDCE /* NetworkReachabilityNotifier.swift */; };
105+
6B2E465A23AAA6AF0066EDCE /* NetworkReachabilityNotifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B2E465923AAA6AF0066EDCE /* NetworkReachabilityNotifierTests.swift */; };
106+
6B33896E23AABEEE00561E5B /* MockReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B33896D23AABEEE00561E5B /* MockReachability.swift */; };
107+
6B33897023AABF1800561E5B /* NetworkReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B33896F23AABF1800561E5B /* NetworkReachability.swift */; };
104108
9B13EA5E48896E8B38883633 /* Pods_HostApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 930DD773E0FB4047393CA2AD /* Pods_HostApp.framework */; };
105109
A04815BCD5F9181C8AEDEF43 /* Pods_AWSAPICategoryPlugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881AB4B98B48235DEC7754C2 /* Pods_AWSAPICategoryPlugin.framework */; };
106110
B1F5048F35638D3D142C4F1F /* Pods_AWSAPICategoryPlugin_AWSAPICategoryPluginTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B13CFC866A30622EDD91AF4 /* Pods_AWSAPICategoryPlugin_AWSAPICategoryPluginTests.framework */; };
@@ -366,6 +370,10 @@
366370
64F4420E15AABEDB9EB87636 /* Pods-RESTWithIAMIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RESTWithIAMIntegrationTests.debug.xcconfig"; path = "Target Support Files/Pods-RESTWithIAMIntegrationTests/Pods-RESTWithIAMIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
367371
662A3518991D5D3389278520 /* Pods-AWSAPICategoryPluginFunctionalTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AWSAPICategoryPluginFunctionalTests.release.xcconfig"; path = "Target Support Files/Pods-AWSAPICategoryPluginFunctionalTests/Pods-AWSAPICategoryPluginFunctionalTests.release.xcconfig"; sourceTree = "<group>"; };
368372
66A15F78A50872B713184E3D /* Pods-HostApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HostApp.release.xcconfig"; path = "Target Support Files/Pods-HostApp/Pods-HostApp.release.xcconfig"; sourceTree = "<group>"; };
373+
6B2E465623AAA69C0066EDCE /* NetworkReachabilityNotifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkReachabilityNotifier.swift; sourceTree = "<group>"; };
374+
6B2E465923AAA6AF0066EDCE /* NetworkReachabilityNotifierTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkReachabilityNotifierTests.swift; sourceTree = "<group>"; };
375+
6B33896D23AABEEE00561E5B /* MockReachability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockReachability.swift; sourceTree = "<group>"; };
376+
6B33896F23AABF1800561E5B /* NetworkReachability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkReachability.swift; sourceTree = "<group>"; };
369377
74EDB7008F5342ED4B38C9CA /* Pods_HostApp_AWSAPICategoryPluginIntegrationTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HostApp_AWSAPICategoryPluginIntegrationTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
370378
77792DD821FC754D857FC63C /* Pods-HostApp-AWSAPICategoryPluginTestCommon-GraphQLWithIAMIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HostApp-AWSAPICategoryPluginTestCommon-GraphQLWithIAMIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-HostApp-AWSAPICategoryPluginTestCommon-GraphQLWithIAMIntegrationTests/Pods-HostApp-AWSAPICategoryPluginTestCommon-GraphQLWithIAMIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
371379
7866FCFB5807C2D20219CEBE /* Pods-HostApp-AWSAPICategoryPluginTestCommon-RESTWithIAMIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HostApp-AWSAPICategoryPluginTestCommon-RESTWithIAMIntegrationTests.release.xcconfig"; path = "Target Support Files/Pods-HostApp-AWSAPICategoryPluginTestCommon-RESTWithIAMIntegrationTests/Pods-HostApp-AWSAPICategoryPluginTestCommon-RESTWithIAMIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -671,6 +679,7 @@
671679
21D7A093237B54D90057D00D /* Configuration */,
672680
21D7A0D2237B54D90057D00D /* Interceptor */,
673681
21D7A08C237B54D90057D00D /* Operation */,
682+
6B2E465323AAA5000066EDCE /* Reachability */,
674683
21D7A09C237B54D90057D00D /* Subscription */,
675684
21D7A0BA237B54D90057D00D /* Support */,
676685
21D7A0B2237B54D90057D00D /* URLSessionBehavior */,
@@ -861,6 +870,23 @@
861870
path = SubscriptionInterceptor;
862871
sourceTree = "<group>";
863872
};
873+
6B2E465323AAA5000066EDCE /* Reachability */ = {
874+
isa = PBXGroup;
875+
children = (
876+
6B33896F23AABF1800561E5B /* NetworkReachability.swift */,
877+
6B2E465623AAA69C0066EDCE /* NetworkReachabilityNotifier.swift */,
878+
);
879+
path = Reachability;
880+
sourceTree = "<group>";
881+
};
882+
6B2E465423AAA61B0066EDCE /* Reachability */ = {
883+
isa = PBXGroup;
884+
children = (
885+
6B2E465923AAA6AF0066EDCE /* NetworkReachabilityNotifierTests.swift */,
886+
);
887+
path = Reachability;
888+
sourceTree = "<group>";
889+
};
864890
B478F5F12374DBF400C4F92B = {
865891
isa = PBXGroup;
866892
children = (
@@ -939,6 +965,7 @@
939965
B4DFA5D9237A611D0013E17B /* Interceptor */,
940966
B4DFA5BF237A611D0013E17B /* Mocks */,
941967
B4DFA5C3237A611D0013E17B /* Operation */,
968+
6B2E465423AAA61B0066EDCE /* Reachability */,
942969
B4DFA5D6237A611D0013E17B /* Request */,
943970
B4DFA5CE237A611D0013E17B /* Support */,
944971
);
@@ -948,6 +975,7 @@
948975
B4DFA5BF237A611D0013E17B /* Mocks */ = {
949976
isa = PBXGroup;
950977
children = (
978+
6B33896D23AABEEE00561E5B /* MockReachability.swift */,
951979
B4DFA5C0237A611D0013E17B /* MockSessionFactory.swift */,
952980
B4DFA5C2237A611D0013E17B /* MockURLSession.swift */,
953981
B4DFA5C1237A611D0013E17B /* MockURLSessionTask.swift */,
@@ -2008,6 +2036,7 @@
20082036
21D7A0EA237B54D90057D00D /* AWSAPIPlugin.swift in Sources */,
20092037
21D7A0E2237B54D90057D00D /* AWSAPIOperation+APIOperation.swift in Sources */,
20102038
21D7A0F3237B54D90057D00D /* AppSyncConnectionProvider.swift in Sources */,
2039+
6B2E465823AAA69C0066EDCE /* NetworkReachabilityNotifier.swift in Sources */,
20112040
21D7A10D237B54D90057D00D /* RESTOperationRequestUtils.swift in Sources */,
20122041
21D7A119237B54D90057D00D /* IAMURLRequestInterceptor.swift in Sources */,
20132042
21D7A114237B54D90057D00D /* GraphQLOperationRequest+Validate.swift in Sources */,
@@ -2054,6 +2083,7 @@
20542083
21D7A107237B54D90057D00D /* AppSyncMessage+Encodable.swift in Sources */,
20552084
21D7A108237B54D90057D00D /* AppSyncMessage.swift in Sources */,
20562085
21D7A0E9237B54D90057D00D /* AWSAPIPlugin+InterceptorBehavior.swift in Sources */,
2086+
6B33897023AABF1800561E5B /* NetworkReachability.swift in Sources */,
20572087
21D7A0FE237B54D90057D00D /* URLSessionDataTaskBehavior.swift in Sources */,
20582088
21D7A0E5237B54D90057D00D /* AWSAPICategoryPluginConfiguration.swift in Sources */,
20592089
);
@@ -2076,10 +2106,12 @@
20762106
B4DFA5E6237A611D0013E17B /* AWSAPICategoryPluginConfigurationTests.swift in Sources */,
20772107
B4DFA5E8237A611D0013E17B /* AWSAPICategoryPlugin+RESTClientBehaviorTests.swift in Sources */,
20782108
B4DFA5E0237A611D0013E17B /* MockSessionFactory.swift in Sources */,
2109+
6B2E465A23AAA6AF0066EDCE /* NetworkReachabilityNotifierTests.swift in Sources */,
20792110
B4DFA5E1237A611D0013E17B /* MockURLSessionTask.swift in Sources */,
20802111
B4DFA5F8237A611D0013E17B /* AWSAPICategoryPlugin+ConfigureTests.swift in Sources */,
20812112
B4DFA5F1237A611D0013E17B /* AWSAPICategoryPlugin+URLSessionBehaviorDelegateTests.swift in Sources */,
20822113
B4DFA5E7237A611D0013E17B /* AWSAPICategoryPlugin+InterceptorBehaviorTests.swift in Sources */,
2114+
6B33896E23AABEEE00561E5B /* MockReachability.swift in Sources */,
20832115
B4DFA5E4237A611D0013E17B /* AWSRESTOperationTests.swift in Sources */,
20842116
B4DFA5E3237A611D0013E17B /* AWSGraphQLOperationTests.swift in Sources */,
20852117
B4DFA5F9237A611D0013E17B /* AWSAPICategoryPlugin+URLSessionDelegateTests.swift in Sources */,

‎AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/NetworkReachability.swift‎ renamed to ‎AmplifyPlugins/API/AWSAPICategoryPlugin/Reachability/NetworkReachability.swift‎

File renamed without changes.

‎AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/NetworkReachabilityNotifier.swift‎ renamed to ‎AmplifyPlugins/API/AWSAPICategoryPlugin/Reachability/NetworkReachabilityNotifier.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ import Foundation
1010
import Reachability
1111
import Combine
1212

13-
struct ReachabilityUpdate {
14-
let isOnline: Bool
15-
}
16-
1713
@available(iOS 13.0, *)
1814
class NetworkReachabilityNotifier {
1915
private var reachability: NetworkReachabilityProviding?

‎AmplifyPlugins/API/AWSAPICategoryPluginTests/Mocks/MockReachability.swift‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
//
2+
// Copyright 2018-2019 Amazon.com,
3+
// Inc. or its affiliates. All Rights Reserved.
4+
//
5+
// SPDX-License-Identifier: Apache-2.0
6+
//
7+
8+
import Amplify
9+
import Foundation
10+
import Reachability
11+
import AWSAPICategoryPlugin
12+
13+
class MockNetworkReachabilityProvidingFactory: NetworkReachabilityProvidingFactory {
14+
public static func make(for hostname: String) -> NetworkReachabilityProviding? {
15+
return MockReachability()
16+
}
17+
}
18+
19+
class MockReachability: NetworkReachabilityProviding {
20+
var allowsCellularConnection = true
21+
static var iConnection = Reachability.Connection.wifi
22+
var connection: Reachability.Connection {
23+
get {
24+
return MockReachability.iConnection
25+
}
26+
set(conn) {
27+
MockReachability.iConnection = conn
28+
}
29+
}
30+
31+
var notificationCenter: NotificationCenter = .default
32+
33+
func startNotifier() throws {
34+
}
35+
36+
func stopNotifier() {
37+
}
38+
}

‎AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/NetworkReachabilityNotifierTests.swift‎ renamed to ‎AmplifyPlugins/API/AWSAPICategoryPluginTests/Reachability/NetworkReachabilityNotifierTests.swift‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import Foundation
99
import XCTest
1010
import Reachability
1111
import Combine
12-
@testable import AWSDataStoreCategoryPlugin
12+
@testable import AWSAPICategoryPlugin
1313

14+
@available(iOS 13.0, *)
1415
class NetworkReachabilityNotifierTests: XCTestCase {
1516
var notification: Notification!
1617
var notifier: NetworkReachabilityNotifier!
@@ -89,34 +90,3 @@ class NetworkReachabilityNotifierTests: XCTestCase {
8990
cancellable.cancel()
9091
}
9192
}
92-
93-
class MockNetworkReachabilityProvidingFactory: NetworkReachabilityProvidingFactory {
94-
public static func make(for hostname: String) -> NetworkReachabilityProviding? {
95-
return MockReachability()
96-
}
97-
}
98-
99-
class MockReachability: NetworkReachabilityProviding {
100-
var allowsCellularConnection = true
101-
static var iConnection = Reachability.Connection.wifi
102-
var connection: Reachability.Connection {
103-
get {
104-
return MockReachability.iConnection
105-
}
106-
set(conn) {
107-
MockReachability.iConnection = conn
108-
}
109-
}
110-
111-
var notificationCenter: NotificationCenter = .default
112-
113-
func setConnection(connection: Reachability.Connection) {
114-
self.connection = connection
115-
}
116-
117-
func startNotifier() throws {
118-
}
119-
120-
func stopNotifier() {
121-
}
122-
}

‎AmplifyPlugins/API/Podfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ target 'AWSAPICategoryPlugin' do
1010
pod 'Amplify', :path => '../../'
1111
pod 'AWSPluginsCore', :path => '../../'
1212
pod "Starscream", "~> 3.0.2"
13+
pod "ReachabilitySwift", "~> 5.0.0"
1314

1415
target "AWSAPICategoryPluginTests" do
1516
inherit! :complete
1617

1718
pod "CwlPreconditionTesting", :git => "https://github.com/mattgallagher/CwlPreconditionTesting.git", :tag => "1.2.0"
1819
pod "CwlCatchException", :git => "https://github.com/mattgallagher/CwlCatchException.git", :tag => "1.2.0"
1920
pod 'AmplifyTestCommon', :path => '../../'
21+
pod "ReachabilitySwift", "~> 5.0.0"
2022
end
2123
end
2224

0 commit comments

Comments
 (0)