fix: internal module Common clashing with other Common modules in cus…

…tomers app (#328)
customerio · May 26, 2023 · 817dd56 · 817dd56
1 parent 3a9085c
commit 817dd56
Show file tree

Hide file tree

Showing 96 changed files with 108 additions and 108 deletions.
diff --git a/CustomerIOCommon.podspec b/CustomerIOCommon.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |spec|
   # spec.tvos.deployment_target = '13.0'
 
   spec.source_files  = "Sources/Common/**/*"
-  spec.module_name = "Common" # the `import X` name when using SDK in Swift files
+  spec.module_name = "CioInternalCommon" # the `import X` name when using SDK in Swift files
 end
diff --git a/Makefile b/Makefile
@@ -6,11 +6,11 @@ SHELL = /bin/sh
 #   imports - Import statements to be at the top of the generated files in case the file needs classes from other modules. Split by `-` (example: `imports=Cio-Foo-Bar`) 
 generate:
 	sourcery --sources Sources/Common --templates Sources/Templates --output Sources/Common/autogenerated 
-	sourcery --sources Sources/Tracking --templates Sources/Templates --output Sources/Tracking/autogenerated --args imports=Common
-	sourcery --sources Sources/MessagingPush --templates Sources/Templates --output Sources/MessagingPush/autogenerated --args imports=CioTracking-Common
-	sourcery --sources Sources/MessagingPushAPN --templates Sources/Templates --output Sources/MessagingPushAPN/autogenerated --args imports=CioMessagingPush-CioTracking-Common
-	sourcery --sources Sources/MessagingPushFCM --templates Sources/Templates --output Sources/MessagingPushFCM/autogenerated --args imports=CioMessagingPush-CioTracking-Common
-	sourcery --sources Sources/MessagingInApp --templates Sources/Templates --output Sources/MessagingInApp/autogenerated --args imports=CioTracking-Common-Gist 
+	sourcery --sources Sources/Tracking --templates Sources/Templates --output Sources/Tracking/autogenerated --args imports=CioInternalCommon
+	sourcery --sources Sources/MessagingPush --templates Sources/Templates --output Sources/MessagingPush/autogenerated --args imports=CioTracking-CioInternalCommon
+	sourcery --sources Sources/MessagingPushAPN --templates Sources/Templates --output Sources/MessagingPushAPN/autogenerated --args imports=CioMessagingPush-CioTracking-CioInternalCommon
+	sourcery --sources Sources/MessagingPushFCM --templates Sources/Templates --output Sources/MessagingPushFCM/autogenerated --args imports=CioMessagingPush-CioTracking-CioInternalCommon
+	sourcery --sources Sources/MessagingInApp --templates Sources/Templates --output Sources/MessagingInApp/autogenerated --args imports=CioTracking-CioInternalCommon-Gist 
 
 lint:
 	swiftlint lint --strict

diff --git a/Package.swift b/Package.swift
@@ -31,14 +31,14 @@ let package = Package(
     targets: [        
         // Common - Code used by multiple modules in the SDK project. 
         // this module is *not* exposed to the public. It's used internally. 
-        .target(name: "Common",
+        .target(name: "CioInternalCommon",
                 path: "Sources/Common"),
         .testTarget(name: "CommonTests",
                     dependencies: ["SharedTests"],
                     path: "Tests/Common"),
         // Tracking
         .target(name: "CioTracking",
-                dependencies: ["Common"],
+                dependencies: ["CioInternalCommon"],
                 path: "Sources/Tracking"),
         .testTarget(name: "TrackingTests",
                     dependencies: ["CioTracking", "SharedTests"],
@@ -54,7 +54,7 @@ let package = Package(
 
         // Messaging Push 
         .target(name: "CioMessagingPush",
-                dependencies: ["Common", "CioTracking"],
+                dependencies: ["CioTracking"],
                 path: "Sources/MessagingPush"),
         .testTarget(name: "MessagingPushTests",
                     dependencies: ["CioMessagingPush", "SharedTests"],
@@ -77,7 +77,7 @@ let package = Package(
 
         // Messaging in-app
         .target(name: "CioMessagingInApp",
-                dependencies: ["Common", "CioTracking", "Gist"],
+                dependencies: ["CioTracking", "Gist"],
                 path: "Sources/MessagingInApp"),
         .testTarget(name: "MessagingInAppTests",
                     dependencies: ["CioMessagingInApp", "SharedTests"],

diff --git a/Sources/MessagingInApp/MessagingInApp.swift b/Sources/MessagingInApp/MessagingInApp.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/MessagingInAppImplementation.swift b/Sources/MessagingInApp/MessagingInAppImplementation.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/Provider/InAppProvider.swift b/Sources/MessagingInApp/Provider/InAppProvider.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/Type/InAppEventListener.swift b/Sources/MessagingInApp/Type/InAppEventListener.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/autogenerated/AutoDependencyInjection.generated.swift b/Sources/MessagingInApp/autogenerated/AutoDependencyInjection.generated.swift
@@ -2,8 +2,8 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/autogenerated/AutoLenses.generated.swift b/Sources/MessagingInApp/autogenerated/AutoLenses.generated.swift
@@ -2,8 +2,8 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 import Gist
 

diff --git a/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift b/Sources/MessagingInApp/autogenerated/AutoMockable.generated.swift
@@ -9,8 +9,8 @@ import FoundationNetworking
 #if canImport(UserNotifications)
 import UserNotifications
 #endif
+import CioInternalCommon
 import CioTracking
-import Common
 import Gist
 
 /**

diff --git a/Sources/MessagingInApp/hooks/HookProvider.swift b/Sources/MessagingInApp/hooks/HookProvider.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 
 // sourcery: InjectRegister = "ModuleHookProvider"

diff --git a/Sources/MessagingPush/CustomerIOParsedPushPayload.swift b/Sources/MessagingPush/CustomerIOParsedPushPayload.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPush/MessagingPush+AppDelegate.swift b/Sources/MessagingPush/MessagingPush+AppDelegate.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPush/MessagingPush.swift b/Sources/MessagingPush/MessagingPush.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPush/MessagingPushImplementation.swift b/Sources/MessagingPush/MessagingPushImplementation.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 #if canImport(UserNotifications) && canImport(UIKit)
 import UIKit

diff --git a/Sources/MessagingPush/MessagingPushInstance.swift b/Sources/MessagingPush/MessagingPushInstance.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPush/RichPush/MessagingPush+RichPush.swift b/Sources/MessagingPush/RichPush/MessagingPush+RichPush.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 #if canImport(UserNotifications) && canImport(UIKit)
 import UIKit

diff --git a/Sources/MessagingPush/RichPush/RichPushRequest.swift b/Sources/MessagingPush/RichPush/RichPushRequest.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPush/RichPush/RichPushRequestHandler.swift b/Sources/MessagingPush/RichPush/RichPushRequestHandler.swift
@@ -1,5 +1,5 @@
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPush/Util/DeepLinkUtil.swift b/Sources/MessagingPush/Util/DeepLinkUtil.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 #if canImport(UIKit)
 import UIKit

diff --git a/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift b/Sources/MessagingPush/autogenerated/AutoDependencyInjection.generated.swift
@@ -2,8 +2,8 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPush/autogenerated/AutoLenses.generated.swift b/Sources/MessagingPush/autogenerated/AutoLenses.generated.swift
@@ -2,8 +2,8 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift b/Sources/MessagingPush/autogenerated/AutoMockable.generated.swift
@@ -9,8 +9,8 @@ import FoundationNetworking
 #if canImport(UserNotifications)
 import UserNotifications
 #endif
+import CioInternalCommon
 import CioTracking
-import Common
 
 /**
  ######################################################

diff --git a/Sources/MessagingPushAPN/MessagingPushAPN.swift b/Sources/MessagingPushAPN/MessagingPushAPN.swift
@@ -1,6 +1,6 @@
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPushAPN/autogenerated/AutoDependencyInjection.generated.swift b/Sources/MessagingPushAPN/autogenerated/AutoDependencyInjection.generated.swift
@@ -2,9 +2,9 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPushAPN/autogenerated/AutoLenses.generated.swift b/Sources/MessagingPushAPN/autogenerated/AutoLenses.generated.swift
@@ -2,9 +2,9 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPushAPN/autogenerated/AutoMockable.generated.swift b/Sources/MessagingPushAPN/autogenerated/AutoMockable.generated.swift
@@ -9,9 +9,9 @@ import FoundationNetworking
 #if canImport(UserNotifications)
 import UserNotifications
 #endif
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 
 /**
  ######################################################

diff --git a/Sources/MessagingPushFCM/MessagingPushFCM.swift b/Sources/MessagingPushFCM/MessagingPushFCM.swift
@@ -1,6 +1,6 @@
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 #if canImport(UserNotifications)
 import UserNotifications

diff --git a/Sources/MessagingPushFCM/autogenerated/AutoDependencyInjection.generated.swift b/Sources/MessagingPushFCM/autogenerated/AutoDependencyInjection.generated.swift
@@ -2,9 +2,9 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPushFCM/autogenerated/AutoLenses.generated.swift b/Sources/MessagingPushFCM/autogenerated/AutoLenses.generated.swift
@@ -2,9 +2,9 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 import Foundation
 
 /**

diff --git a/Sources/MessagingPushFCM/autogenerated/AutoMockable.generated.swift b/Sources/MessagingPushFCM/autogenerated/AutoMockable.generated.swift
@@ -9,9 +9,9 @@ import FoundationNetworking
 #if canImport(UserNotifications)
 import UserNotifications
 #endif
+import CioInternalCommon
 import CioMessagingPush
 import CioTracking
-import Common
 
 /**
  ######################################################

diff --git a/Sources/Tracking/Background Queue/QueueRunner.swift b/Sources/Tracking/Background Queue/QueueRunner.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 // Queue tasks for the Tracking module.

diff --git a/Sources/Tracking/CustomerIO.swift b/Sources/Tracking/CustomerIO.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 public protocol CustomerIOInstance: AutoMockable {

diff --git a/Sources/Tracking/CustomerIOError.swift b/Sources/Tracking/CustomerIOError.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 /**

diff --git a/Sources/Tracking/CustomerIOImplementation.swift b/Sources/Tracking/CustomerIOImplementation.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 /**

diff --git a/Sources/Tracking/ModuleTopLevelObject.swift b/Sources/Tracking/ModuleTopLevelObject.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 // Base class meant to be subclassed by top-level classes such as `MessagingPush` and `MessagingInApp`. Provides some

diff --git a/Sources/Tracking/Repository/CleanupRepository.swift b/Sources/Tracking/Repository/CleanupRepository.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 internal protocol CleanupRepository: AutoMockable {

diff --git a/Sources/Tracking/Service/Request/MetricRequest.swift b/Sources/Tracking/Service/Request/MetricRequest.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 // https://customer.io/docs/api/#operation/pushMetrics

diff --git a/Sources/Tracking/Type/Aliases.swift b/Sources/Tracking/Type/Aliases.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 /*
@@ -8,8 +8,8 @@ import Foundation
  in 'Common' as they are used in the 'Common' code.
  */
 
-public typealias Region = Common.Region
-public typealias CioLogLevel = Common.CioLogLevel
-public typealias CioSdkConfig = Common.SdkConfig
-public typealias CioNotificationServiceExtensionSdkConfig = Common.NotificationServiceExtensionSdkConfig
-public typealias Metric = Common.Metric
+public typealias Region = CioInternalCommon.Region
+public typealias CioLogLevel = CioInternalCommon.CioLogLevel
+public typealias CioSdkConfig = CioInternalCommon.SdkConfig
+public typealias CioNotificationServiceExtensionSdkConfig = CioInternalCommon.NotificationServiceExtensionSdkConfig
+public typealias Metric = CioInternalCommon.Metric
diff --git a/Sources/Tracking/Util/DeviceAttributesProvider.swift b/Sources/Tracking/Util/DeviceAttributesProvider.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 internal protocol DeviceAttributesProvider: AutoMockable {

diff --git a/Sources/Tracking/Util/SdkInitializedUtil.swift b/Sources/Tracking/Util/SdkInitializedUtil.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 public protocol SdkInitializedUtil: AutoMockable {

diff --git a/Sources/Tracking/autogenerated/AutoDependencyInjection.generated.swift b/Sources/Tracking/autogenerated/AutoDependencyInjection.generated.swift
@@ -2,7 +2,7 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
-import Common
+import CioInternalCommon
 import Foundation
 
 /**

diff --git a/Sources/Tracking/autogenerated/AutoLenses.generated.swift b/Sources/Tracking/autogenerated/AutoLenses.generated.swift
@@ -2,7 +2,7 @@
 // DO NOT EDIT
 // swiftlint:disable all
 
-import Common
+import CioInternalCommon
 import Foundation
 
 /**

diff --git a/Sources/Tracking/autogenerated/AutoMockable.generated.swift b/Sources/Tracking/autogenerated/AutoMockable.generated.swift
@@ -9,7 +9,7 @@ import FoundationNetworking
 #if canImport(UserNotifications)
 import UserNotifications
 #endif
-import Common
+import CioInternalCommon
 
 /**
  ######################################################

diff --git a/Sources/Tracking/hooks/TrackingModuleHookProvider.swift b/Sources/Tracking/hooks/TrackingModuleHookProvider.swift
@@ -1,4 +1,4 @@
-import Common
+import CioInternalCommon
 import Foundation
 
 class TrackingModuleHookProvider: ModuleHookProvider {