Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ChatApp/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ opt_in_rules:
- fatal_error_message
- first_where
- toggle_bool
- unused_private_declaration
- modifier_order
- contains_over_first_not_nil
- convenience_type
Expand Down
2 changes: 1 addition & 1 deletion ChatApp/ChatApp/Managers/FirebaseAuthentication.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extension FirebaseAuthentication {
fatalError("Unable to create login UI")
}
authUI.delegate = self
authUI.providers = [FUIGoogleAuth(), FUIEmailAuth()]
authUI.providers = [FUIGoogleAuth(authUI: authUI), FUIEmailAuth()]
return authUI.authViewController()
}
}
Expand Down
8 changes: 4 additions & 4 deletions ChatApp/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ use_frameworks!
inhibit_all_warnings!

def networking_pods
pod 'FirebaseCore', '= 6.10.3'
pod 'FirebaseFirestore', '= 1.18.0'
pod 'FirebaseStorage', '= 3.9.0'
pod 'FirebaseAuth', '= 6.9.2'
pod 'FirebaseCore', '~> 8'
pod 'FirebaseFirestore', '~> 8'
pod 'FirebaseStorage', '~> 8'
pod 'FirebaseAuth', '~> 8'
pod 'FirebaseUI/Auth'
pod 'FirebaseUI/Google'
pod 'FirebaseUI/Email'
Expand Down
150 changes: 74 additions & 76 deletions ChatApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -223,70 +223,72 @@ PODS:
- BoringSSL-GRPC/Implementation (0.0.7):
- BoringSSL-GRPC/Interface (= 0.0.7)
- BoringSSL-GRPC/Interface (0.0.7)
- Firebase/Auth (6.33.0):
- Firebase/Auth (8.1.1):
- Firebase/CoreOnly
- FirebaseAuth (~> 6.9.2)
- Firebase/CoreOnly (6.33.0):
- FirebaseCore (= 6.10.3)
- FirebaseAuth (6.9.2):
- FirebaseCore (~> 6.10)
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/Environment (~> 6.7)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseCore (6.10.3):
- FirebaseCoreDiagnostics (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- FirebaseCoreDiagnostics (1.7.0):
- GoogleDataTransport (~> 7.4)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- nanopb (~> 1.30906.0)
- FirebaseFirestore (1.18.0):
- FirebaseAuth (~> 8.1.0)
- Firebase/CoreOnly (8.1.1):
- FirebaseCore (= 8.1.0)
- FirebaseAuth (8.1.0):
- FirebaseCore (~> 8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
- GoogleUtilities/Environment (~> 7.4)
- GTMSessionFetcher/Core (~> 1.5)
- FirebaseCore (8.1.0):
- FirebaseCoreDiagnostics (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
- FirebaseCoreDiagnostics (8.1.0):
- GoogleDataTransport (~> 9.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
- nanopb (~> 2.30908.0)
- FirebaseFirestore (8.1.0):
- abseil/algorithm (= 0.20200225.0)
- abseil/base (= 0.20200225.0)
- abseil/memory (= 0.20200225.0)
- abseil/meta (= 0.20200225.0)
- abseil/strings/strings (= 0.20200225.0)
- abseil/time (= 0.20200225.0)
- abseil/types (= 0.20200225.0)
- FirebaseCore (~> 6.10)
- FirebaseCore (~> 8.0)
- "gRPC-C++ (~> 1.28.0)"
- leveldb-library (~> 1.22)
- nanopb (~> 1.30906.0)
- FirebaseStorage (3.9.0):
- FirebaseCore (~> 6.10)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseUI/Auth (8.5.1):
- Firebase/Auth (~> 6.0)
- nanopb (~> 2.30908.0)
- FirebaseStorage (8.1.0):
- FirebaseCore (~> 8.0)
- GTMSessionFetcher/Core (~> 1.5)
- FirebaseUI/Auth (10.0.2):
- Firebase/Auth (>= 7.2.0)
- GoogleUtilities/UserDefaults
- FirebaseUI/Email (8.5.1):
- FirebaseUI/Email (10.0.2):
- FirebaseUI/Auth
- FirebaseUI/Google (8.5.1):
- FirebaseUI/Google (10.0.2):
- FirebaseUI/Auth
- GoogleSignIn (~> 5.0)
- GoogleDataTransport (7.4.0):
- nanopb (~> 1.30906.0)
- GoogleDataTransport (9.0.1):
- GoogleUtilities/Environment (~> 7.2)
- nanopb (~> 2.30908.0)
- PromisesObjC (~> 1.2)
- GoogleSignIn (5.0.2):
- AppAuth (~> 1.2)
- GTMAppAuth (~> 1.0)
- GTMSessionFetcher/Core (~> 1.1)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
- GoogleUtilities/AppDelegateSwizzler (7.4.1):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.7.2):
- GoogleUtilities/Environment (7.4.1):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (6.7.2):
- GoogleUtilities/Logger (7.4.1):
- GoogleUtilities/Environment
- GoogleUtilities/Network (6.7.2):
- GoogleUtilities/Network (7.4.1):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.7.2)"
- GoogleUtilities/Reachability (6.7.2):
- "GoogleUtilities/NSData+zlib (7.4.1)"
- GoogleUtilities/Reachability (7.4.1):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.7.2):
- GoogleUtilities/UserDefaults (7.4.1):
- GoogleUtilities/Logger
- "gRPC-C++ (1.28.2)":
- "gRPC-C++/Implementation (= 1.28.2)"
Expand All @@ -312,33 +314,29 @@ PODS:
- BoringSSL-GRPC (= 0.0.7)
- gRPC-Core/Interface (= 1.28.2)
- gRPC-Core/Interface (1.28.2)
- GTMAppAuth (1.1.0):
- GTMAppAuth (1.2.2):
- AppAuth/Core (~> 1.4)
- GTMSessionFetcher (~> 1.4)
- GTMSessionFetcher (1.4.0):
- GTMSessionFetcher/Full (= 1.4.0)
- GTMSessionFetcher/Core (1.4.0)
- GTMSessionFetcher/Full (1.4.0):
- GTMSessionFetcher/Core (= 1.4.0)
- InputBarAccessoryView (5.2.1):
- InputBarAccessoryView/Core (= 5.2.1)
- InputBarAccessoryView/Core (5.2.1)
- leveldb-library (1.22)
- GTMSessionFetcher/Core (~> 1.5)
- GTMSessionFetcher/Core (1.5.0)
- InputBarAccessoryView (5.2.3):
- InputBarAccessoryView/Core (= 5.2.3)
- InputBarAccessoryView/Core (5.2.3)
- leveldb-library (1.22.1)
- MessageKit (3.4.2):
- InputBarAccessoryView (~> 5.2.1)
- nanopb (1.30906.0):
- nanopb/decode (= 1.30906.0)
- nanopb/encode (= 1.30906.0)
- nanopb/decode (1.30906.0)
- nanopb/encode (1.30906.0)
- PromisesObjC (1.2.11)
- SwiftLint (0.40.3)
- nanopb (2.30908.0):
- nanopb/decode (= 2.30908.0)
- nanopb/encode (= 2.30908.0)
- nanopb/decode (2.30908.0)
- nanopb/encode (2.30908.0)
- PromisesObjC (1.2.12)
- SwiftLint (0.43.1)

DEPENDENCIES:
- FirebaseAuth (= 6.9.2)
- FirebaseCore (= 6.10.3)
- FirebaseFirestore (= 1.18.0)
- FirebaseStorage (= 3.9.0)
- FirebaseAuth (~> 8)
- FirebaseCore (~> 8)
- FirebaseFirestore (~> 8)
- FirebaseStorage (~> 8)
- FirebaseUI/Auth
- FirebaseUI/Email
- FirebaseUI/Google
Expand Down Expand Up @@ -375,27 +373,27 @@ SPEC CHECKSUMS:
abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
FirebaseFirestore: adff4877869ca91a11250cc0989a6cd56bad163f
FirebaseStorage: 33b92875a9b556824886cc7a65120c7d2cb3a8d8
FirebaseUI: 9df84336a56f1d755ae4c37d5885c237d3084b6b
GoogleDataTransport: b7f406340a291370045a270c599e53c6fa6ec20f
Firebase: 4bb49ae87756034cef870fa3c4006235eb46f475
FirebaseAuth: e069ff5736fe9d5dcf61f36244bb1b1ce1897d17
FirebaseCore: 389c4ce9a7cce4a7e25eb22326b4bee0050557b2
FirebaseCoreDiagnostics: 3e249cee3de5c5f9cfd6cc2a19997231286fec11
FirebaseFirestore: c4be8314e9fa156f44b54025f7a98ecbff6971a6
FirebaseStorage: 5b5958efaf84fb991568ad36f157f60c76bdcd80
FirebaseUI: 59db3d833773f985550897d54ceb811ba37fb9a5
GoogleDataTransport: 04c3e9a480bbcaa2ec3f5d27f1cdeb6a92f20c8d
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
GTMAppAuth: 197a8dabfea5d665224aa00d17f164fc2248dab9
GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
InputBarAccessoryView: 39a7ed22727baf3b8550ecdf6c8a4d28b2c6aa91
leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7
GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
InputBarAccessoryView: f814a0317d47687fafc6bac9e4df6015eaf5b764
leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729
MessageKit: 5ff0908bce5a7b6e11bd0b60e13a33e03697d161
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
SwiftLint: dfd554ff0dff17288ee574814ccdd5cea85d76f7
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52

PODFILE CHECKSUM: f2c08d9cce69a578be522766b198e5527b3df51a
PODFILE CHECKSUM: b37b6c8ffe39fe303297af2a48b7aee628928ddc

COCOAPODS: 1.10.1
4 changes: 2 additions & 2 deletions ChatCore/Utils/Network/ReachabilityObserver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ private extension ReachabilityObserver {
do {
reachability = try Reachability()

reachability?.whenReachable = { [weak self] reachability in
reachability?.whenReachable = { [weak self] _ in
self?.reachabilityChanged(.reachable)
}

reachability?.whenUnreachable = { [weak self] reachability in
reachability?.whenUnreachable = { [weak self] _ in
self?.reachabilityChanged(.unreachable)
}

Expand Down
6 changes: 3 additions & 3 deletions STRVChatNetworkingFirestore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Pod::Spec.new do |spec|
spec.source_files = 'ChatNetworkingFirestore/*.swift', 'ChatNetworkingFirestore/**/*.swift'

spec.dependency 'STRVChatCore', '~> 0.0.12'
spec.dependency 'FirebaseCore', '~> 6.10.3'
spec.dependency 'FirebaseFirestore', '~> 1.18.0'
spec.dependency 'FirebaseStorage', '~> 3.9.0'
spec.dependency 'FirebaseCore', '~> 8'
spec.dependency 'FirebaseFirestore', '~> 8'
spec.dependency 'FirebaseStorage', '~> 8'

end