fix: Remove Reachability dependency

The main issue is that the Reachability package does not get built as a non-Firebase SDK by the release tooling. It's possible to work around but I was trying to avoid more special casing.

Author: ncooke3

crashlytics/CrashlyticsExample.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 		8D00BB732D3B0AED00F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB722D3B0AED00F6F6DD /* FirebaseCrashlytics */; };
 		8D00BB752D3B0AF400F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB742D3B0AF400F6F6DD /* FirebaseCrashlytics */; };
 		8D00BB772D3B0AFF00F6F6DD /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 8D00BB762D3B0AFF00F6F6DD /* FirebaseCrashlytics */; };
-		8D96F5DE2685440700F1A2B7 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = 8D96F5DD2685440700F1A2B7 /* Reachability */; };
 		8D96F5E62685442800F1A2B7 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; };
 		8D96F5EE2685442C00F1A2B7 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; };
 		C726B81C26D84D51000991C1 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C726B81B26D84D51000991C1 /* UITests.swift */; };
@@ -37,7 +36,6 @@
 		C77AC00626BB16C200BDE919 /* CrashlyticsSwiftUIExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899726845907003E5C2C /* CrashlyticsSwiftUIExampleApp.swift */; };
 		C77AC00726BB16C500BDE919 /* ReachabililtyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C723B78C26853A1700AD34CD /* ReachabililtyHelper.swift */; };
 		C77AC00826BB16CA00BDE919 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73C899826845907003E5C2C /* ContentView.swift */; };
-		C77AC00C26BB16E300BDE919 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = C77AC00B26BB16E300BDE919 /* Reachability */; };
 		C79FD3BA26C728D800FE0261 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C79FD3B926C728D800FE0261 /* GoogleService-Info.plist */; };
 		C79FD3BB26C728D800FE0261 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C79FD3B926C728D800FE0261 /* GoogleService-Info.plist */; };
 		C79FD3BC26C728D800FE0261 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C79FD3B926C728D800FE0261 /* GoogleService-Info.plist */; };
@@ -174,7 +172,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C77AC00526BB151000BDE919 /* Reachability in Frameworks */,
 				8D00BB752D3B0AF400F6F6DD /* FirebaseCrashlytics in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -398,7 +395,6 @@
 			);
 			name = "CrashlyticsExample (macOS)";
 			packageProductDependencies = (
-				C77AC00426BB151000BDE919 /* Reachability */,
 				8D00BB742D3B0AF400F6F6DD /* FirebaseCrashlytics */,
 			);
 			productName = "CrashlyticsSwiftUIExample (macOS)";
@@ -574,7 +570,6 @@
 			);
 			mainGroup = 5F5A53431ADE670C00F81DF0;
 			packageReferences = (
-				8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */,
 				8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
 			);
 			productRefGroup = 5F5A534D1ADE670C00F81DF0 /* Products */;
@@ -1636,14 +1631,6 @@
 				minimumVersion = 11.7.0;
 			};
 		};
-		8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/ashleymills/Reachability.swift.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 5.1.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1667,21 +1654,6 @@
 			package = 8D00BB6E2D3B0ACF00F6F6DD /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
 			productName = FirebaseCrashlytics;
 		};
-		8D96F5DD2685440700F1A2B7 /* Reachability */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */;
-			productName = Reachability;
-		};
-		C77AC00426BB151000BDE919 /* Reachability */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */;
-			productName = Reachability;
-		};
-		C77AC00B26BB16E300BDE919 /* Reachability */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 8D96F5DC2685440700F1A2B7 /* XCRemoteSwiftPackageReference "Reachability.swift" */;
-			productName = Reachability;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 5F5A53441ADE670C00F81DF0 /* Project object */;

crashlytics/OUTLINE.md

@@ -22,16 +22,14 @@ operating system, time of crash), the crash report contains custom keys and logs
 network status) which can help developers to debug the crash as well as illustrate how to add custom
 data to their own crashes. 
 
-### Reachability
+### Network Status
 There are many reasons behind a crash, and developers are challenged to understand the root cause
 behind the crash in order to apply the proper fix. Thus, receiving different types of information
-from the crash can help developers to understand the crash. Reachability gives information about a
+from the crash can help developers to understand the crash. Network status gives information about a
 device’s network configuration settings.
-[Reachability.swift](https://github.com/ashleymills/Reachability.swift) uses the [System
-Configuration](https://developer.apple.com/documentation/systemconfiguration) framework to monitor
-the network state of a device. It is a replacement for [Apple's
-Reachability](https://developer.apple.com/library/archive/samplecode/Reachability/Introduction/Intro.html#//apple_ref/doc/uid/DTS40007324)
-(written in Objective-C) re-written in Swift with closures. 
+This quickstart uses Apple's [Network](https://developer.apple.com/documentation/network)
+framework to monitor the network state of a device. Specifically, it uses `NWPathMonitor` to get
+network status changes. 
 
 ### Cross Platform
 This Quickstart supports all Apple platforms including iOS, macOS, tvOS and watchOS. The SwiftUI
@@ -70,5 +68,9 @@ Below are the screenshots for selected build schemes:
 ### CrashlyticsExample (tvOS)
 <br><img src="./Design/Screenshots/crashlytics_tvos.png" alt="tvOS Screenshot" width=400>
 
+### CrashlyticsExample (watchOS)
+<br><img src="./Design/Screenshots/crashlytics_watchos.png" alt="watchOS Screenshot" width=200>mple (tvOS)
+<br><img src="./Design/Screenshots/crashlytics_tvos.png" alt="tvOS Screenshot" width=400>
+
 ### CrashlyticsExample (watchOS)
 <br><img src="./Design/Screenshots/crashlytics_watchos.png" alt="watchOS Screenshot" width=200>

crashlytics/Shared/CrashlyticsSwiftUIExampleApp.swift

@@ -21,9 +21,7 @@ import FirebaseCrashlytics
 @main
 struct CrashlyticsSwiftUIExampleApp: App {
   private var crashlyticsReference = Crashlytics.crashlytics()
-  #if !os(watchOS)
-    let reachabilityHelper = ReachabililtyHelper()
-  #endif
+  let reachabilityHelper = ReachabililtyHelper()
 
   func setUserInfo() {
     let userInfo = [
@@ -46,15 +44,12 @@ struct CrashlyticsSwiftUIExampleApp: App {
   func setCustomValues() {
     crashlyticsReference.setCustomValue(42, forKey: "MeaningOfLife")
     crashlyticsReference.setCustomValue("Test value", forKey: "last_UI_action")
-    // Reachability is not compatible with watchOS
-    #if !os(watchOS)
-      let customKeysObject = [
-        "locale": reachabilityHelper.getLocale(),
-        "network_connection": reachabilityHelper.getNetworkStatus(),
-      ] as [String: Any]
-      crashlyticsReference.setCustomKeysAndValues(customKeysObject)
-      reachabilityHelper.updateAndTrackNetworkStatus()
-    #endif
+    let customKeysObject = [
+      "locale": reachabilityHelper.getLocale(),
+      "network_connection": reachabilityHelper.getNetworkStatus(),
+    ] as [String: Any]
+    crashlyticsReference.setCustomKeysAndValues(customKeysObject)
+    reachabilityHelper.updateAndTrackNetworkStatus()
     Crashlytics.crashlytics().setUserID("123456789")
   }
 

crashlytics/Shared/ReachabililtyHelper.swift

@@ -16,9 +16,16 @@
 
 import Foundation
 import FirebaseCrashlytics
-import Reachability
+import Network
 
 class ReachabililtyHelper: NSObject {
+  private let monitor: NWPathMonitor
+
+  override init() {
+    monitor = NWPathMonitor()
+    super.init()
+  }
+
   /**
    * Retrieve the locale information for the app.
    */
@@ -30,15 +37,21 @@ class ReachabililtyHelper: NSObject {
    * Retrieve the network status for the app.
    */
   func getNetworkStatus() -> String {
-    guard let reachability = try? Reachability() else {
-      return "unknown"
-    }
-    switch reachability.connection {
-    case .wifi:
-      return "wifi"
-    case .cellular:
-      return "cellular"
-    case .unavailable:
+    return networkStatus(from: monitor.currentPath)
+  }
+
+  private func networkStatus(from path: NWPath) -> String {
+    if path.status == .satisfied {
+      if path.usesInterfaceType(.wifi) {
+        return "wifi"
+      } else if path.usesInterfaceType(.cellular) {
+        return "cellular"
+      } else if path.usesInterfaceType(.wiredEthernet) {
+        return "wired"
+      } else {
+        return "other"
+      }
+    } else {
       return "unavailable"
     }
   }
@@ -47,19 +60,11 @@ class ReachabililtyHelper: NSObject {
    * Add a hook to update network status going forward.
    */
   func updateAndTrackNetworkStatus() {
-    NotificationCenter.default.addObserver(self,
-                                           selector: #selector(reachabilityChanged(note:)),
-                                           name: .reachabilityChanged,
-                                           object: nil)
-    do {
-      let reachability = try Reachability()
-      try reachability.startNotifier()
-    } catch {
-      print("Could not start reachability notifier: \(error)")
+    monitor.pathUpdateHandler = { path in
+      let status = self.networkStatus(from: path)
+      Crashlytics.crashlytics().setCustomValue(status, forKey: "network_connection")
     }
+    let queue = DispatchQueue(label: "NetworkMonitor")
+    monitor.start(queue: queue)
   }
-
-  @objc func reachabilityChanged(note: Notification) {
-    Crashlytics.crashlytics().setCustomValue(getNetworkStatus(), forKey: "network_connection")
-  }
-}
+}