LIB-35: Updated class names for Swift (#902)

Co-authored-by: Cody Garvin <cody.garvin@segment.com>

Analytics/Classes/Crypto/SEGAES256Crypto.h

@@ -9,6 +9,7 @@
 #import "SEGCrypto.h"
 
 
+NS_SWIFT_NAME(AES256Crypto)
 @interface SEGAES256Crypto : NSObject <SEGCrypto>
 
 @property (nonatomic, readonly, nonnull) NSString *password;

Analytics/Classes/Integrations/SEGAliasPayload.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-
+NS_SWIFT_NAME(AliasPayload)
 @interface SEGAliasPayload : SEGPayload
 
 @property (nonatomic, readonly) NSString *theNewId;

Analytics/Classes/Integrations/SEGGroupPayload.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-
+NS_SWIFT_NAME(GroupPayload)
 @interface SEGGroupPayload : SEGPayload
 
 @property (nonatomic, readonly) NSString *groupId;

Analytics/Classes/Integrations/SEGIdentifyPayload.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-
+NS_SWIFT_NAME(IdentifyPayload)
 @interface SEGIdentifyPayload : SEGPayload
 
 @property (nonatomic, readonly, nullable) NSString *userId;

Analytics/Classes/Integrations/SEGIntegration.h

@@ -9,6 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+NS_SWIFT_NAME(Integration)
 @protocol SEGIntegration <NSObject>
 
 @optional

Analytics/Classes/Integrations/SEGIntegrationsManager.h

@@ -22,7 +22,7 @@ extern NSString *_Nonnull SEGAnalyticsIntegrationDidStart;
 
 @class SEGAnalytics;
 
-
+NS_SWIFT_NAME(IntegrationsManager)
 @interface SEGIntegrationsManager : NSObject
 
 // Exposed for testing.

Analytics/Classes/Integrations/SEGPayload.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-
+NS_SWIFT_NAME(Payload)
 @interface SEGPayload : NSObject
 
 @property (nonatomic, readonly) JSON_DICT context;
@@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
+NS_SWIFT_NAME(ApplicationLifecyclePayload)
 @interface SEGApplicationLifecyclePayload : SEGPayload
 
 @property (nonatomic, strong) NSString *notificationName;
@@ -25,13 +26,14 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
+NS_SWIFT_NAME(ContinueUserActivityPayload)
 @interface SEGContinueUserActivityPayload : SEGPayload
 
 @property (nonatomic, strong) NSUserActivity *activity;
 
 @end
 
-
+NS_SWIFT_NAME(OpenURLPayload)
 @interface SEGOpenURLPayload : SEGPayload
 
 @property (nonatomic, strong) NSURL *url;
@@ -42,6 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 
+NS_SWIFT_NAME(RemoteNotificationPayload)
 @interface SEGRemoteNotificationPayload : SEGPayload
 
 // SEGEventTypeHandleActionWithForRemoteNotification

Analytics/Classes/Integrations/SEGScreenPayload.h

@@ -4,6 +4,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
+NS_SWIFT_NAME(ScreenPayload)
 @interface SEGScreenPayload : SEGPayload
 
 @property (nonatomic, readonly) NSString *name;

Analytics/Classes/Integrations/SEGTrackPayload.h

@@ -4,6 +4,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
+NS_SWIFT_NAME(TrackPayload)
 @interface SEGTrackPayload : SEGPayload
 
 @property (nonatomic, readonly) NSString *event;

Analytics/Classes/Internal/SEGFileStorage.h

@@ -9,6 +9,7 @@
 #import "SEGStorage.h"
 
 
+NS_SWIFT_NAME(FileStorage)
 @interface SEGFileStorage : NSObject <SEGStorage>
 
 @property (nonatomic, strong, nullable) id<SEGCrypto> crypto;

Analytics/Classes/Internal/SEGHTTPClient.h

@@ -13,6 +13,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
+NS_SWIFT_NAME(HTTPClient)
 @interface SEGHTTPClient : NSObject
 
 @property (nonatomic, strong) SEGRequestFactory requestFactory;

Analytics/Classes/Internal/SEGSegmentIntegration.h

@@ -17,6 +17,7 @@ extern NSString *const kSEGQueueFilename;
 extern NSString *const kSEGTraitsFilename;
 
 
+NS_SWIFT_NAME(SegmentIntegration)
 @interface SEGSegmentIntegration : NSObject <SEGIntegration>
 
 - (id)initWithAnalytics:(SEGAnalytics *)analytics httpClient:(SEGHTTPClient *)httpClient fileStorage:(id<SEGStorage>)fileStorage userDefaultsStorage:(id<SEGStorage>)userDefaultsStorage;

Analytics/Classes/Internal/SEGSegmentIntegrationFactory.h

@@ -6,6 +6,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
+NS_SWIFT_NAME(SegmentIntegrationFactory)
 @interface SEGSegmentIntegrationFactory : NSObject <SEGIntegrationFactory>
 
 @property (nonatomic, strong) SEGHTTPClient *client;

Analytics/Classes/Internal/SEGStoreKitTracker.h

@@ -5,6 +5,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
+NS_SWIFT_NAME(StoreKitTracker)
 @interface SEGStoreKitTracker : NSObject <SKPaymentTransactionObserver, SKProductsRequestDelegate>
 
 + (instancetype)trackTransactionsForAnalytics:(SEGAnalytics *)analytics;

Analytics/Classes/Internal/SEGUserDefaultsStorage.h

@@ -10,6 +10,7 @@
 #import "SEGStorage.h"
 
 
+NS_SWIFT_NAME(UserDefaultsStorage)
 @interface SEGUserDefaultsStorage : NSObject <SEGStorage>
 
 @property (nonatomic, strong, nullable) id<SEGCrypto> crypto;

Analytics/Classes/Internal/SEGUtils.h

@@ -7,6 +7,7 @@
 #import "SEGAnalyticsUtils.h"
 
 
+NS_SWIFT_NAME(Utilities)
 @interface SEGUtils : NSObject
 
 + (NSData *_Nullable)dataFromPlist:(nonnull id)plist;

Analytics/Classes/Middlewares/SEGContext.h

@@ -42,12 +42,13 @@ typedef NS_ENUM(NSInteger, SEGEventType) {
     SEGEventTypeContinueUserActivity,
     SEGEventTypeOpenURL,
 
-};
+} NS_SWIFT_NAME(EventType);
 
 @class SEGAnalytics;
 @protocol SEGMutableContext;
 
 
+NS_SWIFT_NAME(Context)
 @interface SEGContext : NSObject <NSCopying>
 
 // Loopback reference to the top level SEGAnalytics object.

Analytics/Classes/Middlewares/SEGMiddleware.h

@@ -11,6 +11,7 @@
 
 typedef void (^SEGMiddlewareNext)(SEGContext *_Nullable newContext);
 
+NS_SWIFT_NAME(Middleware)
 @protocol SEGMiddleware
 @required
 
@@ -33,6 +34,7 @@ typedef void (^SEGMiddlewareNext)(SEGContext *_Nullable newContext);
 typedef void (^SEGMiddlewareBlock)(SEGContext *_Nonnull context, SEGMiddlewareNext _Nonnull next);
 
 
+NS_SWIFT_NAME(BlockMiddleware)
 @interface SEGBlockMiddleware : NSObject <SEGMiddleware>
 
 @property (nonnull, nonatomic, readonly) SEGMiddlewareBlock block;
@@ -45,6 +47,7 @@ typedef void (^SEGMiddlewareBlock)(SEGContext *_Nonnull context, SEGMiddlewareNe
 typedef void (^RunMiddlewaresCallback)(BOOL earlyExit, NSArray<id<SEGMiddleware>> *_Nonnull remainingMiddlewares);
 
 // XXX TODO: Add some tests for SEGMiddlewareRunner
+NS_SWIFT_NAME(MiddlewareRunner)
 @interface SEGMiddlewareRunner : NSObject
 
 // While it is certainly technically possible to change middlewares dynamically on the fly. we're explicitly NOT
@@ -58,6 +61,7 @@ typedef void (^RunMiddlewaresCallback)(BOOL earlyExit, NSArray<id<SEGMiddleware>
 @end
 
 // Container object for middlewares for a specific destination.
+NS_SWIFT_NAME(DestinationMiddleware)
 @interface SEGDestinationMiddleware : NSObject
 @property (nonatomic, strong, nonnull, readonly) NSString *integrationKey;
 @property (nonatomic, strong, nullable, readonly) NSArray<id<SEGMiddleware>> *middleware;

Analytics/Classes/SEGAnalytics.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @class SEGAnalyticsConfiguration;
 
-
+NS_SWIFT_NAME(Analytics)
 @interface SEGAnalytics : NSObject
 
 /**
@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * @see -setupWithConfiguration:
  */
-+ (instancetype _Nullable)sharedAnalytics;
++ (instancetype)sharedAnalytics;
 
 /*!
  @method

Analytics/Classes/SEGAnalyticsConfiguration.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+NS_SWIFT_NAME(ApplicationProtocol)
 @protocol SEGApplicationProtocol <NSObject>
 @property (nullable, nonatomic, assign) id<UIApplicationDelegate> delegate;
 - (UIBackgroundTaskIdentifier)seg_beginBackgroundTaskWithName:(nullable NSString *)taskName expirationHandler:(void (^__nullable)(void))handler;
@@ -32,6 +33,7 @@ typedef NSString *_Nonnull (^SEGAdSupportBlock)(void);
 /**
  * This object provides a set of properties to control various policies of the analytics client. Other than `writeKey`, these properties can be changed at any time.
  */
+NS_SWIFT_NAME(AnalyticsConfiguration)
 @interface SEGAnalyticsConfiguration : NSObject
 
 /**
@@ -216,6 +218,7 @@ typedef NSString *_Nonnull (^SEGAdSupportBlock)(void);
 
 typedef  NSDictionary * _Nonnull (^SEGRawModificationBlock)( NSDictionary * _Nonnull rawPayload);
 
+NS_SWIFT_NAME(AnalyticsExperimental)
 @interface SEGAnalyticsExperimental : NSObject
 /**
  Experimental support for nanosecond timestamps.  While the segment pipeline doesn't support this yet

Analytics/Vendor/SEGReachability.h

@@ -64,6 +64,7 @@ typedef void (^SEGNetworkReachable)(SEGReachability *reachability);
 typedef void (^SEGNetworkUnreachable)(SEGReachability *reachability);
 
 
+NS_SWIFT_NAME(Reachability)
 @interface SEGReachability : NSObject
 
 @property (nonatomic, copy, nullable) SEGNetworkReachable reachableBlock;

AnalyticsTests/AnalyticsTests.swift

@@ -13,14 +13,14 @@ import Analytics
 
 class AnalyticsTests: QuickSpec {
   override func spec() {
-    let config = SEGAnalyticsConfiguration(writeKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE")
+    let config = AnalyticsConfiguration(writeKey: "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE")
     let cachedSettings = [
       "integrations": [
         "Segment.io": ["apiKey": "QUI5ydwIGeFFTa1IvCBUhxL9PyW5B0jE"]
       ],
       "plan": ["track": [:]],
     ] as NSDictionary
-    var analytics: SEGAnalytics!
+    var analytics: Analytics!
     var testMiddleware: TestMiddleware!
     var testApplication: TestApplication!
 
@@ -34,7 +34,7 @@ class AnalyticsTests: QuickSpec {
       UserDefaults.standard.set("test SEGQueue should be removed", forKey: "SEGQueue")
       expect(UserDefaults.standard.string(forKey: "SEGQueue")).toNot(beNil())
 
-      analytics = SEGAnalytics(configuration: config)
+      analytics = Analytics(configuration: config)
       analytics.test_integrationsManager()?.test_setCachedSettings(settings: cachedSettings)
     }
 
@@ -73,14 +73,14 @@ class AnalyticsTests: QuickSpec {
     }*/
 
     it("persists anonymousId") {
-      let analytics2 = SEGAnalytics(configuration: config)
+      let analytics2 = Analytics(configuration: config)
       expect(analytics.getAnonymousId()) == analytics2.getAnonymousId()
     }
 
     it("persists userId") {
       analytics.identify("testUserId1")
 
-      let analytics2 = SEGAnalytics(configuration: config)
+      let analytics2 = Analytics(configuration: config)
       analytics2.test_integrationsManager()?.test_setCachedSettings(settings: cachedSettings)
 
       expect(analytics.test_integrationsManager()?.test_segmentIntegration()?.test_userId()) == "testUserId1"
@@ -110,7 +110,7 @@ class AnalyticsTests: QuickSpec {
         UIApplicationLaunchOptionsKey.sourceApplication: "testApp",
         UIApplicationLaunchOptionsKey.url: "test://test",
       ])
-      let event = testMiddleware.lastContext?.payload as? SEGTrackPayload
+      let event = testMiddleware.lastContext?.payload as? TrackPayload
       expect(event?.event) == "Application Opened"
       expect(event?.properties?["from_background"] as? Bool) == false
       expect(event?.properties?["referring_application"] as? String) == "testApp"
@@ -120,15 +120,15 @@ class AnalyticsTests: QuickSpec {
     it("fires Application Opened during UIApplicationWillEnterForeground") {
       testMiddleware.swallowEvent = true
       NotificationCenter.default.post(name: .UIApplicationWillEnterForeground, object: testApplication)
-      let event = testMiddleware.lastContext?.payload as? SEGTrackPayload
+      let event = testMiddleware.lastContext?.payload as? TrackPayload
       expect(event?.event) == "Application Opened"
       expect(event?.properties?["from_background"] as? Bool) == true
     }
 
     it("fires Application Backgrounded during UIApplicationDidEnterBackground") {
       testMiddleware.swallowEvent = true
       NotificationCenter.default.post(name: .UIApplicationDidEnterBackground, object: testApplication)
-      let event = testMiddleware.lastContext?.payload as? SEGTrackPayload
+      let event = testMiddleware.lastContext?.payload as? TrackPayload
       expect(event?.event) == "Application Backgrounded"
     }
 
@@ -206,7 +206,7 @@ class AnalyticsTests: QuickSpec {
       analytics.open(URL(string: "fb123456789://authorize#access_token=hastoberedacted")!, options: [:])
 
 
-      let event = testMiddleware.lastContext?.payload as? SEGTrackPayload
+      let event = testMiddleware.lastContext?.payload as? TrackPayload
       expect(event?.event) == "Deep Link Opened"
       expect(event?.properties?["url"] as? String) == "fb123456789://authorize#access_token=((redacted/fb-auth-token))"
     }
@@ -218,7 +218,7 @@ class AnalyticsTests: QuickSpec {
       analytics.open(URL(string: "myapp://auth?token=hastoberedacted&other=stuff")!, options: [:])
 
 
-      let event = testMiddleware.lastContext?.payload as? SEGTrackPayload
+      let event = testMiddleware.lastContext?.payload as? TrackPayload
       expect(event?.event) == "Deep Link Opened"
       expect(event?.properties?["url"] as? String) == "myapp://auth?token=((redacted/my-auth))&other=stuff"
     }

AnalyticsTests/AnalyticsUtilTests.swift

@@ -96,11 +96,11 @@ class AnalyticsUtilTests: QuickSpec {
       }
 
       it("works with strings") {
-        expect(SEGUtils.traverseJSON("a b foo c", andReplaceWithFilters: filters) as? String) == "a b foo-bar c"
+        expect(Utilities.traverseJSON("a b foo c", andReplaceWithFilters: filters) as? String) == "a b foo-bar c"
       }
 
       it("works recursively") {
-        expect(SEGUtils.traverseJSON("a b foo foo c", andReplaceWithFilters: filters) as? String) == "a b foo-bar foo-bar c"
+        expect(Utilities.traverseJSON("a b foo foo c", andReplaceWithFilters: filters) as? String) == "a b foo-bar foo-bar c"
       }
 
       it("works with nested dictionaries") {
@@ -109,7 +109,7 @@ class AnalyticsUtilTests: QuickSpec {
           "bar": "foo"
         ] as [String: Any]
 
-        guard let input = SEGUtils.traverseJSON(data, andReplaceWithFilters: filters) as? [String: Any] else {
+        guard let input = Utilities.traverseJSON(data, andReplaceWithFilters: filters) as? [String: Any] else {
           XCTFail("Failed to create actual result from traversed JSON replace")
           return
         }
@@ -127,7 +127,7 @@ class AnalyticsUtilTests: QuickSpec {
           [1, nil, "qfoob", ["baz": "foo"]],
           "foo"
           ] as [Any]
-        let input = SEGUtils.traverseJSON(data, andReplaceWithFilters: filters)
+        let input = Utilities.traverseJSON(data, andReplaceWithFilters: filters)
         let output = [
           [1, nil, "qfoo-barb", ["baz": "foo-bar"]],
           "foo-bar"

AnalyticsTests/AutoScreenReportingTest.swift

@@ -17,7 +17,7 @@ class AutoScreenReportingTests: QuickSpec {
     var rootVC: UIViewController!
 
     beforeEach {
-      let config = SEGAnalyticsConfiguration(writeKey: "foobar")
+      let config = AnalyticsConfiguration(writeKey: "foobar")
       config.trackApplicationLifecycleEvents = true
       config.recordScreenViews = true