Added convenience methods for ObjC interop (#142)

* ObjC convenience additions

* Narrow carrier info example down to iOS

* Made existing objc traits use new dictionary traits.

* Lets try that ci fix again. :S

* one more time.

Co-authored-by: Brandon Sneed <[email protected]>

Author: bsneed

Examples/apps/SegmentUIKitExample/SegmentUIKitExample/AppDelegate.swift

@@ -18,7 +18,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         Analytics.main.add(plugin: IDFACollection())
         Analytics.main.add(plugin: UIKitScreenTracking())
         Analytics.main.add(plugin: NotificationTracking())
+        
+#if os(iOS) && !targetEnvironment(macCatalyst)
         Analytics.main.add(plugin: CellularCarrier())
+#endif
 
         Analytics.support.add(plugin: ConsoleLogger(name: "support"))
         Analytics.support.add(plugin: ConsentTracking())

Examples/other_plugins/CellularCarrier.swift

@@ -32,6 +32,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#if os(iOS) && !targetEnvironment(macCatalyst)
+
 import Foundation
 import Segment
 import CoreTelephony
@@ -123,3 +125,4 @@ class PrimaryCellularCarrier: Plugin {
     }()
 }
 
+#endif

Sources/Segment/Analytics.swift

@@ -95,6 +95,14 @@ extension Analytics {
         return nil
     }
 
+    /// Returns the traits that were specified in the last identify call, as a dictionary.
+    public func traits() -> [String: Any]? {
+        if let userInfo: UserInfo = store.currentState() {
+            return userInfo.traits?.dictionaryValue
+        }
+        return nil
+    }
+    
     /// Tells this instance of Analytics to flush any queued events up to Segment.com.  This command will also
     /// be sent to each plugin present in the system.
     public func flush() {

Sources/Segment/ObjC/ObjCAnalytics.swift

@@ -13,12 +13,20 @@ import Foundation
 
 @objc(SEGAnalytics)
 public class ObjCAnalytics: NSObject {
-    internal let analytics: Analytics
+    /// The underlying Analytics object we're working with
+    public let analytics: Analytics
 
     @objc
     public init(configuration: ObjCConfiguration) {
         self.analytics = Analytics(configuration: configuration.configuration)
     }
+    
+    /// Get a workable ObjC instance by wrapping a Swift instance
+    /// Useful when you want additional flexibility or to share
+    /// a single instance between ObjC<>Swift.
+    public init(wrapping analytics: Analytics) {
+        self.analytics = analytics
+    }
 }
 
 // MARK: - ObjC Events
@@ -127,11 +135,7 @@ extension ObjCAnalytics {
 
     @objc
     public func traits() -> [String: Any]? {
-        var traits: [String: Any]? = nil
-        if let userInfo: UserInfo = analytics.store.currentState() {
-            traits = userInfo.traits?.dictionaryValue
-        }
-        return traits
+        return analytics.traits()
     }
 
     @objc

Tests/Segment-Tests/ObjC_Tests.swift

@@ -27,6 +27,12 @@ class ObjC_Tests: XCTestCase {
 
      */
 
+    func testWrapping() {
+        let a = Analytics(configuration: Configuration(writeKey: "WRITE_KEY"))
+        let objc = ObjCAnalytics(wrapping: a)
+        
+        XCTAssertTrue(objc.analytics === a)
+    }
 
     func testNonTrivialConfiguration() {
         let config = ObjCConfiguration(writeKey: "WRITE_KEY")