Version 2.0: MailchimpSDK.swift to Mailchimp.swift (#51)

* Renamed MailchimpSDK class to Mailchimp.

Author: jey-starratt

Changelog.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0] - 2020-11-11
+### Changed
+- Renamed MailchimpSDK class to Mailchimp to avoid ambiguity.
+
 ## [1.0] - 2020-07-20
 ### Changed
 - Bumped version to 1.0

MailchimpSDK.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'MailchimpSDK'
-  s.version          = '1.0'
+  s.version          = '2.0'
   s.summary          = 'Mailchimp SDK for iOS'
 
   s.description      = <<-DESC

MailchimpSDK/MailchimpSDK.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@
 		BFF30D7F2371FB3D005FAABC /* ContactOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF30D7E2371FB3D005FAABC /* ContactOperation.swift */; };
 		F239C3FD229F2DDF00FB85C3 /* CountryCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F239C3FC229F2DDF00FB85C3 /* CountryCode.swift */; };
 		F26745E522F89DAC00AD1E93 /* ContactTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26745E422F89DAC00AD1E93 /* ContactTests.swift */; };
-		F288D79E2289BBD7004CB563 /* MailchimpSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288D79D2289BBD7004CB563 /* MailchimpSDK.swift */; };
+		F288D79E2289BBD7004CB563 /* Mailchimp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F288D79D2289BBD7004CB563 /* Mailchimp.swift */; };
 		F2A2203122984C7600F57058 /* MergeFieldTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2A2203022984C7600F57058 /* MergeFieldTests.swift */; };
 		F2AFC4D022947FFB006C742B /* MergeField.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2AFC4CF22947FFB006C742B /* MergeField.swift */; };
 /* End PBXBuildFile section */
@@ -64,7 +64,7 @@
 		BFF30D7E2371FB3D005FAABC /* ContactOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactOperation.swift; sourceTree = "<group>"; };
 		F239C3FC229F2DDF00FB85C3 /* CountryCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryCode.swift; sourceTree = "<group>"; };
 		F26745E422F89DAC00AD1E93 /* ContactTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactTests.swift; sourceTree = "<group>"; };
-		F288D79D2289BBD7004CB563 /* MailchimpSDK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MailchimpSDK.swift; path = SDK/MailchimpSDK.swift; sourceTree = "<group>"; };
+		F288D79D2289BBD7004CB563 /* Mailchimp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Mailchimp.swift; path = SDK/Mailchimp.swift; sourceTree = "<group>"; };
 		F2A2203022984C7600F57058 /* MergeFieldTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeFieldTests.swift; sourceTree = "<group>"; };
 		F2AFC4CF22947FFB006C742B /* MergeField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeField.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -111,7 +111,7 @@
 			children = (
 				B95896B222774CA100F7509B /* Core */,
 				B95896B122774C9A00F7509B /* SDK */,
-				F288D79D2289BBD7004CB563 /* MailchimpSDK.swift */,
+				F288D79D2289BBD7004CB563 /* Mailchimp.swift */,
 				B958969A22774C0C00F7509B /* MailchimpSDK.h */,
 				B958969B22774C0C00F7509B /* Info.plist */,
 			);
@@ -336,7 +336,7 @@
 				B95896CA2280BA8700F7509B /* ContactRequest.swift in Sources */,
 				F2AFC4D022947FFB006C742B /* MergeField.swift in Sources */,
 				B95896D02281FD2D00F7509B /* PostBody.swift in Sources */,
-				F288D79E2289BBD7004CB563 /* MailchimpSDK.swift in Sources */,
+				F288D79E2289BBD7004CB563 /* Mailchimp.swift in Sources */,
 				BFD503FB2369DA4500939748 /* EventRequest.swift in Sources */,
 				B95896BD227768AB00F7509B /* APIRequest.swift in Sources */,
 				B95896B82277689F00F7509B /* URLRequest.swift in Sources */,
@@ -511,7 +511,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theRocketScienceGroup.MailchimpSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -540,7 +540,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.theRocketScienceGroup.MailchimpSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -560,7 +560,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theRocketScienceGroup.Mailchimp-SDKTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -579,7 +579,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.theRocketScienceGroup.Mailchimp-SDKTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

MailchimpSDK/MailchimpSDK/Core/Networking/PostBody.swift

@@ -1,6 +1,6 @@
 //
 //  PostBody.swift
-//  Mailchimp SDK
+//  MailchimpSDK
 //
 //  Created by Michael Patzer on 5/7/19.
 //  Copyright 2019 The Rocket Science Group LLC

…pSDK/MailchimpSDK/SDK/MailchimpSDK.swift …himpSDK/MailchimpSDK/SDK/Mailchimp.swiftMailchimpSDK/MailchimpSDK/SDK/MailchimpSDK.swift renamed to MailchimpSDK/MailchimpSDK/SDK/Mailchimp.swift MailchimpSDK/MailchimpSDK/SDK/MailchimpSDK.swift renamed to MailchimpSDK/MailchimpSDK/SDK/Mailchimp.swift

@@ -1,6 +1,6 @@
 //
-//  MailchimpSDK.swift
-//  Mailchimp SDK
+//  Mailchimp.swift
+//  MailchimpSDK
 //
 //  Created by Chez Browne on 5/13/19.
 //  Copyright 2019 The Rocket Science Group LLC
@@ -18,8 +18,7 @@
 import Foundation
 
 /// Provides an interface for storing user behavior in Mailchimp
-///
-public class MailchimpSDK: NSObject {
+public class Mailchimp: NSObject {
     public enum InitError: Error { case invalidToken(String) }
 
     /// Automatically tags contacts with basic device information when created or updated. On by default.
@@ -51,8 +50,8 @@ public class MailchimpSDK: NSObject {
         }
 
         api = AnzeeAPI(token: token)
-        MailchimpSDK.autoTagContacts = autoTagContacts
-        MailchimpSDK.debugMode = debugMode
+        Mailchimp.autoTagContacts = autoTagContacts
+        Mailchimp.debugMode = debugMode
 
         if debugMode {
             print("Mailchimp SDK Initialized. Version: \(version)")

MailchimpSDK/MailchimpSDK/SDK/Models/Contact.swift

@@ -1,6 +1,6 @@
 //
 //  Contact.swift
-//  Mailchimp SDK
+//  MailchimpSDK
 //
 //  Created by Michael Patzer on 5/6/19.
 //  Copyright 2019 The Rocket Science Group LLC

MailchimpSDK/MailchimpSDK/SDK/Models/CountryCode.swift

@@ -1,6 +1,6 @@
 //
 //  CountryCode.swift
-//  Mailchimp SDK
+//  MailchimpSDK
 //
 //  Created by Chez Browne on 5/29/19.
 //  Copyright 2019 The Rocket Science Group LLC

MailchimpSDK/MailchimpSDK/SDK/Models/MergeField.swift

@@ -1,6 +1,6 @@
 //
 //  MergeField.swift
-//  Mailchimp SDK
+//  MailchimpSDK
 //
 //  Created by Chez Browne on 5/21/19.
 //  Copyright 2019 The Rocket Science Group LLC

MailchimpSDK/MailchimpSDK/SDK/Operations/ContactOperation.swift

@@ -20,10 +20,10 @@ import Foundation
 public class ContactOperation: Operation {
     let contact: Contact
     var request: ContactRequest?
-    let result: MailchimpSDK.RequestCallback?
+    let result: Mailchimp.RequestCallback?
     public var dataTask: URLSessionDataTask?
 
-    init(_ contact: Contact, result: MailchimpSDK.RequestCallback? = nil) {
+    init(_ contact: Contact, result: Mailchimp.RequestCallback? = nil) {
         self.contact = contact
         self.result = result
     }
@@ -68,7 +68,7 @@ public class ContactOperation: Operation {
             request = ContactRequest(contact: contact) { requestResult in
                 self.result?(requestResult)
 
-                if MailchimpSDK.debugMode {
+                if Mailchimp.debugMode {
                     switch requestResult {
                     case .success:
                         print("Contact request succeeded.")
@@ -85,7 +85,7 @@ public class ContactOperation: Operation {
                 self.state = .finished
             }
 
-            self.dataTask = MailchimpSDK.api?.process(request: request!)
+            self.dataTask = Mailchimp.api?.process(request: request!)
         }
     }
 }

MailchimpSDK/MailchimpSDK/SDK/Operations/EventOperation.swift

@@ -20,10 +20,10 @@ import Foundation
 public class EventOperation: Operation {
     let event: Event
     var request: EventRequest?
-    let result: MailchimpSDK.RequestCallback?
+    let result: Mailchimp.RequestCallback?
     public var dataTask: URLSessionDataTask?
 
-    init(_ event: Event, result: MailchimpSDK.RequestCallback? = nil) {
+    init(_ event: Event, result: Mailchimp.RequestCallback? = nil) {
         self.event = event
         self.result = result
     }
@@ -68,7 +68,7 @@ public class EventOperation: Operation {
             request = EventRequest(event: event) { requestResult in
                 self.result?(requestResult)
 
-                if MailchimpSDK.debugMode {
+                if Mailchimp.debugMode {
                     switch requestResult {
                     case .success:
                         print("Event request succeeded.")
@@ -85,7 +85,7 @@ public class EventOperation: Operation {
                 self.state = .finished
             }
 
-            self.dataTask = MailchimpSDK.api?.process(request: request!)
+            self.dataTask = Mailchimp.api?.process(request: request!)
         }
     }
 }