feat: Remove deprecated public APIs

Author: BrandonStalnaker

UnitTests/ObjCTests/MPCommerceEventTests.m

@@ -325,17 +325,13 @@ - (void)testCommerceEventProductDeprecated {
     XCTAssertNotNil(commerceEvent, @"Commerce event should not have been nil.");
     XCTAssertEqual(commerceEvent.products.count, 1, @"Incorrect product count.");
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     commerceEvent.checkoutOptions = @"option 1";
     commerceEvent.screenName = @"Time Traveling";
     commerceEvent.checkoutStep = 1;
-    commerceEvent[@"key_string"] = @"val_string";
-    commerceEvent[@"key_number"] = @"3.14";
+    commerceEvent.customAttributes = @{@"key_string": @"val_string", @"key_number": @"3.14"};
     commerceEvent.currency = @"bitcoins";
     commerceEvent.nonInteractive = YES;
     commerceEvent.screenName = @"time machine screen";
-#pragma clang diagnostic pop
 
     product = [[MPProduct alloc] initWithName:@"Tardis" sku:@"trds" quantity:@1 price:@7.89];
     product.brand = @"Gallifrey Tardis";

UnitTests/ObjCTests/MPEventTests.m

@@ -71,20 +71,12 @@ - (void)testInstance {
     event.category = mock;
 
     XCTAssertNil(event.category, @"Should have been nil.");
-    
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     XCTAssertNotNil(event.customAttributes, @"Should not have been nil.");
-    XCTAssertNotNil(event.info, @"Should not have been nil.");
-
     XCTAssertEqual(event.customAttributes.count, 3, @"Should have been three values in the customAttributes dictionary.");
-    XCTAssertEqual(event.info.count, 3, @"Should have been three values in the info dictionary.");
 
     NSDictionary *copyEventInfo = [eventInfo copy];
     event.customAttributes = copyEventInfo;
     XCTAssertEqualObjects(event.customAttributes, eventInfo, @"Should have been equal.");
-    XCTAssertEqualObjects(event.info, eventInfo, @"Should have been equal.");
-#pragma clang diagnostic pop
 
     event = [[MPEvent alloc] init];
     XCTAssertNotNil(event, @"Should not have been nil.");

UnitTests/ObjCTests/MParticleTests.m

@@ -795,20 +795,6 @@ - (void)testLogNilScreenEvent {
     XCTAssertNil(e);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-- (void)testLogNilCommerceEvent {
-    MParticle *instance = [MParticle sharedInstance];
-    NSException *e = nil;
-    @try {
-        [instance logCommerceEvent:(id _Nonnull)nil];
-    } @catch (NSException *ex) {
-        e = ex;
-    }
-    XCTAssertNil(e);
-}
-#pragma clang diagnostic pop
-
 - (void)testSetATTStatusNotDetermined {
     MParticle *instance = [MParticle sharedInstance];
     MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];

UnitTests/SwiftTests/MPEventTests.swift

@@ -50,7 +50,6 @@ class MPEventTests: XCTestCase {
         XCTAssertNotNil(sut)
         XCTAssertEqual(sut.name, "<<Event With No Name>>")
         XCTAssertEqual(sut.duration, 0)
-        XCTAssertNil(sut.info)
         XCTAssertNil(sut.category)
         XCTAssertNil(sut.endTime)
         XCTAssertNil(sut.startTime)
@@ -236,12 +235,6 @@ class MPEventTests: XCTestCase {
         XCTAssertEqual(ts, expected)
     }
 
-    func testInfoAndSetInfo_mapsToCustomAttributes() {
-        sut.info = ["a": "1"]
-        XCTAssertEqual(sut.info?["a"] as? String, "1")
-        XCTAssertEqual(sut.customAttributes?["a"] as? String, "1")
-    }
-    
     func testSetName_withEmptyName_discardsAndLogs() {
         let logger = MParticle.sharedInstance().getLogger()!
         logger.logLevel = .verbose

mParticle-Apple-SDK/Ecommerce/MPCommerceEvent.mm

@@ -287,43 +287,6 @@ - (void)setEventType {
     }
 }
 
-- (NSMutableDictionary *)userDefinedAttributes {
-    return [self.customAttributes copy];
-}
-
-- (void)setUserDefinedAttributes:(NSMutableDictionary *)userDefinedAttributes {
-    self.customAttributes = userDefinedAttributes;
-}
-
-#pragma mark Subscripting
-- (id)objectForKeyedSubscript:(NSString *const)key {
-    NSAssert(key != nil, @"'key' cannot be nil.");
-    
-    id object = [self.customAttributes objectForKey:key];
-    return object;
-}
-
-- (void)setObject:(id)obj forKeyedSubscript:(NSString *)key {
-    NSAssert(key != nil, @"'key' cannot be nil.");
-    NSAssert(obj != nil, @"'obj' cannot be nil.");
-    
-    if (obj == nil) {
-        return;
-    }
-    
-    NSMutableDictionary *mutatingAttributes = [[NSMutableDictionary alloc] init];
-
-    if (self.customAttributes != nil && self.customAttributes.count > 0) {
-        mutatingAttributes = [self.customAttributes mutableCopy];
-    }
-    
-    mutatingAttributes[key] = obj;
-    self.customAttributes = [mutatingAttributes copy];
-}
-
-- (NSArray *)allKeys {
-    return [self.customAttributes allKeys];
-}
 #pragma mark NSObject
 - (BOOL)isEqual:(MPCommerceEvent *)object {
     BOOL isEqual = [super isEqual:object] &&

mParticle-Apple-SDK/Ecommerce/MPProduct.m

@@ -325,18 +325,6 @@ - (MPProduct *)copyMatchingHashedProperties:(NSDictionary *)hashedMap {
 }
 
 #pragma mark Public accessors
-- (NSString *)affiliation {
-    return self.objectDictionary[kMPProductAffiliation];
-}
-
-- (void)setAffiliation:(NSString *)affiliation {
-    if (affiliation) {
-        self.objectDictionary[kMPProductAffiliation] = affiliation;
-    } else {
-        [self.objectDictionary removeObjectForKey:kMPProductAffiliation];
-    }
-}
-
 - (NSString *)brand {
     return self.objectDictionary[kMPProductBrand];
 }
@@ -379,14 +367,6 @@ - (void)setCouponCode:(NSString *)couponCode {
     }
 }
 
-- (NSString *)currency {
-    return self.objectDictionary[kMPProductCurrency];
-}
-
-- (void)setCurrency:(NSString *)currency {
-    self.objectDictionary[kMPProductCurrency] = currency ? : @"USD";
-}
-
 - (NSString *)name {
     return self.objectDictionary[kMPProductName];
 }
@@ -429,16 +409,6 @@ - (void)setSku:(NSString *)sku {
     }
 }
 
-- (NSString *)transactionId {
-    return self.objectDictionary[kMPProductTransactionId];
-}
-
-- (void)setTransactionId:(NSString *)transactionId {
-    if (transactionId) {
-        self.objectDictionary[kMPProductTransactionId] = transactionId;
-    }
-}
-
 - (NSString *)variant {
     return self.objectDictionary[kMPProductVariant];
 }
@@ -450,38 +420,6 @@ - (void)setVariant:(NSString *)variant {
     }
 }
 
-- (double)shippingAmount {
-    return [self.objectDictionary[kMPProductShipping] doubleValue];
-}
-
-- (void)setShippingAmount:(double)shippingAmount {
-    self.objectDictionary[kMPProductShipping] = @(shippingAmount);
-}
-
-- (double)taxAmount {
-    return [self.objectDictionary[kMPProductTax] doubleValue];
-}
-
-- (void)setTaxAmount:(double)taxAmount {
-    self.objectDictionary[kMPProductTax] = @(taxAmount);
-}
-
-- (double)totalAmount {
-    return [self.objectDictionary[kMPProductRevenue] doubleValue];
-}
-
-- (void)setTotalAmount:(double)totalAmount {
-    self.objectDictionary[kMPProductRevenue] = @(totalAmount);
-}
-
-- (double)unitPrice {
-    return [self.price doubleValue];
-}
-
-- (void)setUnitPrice:(double)unitPrice {
-    self.price = @(unitPrice);
-}
-
 - (NSUInteger)position {
     return [self.objectDictionary[kMPProductPosition] integerValue];
 }

mParticle-Apple-SDK/Event/MPEvent.m

@@ -170,14 +170,6 @@ - (void)setCategory:(NSString *)category {
     return eventDictionary;
 }
 
-- (NSDictionary *)info {
-    return [self.customAttributes copy];
-}
-
-- (void)setInfo:(NSDictionary *)info {
-    self.customAttributes = info;
-}
-
 - (void)setName:(NSString *)name {
     MPLog *logger = MParticle.sharedInstance.getLogger;
     if (name.length == 0) {

mParticle-Apple-SDK/Include/MPCommerceEvent.h

@@ -163,24 +163,6 @@ typedef NS_ENUM(NSUInteger, MPCommerceEventAction) {
  */
 - (void)removeProduct:(nonnull MPProduct *)product;
 
-/**
- Returns an array with all keys in the custom attributes dictionary
- @returns An array with all keys in the custom attributes dictionary
- @deprecated use customAttributes.allKeys instead
- */
-- (nullable NSArray *)allKeys DEPRECATED_MSG_ATTRIBUTE("use customAttributes.allKeys instead");
-
-/**
- A dictionary containing further information about the commerce event. The number of entries is
- limited to 100 key value pairs. Keys must be strings (up to 255 characters) and values
- can be strings (up to 4096 characters), numbers, booleans, or dates
- @deprecated use customAttributes instead
- */
-- (NSMutableDictionary * _Nullable)userDefinedAttributes DEPRECATED_MSG_ATTRIBUTE("use customAttributes instead");
-- (void)setUserDefinedAttributes:(NSMutableDictionary *_Nullable)userDefinedAttributes DEPRECATED_MSG_ATTRIBUTE("set customAttributes instead");
-- (nullable id)objectForKeyedSubscript:(nonnull NSString *const)key DEPRECATED_MSG_ATTRIBUTE("use customAttributes[key] instead");
-- (void)setObject:(nonnull id)obj forKeyedSubscript:(nonnull NSString *)key DEPRECATED_MSG_ATTRIBUTE("use customAttributes[key] = obj instead");
-
 @end
 
 extern NSString * _Nonnull const kMPCEInstructionsKey;

mParticle-Apple-SDK/Include/MPEvent.h

@@ -14,14 +14,6 @@
  */
 @property (nonatomic, strong, nullable) NSString *category;
 
-/**
-A dictionary containing further information about the event. The number of entries is
-limited to 100 key value pairs. Keys must be strings (up to 255 characters) and values
-can be strings (up to 4096 characters), numbers, booleans, or dates
- @deprecated use customAttributes instead
-*/
-@property (nonatomic, strong, nullable) NSDictionary<NSString *, id> *info DEPRECATED_MSG_ATTRIBUTE("use customAttributes instead");
-
 /**
  The name of the event to be logged (required not nil). The event name must not contain
  more than 255 characters.

mParticle-Apple-SDK/Include/MPProduct.h

@@ -102,64 +102,6 @@
 - (nullable id)objectForKeyedSubscript:(nonnull NSString *const)key;
 - (void)setObject:(nonnull id)obj forKeyedSubscript:(nonnull NSString *)key;
 
-#pragma mark Deprecated and/or Unavailable
-/**
- An entity with which the transaction should be affiliated (e.g. a particular store). If nil, mParticle will use an empty string
- @deprecated use MPTransactionAttributes.affiliation instead
- */
-@property (nonatomic, strong, nullable) NSString *affiliation __attribute__((deprecated("use MPTransactionAttributes.affiliation instead")));
-
-/**
- The currency of a transaction. If not specified, mParticle will use "USD"
- @deprecated use MPCommerceEvent.currency instead
- */
-@property (nonatomic, strong, nullable) NSString *currency __attribute__((deprecated("use MPCommerceEvent.currency instead")));
-
-/**
- A unique ID representing the transaction. This ID should not collide with other transaction IDs. If not specified, mParticle will generate a random id with 20 characters
- @deprecated use MPTransactionAttributes.transactionId instead
- */
-@property (nonatomic, strong, nullable) NSString *transactionId __attribute__((deprecated("use MPTransactionAttributes.transactionId instead")));
-
-/**
- @deprecated use MPTransactionAttributes.revenue instead
- */
-@property (nonatomic, readwrite) double revenueAmount __attribute__((unavailable("use MPTransactionAttributes.revenue instead")));
-
-/**
- The total cost of shipping for a transaction. If free or non-applicable use 0. Default value is zero
- @deprecated use MPTransactionAttributes.shipping instead
- */
-@property (nonatomic, readwrite) double shippingAmount __attribute__((deprecated("use MPTransactionAttributes.shipping instead")));
-
-/**
- The total tax for a transaction. If free or non-applicable use 0. Default value is zero
- @deprecated use MPTransactionAttributes.tax instead
- */
-@property (nonatomic, readwrite) double taxAmount __attribute__((deprecated("use MPTransactionAttributes.tax instead")));
-
-/**
- The total value of a transaction, including tax and shipping. If free or non-applicable use 0. Default value is zero
- @deprecated use MPTransactionAttributes.revenue instead
- */
-@property (nonatomic, readwrite) double totalAmount __attribute__((deprecated("use MPTransactionAttributes.revenue instead")));
-
-/**
- The price of a product. If product is free or price is non-applicable use 0. Default value is zero
- @deprecated use the price property instead
- */
-@property (nonatomic, readwrite) double unitPrice __attribute__((deprecated("use the price property instead")));
-
-/**
- @deprecated use initWithName:sku:quantity:price: instead
- */
-- (nonnull instancetype)initWithName:(nonnull NSString *)name category:(nullable NSString *)category quantity:(NSInteger)quantity totalAmount:(double)totalAmount __attribute__((unavailable("use initWithName:sku:quantity:price: instead")));
-
-/**
- @deprecated use initWithName:sku:quantity:price: instead
- */
-- (nonnull instancetype)initWithName:(nonnull NSString *)name category:(nullable NSString *)category quantity:(NSInteger)quantity revenueAmount:(double)revenueAmount __attribute__((unavailable("use initWithName:sku:quantity:price: instead")));
-
 @end
 
 // Internal