Merge pull request #2 from jjamminjim/master

Support shipping AnalyticsKot

Author: jjamminjim

Example/Podfile

@@ -11,7 +11,7 @@ target 'graylogger_Example' do
 	pod 'graylogger/Alamofire', :path => '../'
 	pod 'graylogger/AnalyticsKit', :path => '../'
 
-	pod 'AnalyticsKit/Core', :git => 'https://github.com/busybusy/AnalyticsKit.git'
+	pod 'AnalyticsKit/Core', '~> 1.3.0'
 
   target 'graylogger_Tests' do
     inherit! :search_paths

Example/Podfile.lock

@@ -7,7 +7,7 @@ PODS:
   - AFNetworking/Security (3.1.0)
   - AFNetworking/Serialization (3.1.0)
   - Alamofire (4.5.0)
-  - AnalyticsKit/Core (2.1.0)
+  - AnalyticsKit/Core (1.3.1)
   - DBC (1.0.2):
     - DBC/Bridged (= 1.0.2)
     - DBC/Objc (= 1.0.2)
@@ -17,30 +17,30 @@ PODS:
     - DBC/Swift
   - DBC/Objc (1.0.2)
   - DBC/Swift (1.0.2)
-  - graylogger (0.2.0):
-    - graylogger/Core (= 0.2.0)
-  - graylogger/AFNetworking (0.2.0):
+  - graylogger (0.4.0):
+    - graylogger/Core (= 0.4.0)
+  - graylogger/AFNetworking (0.4.0):
     - AFNetworking/NSURLSession
     - graylogger/Core
-  - graylogger/Alamofire (0.2.0):
+  - graylogger/Alamofire (0.4.0):
     - Alamofire
     - graylogger/Core
-  - graylogger/AnalyticsKit (0.2.0):
-    - AnalyticsKit/Core
+  - graylogger/AnalyticsKit (0.4.0):
+    - AnalyticsKit/Core (~> 1.3.0)
     - graylogger/Core
-  - graylogger/Core (0.2.0):
+  - graylogger/Core (0.4.0):
     - DBC
     - SwiftyJSON
-  - graylogger/CoreDataCache (0.2.0):
+  - graylogger/CoreDataCache (0.4.0):
     - graylogger/Core
-  - graylogger/ReachabilitySwift (0.2.0):
+  - graylogger/ReachabilitySwift (0.4.0):
     - graylogger/Core
     - ReachabilitySwift
   - ReachabilitySwift (3)
   - SwiftyJSON (3.1.4)
 
 DEPENDENCIES:
-  - AnalyticsKit/Core (from `https://github.com/busybusy/AnalyticsKit.git`)
+  - AnalyticsKit/Core (~> 1.3.0)
   - graylogger (from `../`)
   - graylogger/AFNetworking (from `../`)
   - graylogger/Alamofire (from `../`)
@@ -50,25 +50,18 @@ DEPENDENCIES:
   - SwiftyJSON
 
 EXTERNAL SOURCES:
-  AnalyticsKit:
-    :git: https://github.com/busybusy/AnalyticsKit.git
   graylogger:
     :path: "../"
 
-CHECKOUT OPTIONS:
-  AnalyticsKit:
-    :commit: 74937dd84187a229d412b044ca059c8011522257
-    :git: https://github.com/busybusy/AnalyticsKit.git
-
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  AnalyticsKit: f156ad2ba9b164d381cc7ce392a08066ab9475c8
+  AnalyticsKit: 781660610a174241e74df977a06920308f2a9945
   DBC: 710451ade7f92e86b626ba05190d09badd1b6a8d
-  graylogger: eb49b31eceb7f65cd8721bfdcc211c33d64350c3
+  graylogger: 33f7fffbe769de289391cc510a9856243a1725ed
   ReachabilitySwift: f5b9bb30a0777fac8f09ce8b067e32faeb29bb64
   SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
 
-PODFILE CHECKSUM: 2b9207e430a082dfc1a253cdd09a83808a5f2734
+PODFILE CHECKSUM: 0ac0f35122bb39d151bf1fb91fa12b31b2860349
 
 COCOAPODS: 1.2.0

Example/graylogger/AppDelegate.swift

@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	}()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-		AnalyticsKit.initializeProviders([GraylogAnalyticsKitProvider(input:bbTestLog)])
+		AnalyticsKit.initializeLoggers([GraylogAnalyticsKitProvider(input:bbTestLog)])
 
         return true
     }

graylogger.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'graylogger'
-  s.version          = '0.3.0'
+  s.version          = '0.4.0'
   s.summary          = 'A short description of graylogger.'
   s.homepage         = 'https://github.com/busybusy/graylogger-swift.git'
   s.license		     = 'Copyright 2016 Busy, LLC. All rights reserved.'
@@ -63,7 +63,7 @@ Pod::Spec.new do |s|
 	ss.source_files = 'graylogger/Classes/AnalyticsKit/*.swift'
 
     ss.dependency 'graylogger/Core'
-    ss.dependency 'AnalyticsKit/Core'
+    ss.dependency 'AnalyticsKit/Core', '~> 1.3.0'
   end
 end
 

graylogger/Classes/AnalyticsKit/GrayloggerAnalyticsKitProvider.swift

@@ -10,7 +10,6 @@ import AnalyticsKit
 import DBC
 
 public class GraylogAnalyticsKitProvider: NSObject, AnalyticsKitProvider {
-	
 	let glInput: GraylogInput
 
 	public init(input: GraylogInput) {
@@ -27,7 +26,7 @@ public class GraylogAnalyticsKitProvider: NSObject, AnalyticsKitProvider {
 		logEvent("Screen - \(screenName)")
 	}
 
-	public func logScreen(_ screenName: String, withProperties dict: [String : Any]) {
+	public func logScreen(_ screenName: String, withProperties dict: [AnyHashable : Any]!) {
 		logEvent("Screen - \(screenName)", withProperties: dict)
 	}
 
@@ -36,32 +35,32 @@ public class GraylogAnalyticsKitProvider: NSObject, AnalyticsKitProvider {
 		log(level:.informational, message:event)
 	}
 
-	public func logEvent(_ event: String, withProperties dict: [String : Any]) {
+	public func logEvent(_ event: String!, withProperties dict: [AnyHashable : Any]!) {
 		log(level:.informational, message:event, additionalData:dict)
 	}
 
-	public func logEvent(_ event: String, withProperty key: String, andValue value: String) {
+	public func logEvent(_ event: String!, withProperty key: String, andValue value: String) {
 		logEvent(event, withProperties: [key: value])
 	}
 
-	public func logEvent(_ event: String, timed: Bool) {
+	public func logEvent(_ event: String!, timed: Bool) {
 		if timed {
-			AnalyticsKitTimedEventHelper.startTimedEventWithName(event, forProvider: self)
+			AnalyticsKitTimedEventHelper.startTimedEvent(withName: event, for: self)
 		}
 
 		logEvent(event)
 	}
 
-	public func logEvent(_ event: String, withProperties dict: [String : Any], timed: Bool) {
+	public func logEvent(_ event: String!, withProperties dict: [AnyHashable : Any]!, timed: Bool) {
 		if timed {
-			AnalyticsKitTimedEventHelper.startTimedEventWithName(event, properties: dict, forProvider: self)
+			AnalyticsKitTimedEventHelper.startTimedEvent(withName: event, properties: dict, for: self)
 		}
 
 		logEvent(event, withProperties: dict)
 	}
 
-	public func endTimedEvent(_ event: String, withProperties dict: [String : Any]) {
-		if let timedEvent = AnalyticsKitTimedEventHelper.endTimedEventNamed(event, forProvider: self) {
+	public func endTimedEvent(_ event: String!, withProperties dict: [AnyHashable : Any]!) {
+		if let timedEvent = AnalyticsKitTimedEventHelper.endTimedEventNamed(event, for: self) {
 			logEvent(timedEvent.name, withProperties: timedEvent.properties)
 		}
 	}
@@ -108,7 +107,7 @@ public class GraylogAnalyticsKitProvider: NSObject, AnalyticsKitProvider {
 }
 
 fileprivate extension GraylogAnalyticsKitProvider {
-	func log(level:GraylogLevel, message:String, longMessage: String? = nil, additionalData:[String:Any]? = nil, file: StaticString = #file, line: UInt = #line) {
-		glInput.log(level: level, message: message, longMessage:longMessage, additionalData: additionalData, file:file, line:line)
+	func log(level:GraylogLevel, message:String, longMessage: String? = nil, additionalData:[AnyHashable : Any]? = nil, file: StaticString = #file, line: UInt = #line) {
+		glInput.log(level: level, message: message, longMessage:longMessage, additionalData: additionalData as! [String : Any], file:file, line:line)
 	}
 }