Merge pull request #13 from humblehacker/master

Add support for Firebase Analytics
AnthonyMDev · Apr 25, 2019 · a3df337 · a3df337
2 parents d6a54d3 + f88ec88
commit a3df337
Show file tree

Hide file tree

Showing 17 changed files with 2,557 additions and 354 deletions.
diff --git a/CrashlyticsRecorder.podspec b/CrashlyticsRecorder.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CrashlyticsRecorder'
-  s.version          = '2.3.0'
+  s.version          = '2.4.0'
   s.swift_version    = '4.2'
   s.summary          = 'A wrapper for the Crashlytics framework allowing it to be used as a transitive dependency via dependency injection.'
 
@@ -16,6 +16,16 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.source_files = 'Pod/Classes/**/*'
+  s.subspec 'Crashlytics' do |cs|
+    cs.source_files = 'Pod/Classes/CrashlyticsRecorder.swift'
+  end
+
+  s.subspec 'Answers' do |as|
+    as.source_files = 'Pod/Classes/AnswersRecorder.swift'
+  end
+
+  s.subspec 'FirebaseAnalytics' do |fas|
+    fas.source_files = 'Pod/Classes/AnalyticsRecorder.swift'
+  end
 
 end
diff --git a/Example/CrashlyticsAdapter.swift b/Example/CrashlyticsAdapter.swift
@@ -9,6 +9,7 @@
 import Foundation
 import Crashlytics
 import CrashlyticsRecorder
+import Firebase
 
 extension Crashlytics: CrashlyticsProtocol {
 
@@ -22,3 +23,5 @@ extension Crashlytics: CrashlyticsProtocol {
 }
 
 extension Answers: AnswersProtocol { }
+
+extension Analytics: AnalyticsProtocol { }
diff --git a/Example/CrashlyticsRecorder.xcodeproj/project.pbxproj b/Example/CrashlyticsRecorder.xcodeproj/project.pbxproj
@@ -13,7 +13,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1CB9FA3DE9FBA0470EFAAD4B /* CrashlyticsRecorder.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = CrashlyticsRecorder.podspec; path = ../CrashlyticsRecorder.podspec; sourceTree = "<group>"; };
+		1CB9FA3DE9FBA0470EFAAD4B /* CrashlyticsRecorder.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = CrashlyticsRecorder.podspec; path = ../CrashlyticsRecorder.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		4959B85730BC1A5E99C3E0AC /* Pods-CrashlyticsRecorder_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CrashlyticsRecorder_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-CrashlyticsRecorder_Tests/Pods-CrashlyticsRecorder_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		5773D57D02E5F65D6A158D0E /* Pods_CrashlyticsRecorder_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CrashlyticsRecorder_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		607FACE51AFB9204008FA782 /* CrashlyticsRecorder_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CrashlyticsRecorder_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -175,16 +175,20 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CrashlyticsRecorder_Tests/Pods-CrashlyticsRecorder_Tests-frameworks.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-CrashlyticsRecorder_Tests/Pods-CrashlyticsRecorder_Tests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/CrashlyticsRecorder/CrashlyticsRecorder.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
+				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CrashlyticsRecorder.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CrashlyticsRecorder_Tests/Pods-CrashlyticsRecorder_Tests-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CrashlyticsRecorder_Tests/Pods-CrashlyticsRecorder_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		ADE703E7F819F63A3014C1F1 /* [CP] Check Pods Manifest.lock */ = {

diff --git a/...CrashlyticsRecorder.xcodeproj/xcshareddata/xcschemes/CrashlyticsRecorder-Example.xcscheme b/...CrashlyticsRecorder.xcodeproj/xcshareddata/xcschemes/CrashlyticsRecorder-Example.xcscheme
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-               BuildableName = "CrashlyticsRecorder_Example.app"
-               BlueprintName = "CrashlyticsRecorder_Example"
-               ReferencedContainer = "container:CrashlyticsRecorder.xcodeproj">
+               BlueprintIdentifier = "A9B96F037593ECDF849B317BBD16787A"
+               BuildableName = "CrashlyticsRecorder.framework"
+               BlueprintName = "CrashlyticsRecorder"
+               ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -75,18 +75,12 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "CrashlyticsRecorder_Example.app"
-            BlueprintName = "CrashlyticsRecorder_Example"
-            ReferencedContainer = "container:CrashlyticsRecorder.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
       <AdditionalOptions>
       </AdditionalOptions>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Example/Podfile b/Example/Podfile
@@ -3,8 +3,11 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
 target 'CrashlyticsRecorder_Tests' do
-  pod 'CrashlyticsRecorder', :path => '../'
+  pod 'CrashlyticsRecorder/Crashlytics', :path => '../'
+  pod 'CrashlyticsRecorder/Answers', :path => '../'
+  pod 'CrashlyticsRecorder/FirebaseAnalytics', :path => '../'
 
+  pod 'Firebase/Core'
   pod 'Fabric'
   pod 'Crashlytics'
 

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,28 +1,96 @@
 PODS:
   - Crashlytics (3.8.4):
     - Fabric (~> 1.6.3)
-  - CrashlyticsRecorder (2.3.0)
+  - CrashlyticsRecorder/Answers (2.4.0)
+  - CrashlyticsRecorder/Crashlytics (2.4.0)
+  - CrashlyticsRecorder/FirebaseAnalytics (2.4.0)
   - Fabric (1.6.11)
+  - Firebase/Core (5.13.0):
+    - Firebase/CoreOnly
+    - FirebaseAnalytics (= 5.3.0)
+  - Firebase/CoreOnly (5.13.0):
+    - FirebaseCore (= 5.1.8)
+  - FirebaseAnalytics (5.3.0):
+    - FirebaseCore (~> 5.1)
+    - FirebaseInstanceID (~> 3.3)
+    - GoogleAppMeasurement (~> 5.3)
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
+  - FirebaseCore (5.1.8):
+    - GoogleUtilities/Logger (~> 5.2)
+  - FirebaseInstanceID (3.3.0):
+    - FirebaseCore (~> 5.1)
+    - GoogleUtilities/Environment (~> 5.3)
+    - GoogleUtilities/UserDefaults (~> 5.3)
+  - GoogleAppMeasurement (5.3.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
+  - GoogleUtilities/AppDelegateSwizzler (5.3.6):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (5.3.6)
+  - GoogleUtilities/Logger (5.3.6):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/MethodSwizzler (5.3.6):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/Network (5.3.6):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (5.3.6)"
+  - GoogleUtilities/Reachability (5.3.6):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/UserDefaults (5.3.6):
+    - GoogleUtilities/Logger
+  - nanopb (0.3.901):
+    - nanopb/decode (= 0.3.901)
+    - nanopb/encode (= 0.3.901)
+  - nanopb/decode (0.3.901)
+  - nanopb/encode (0.3.901)
 
 DEPENDENCIES:
   - Crashlytics
-  - CrashlyticsRecorder (from `../`)
+  - CrashlyticsRecorder/Answers (from `../`)
+  - CrashlyticsRecorder/Crashlytics (from `../`)
+  - CrashlyticsRecorder/FirebaseAnalytics (from `../`)
   - Fabric
+  - Firebase/Core
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Crashlytics
     - Fabric
+    - Firebase
+    - FirebaseAnalytics
+    - FirebaseCore
+    - FirebaseInstanceID
+    - GoogleAppMeasurement
+    - GoogleUtilities
+    - nanopb
 
 EXTERNAL SOURCES:
   CrashlyticsRecorder:
     :path: "../"
 
 SPEC CHECKSUMS:
   Crashlytics: 79e236942ca1e7fc641df1feb9a275360a78ab6a
-  CrashlyticsRecorder: 165ef7732800b347fb0afa68dd2ea0d3b049fae6
+  CrashlyticsRecorder: 4e279997c3825fd5c22750d30c2606b7bc1a98f3
   Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6
+  Firebase: 6df9a6114bc9f106a98fe83d5438d4d9833c2019
+  FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
+  FirebaseCore: fba2bfaa691c49028309b92e4dd37cc4b5512fbe
+  FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
+  GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727
+  GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7
+  nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
 
-PODFILE CHECKSUM: d5b1aad82be7e86ba880f27203feabaaa6d724ea
+PODFILE CHECKSUM: 3de2cc74f27aad52f51a4523d047841525a9f89c
 
-COCOAPODS: 1.6.0.beta.1
+COCOAPODS: 1.5.3
diff --git a/Example/Pods/Local Podspecs/CrashlyticsRecorder.podspec.json b/Example/Pods/Local Podspecs/CrashlyticsRecorder.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock