feat: Remove Core Location from MPKitProtocol; add MPLocation types (#701)

* Replace Core Location types in MPKitProtocol with MPLocation

Remove CoreLocation from MPKitProtocol.h by introducing MPLocation,
MPLocationAccuracy, and MPLocationDistance. Kits that forward location
import CoreLocation locally and map MPLocation to provider APIs.

Update CleverTap and Localytics kit implementations accordingly.

Made-with: Cursor

* fix imports

Author: denischilik

Kits/clevertap/clevertap-7/Package.swift

@@ -9,10 +9,8 @@ let package = Package(
         .library(name: "mParticle-CleverTap", targets: ["mParticle-CleverTap"])
     ],
     dependencies: [
-        .package(
-            url: "https://github.com/mParticle/mparticle-apple-sdk",
-            branch: "workstation/9.0-Release"
-        ),
+        // Standalone kit CI/releases: use .package(url: "https://github.com/mParticle/mparticle-apple-sdk", branch: "…").
+        .package(name: "mparticle-apple-sdk", path: "../../../"),
         .package(url: "https://github.com/CleverTap/clevertap-ios-sdk", .upToNextMajor(from: "7.0.0"))
     ],
     targets: [
@@ -25,7 +23,13 @@ let package = Package(
             resources: [.process("PrivacyInfo.xcprivacy")],
             publicHeadersPath: "include",
             cSettings: [
-                .unsafeFlags(["-Wno-non-modular-include-in-framework-module"])
+                .unsafeFlags([
+                    "-Wno-non-modular-include-in-framework-module",
+                    "-Wno-error=non-modular-include-in-framework-module"
+                ])
+            ],
+            linkerSettings: [
+                .linkedFramework("CoreLocation")
             ]
         ),
         .testTarget(name: "mParticle-CleverTapTests", dependencies: ["mParticle-CleverTap"])

Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/MPKitCleverTap.m

@@ -1,4 +1,6 @@
 #import "MPKitCleverTap.h"
+@import CoreLocation;
+#import "MPLocation.h"
 
 #if defined(__has_include) && __has_include(<CleverTapSDK/CleverTap.h>)
     #import <CleverTapSDK/CleverTap.h>
@@ -131,8 +133,9 @@ - (nonnull MPKitExecStatus *)openURL:(nonnull NSURL *)url
 
 #pragma mark Location tracking
 
-- (nonnull MPKitExecStatus *)setLocation:(nonnull CLLocation *)location {
-    [CleverTap setLocation:location.coordinate];
+- (nonnull MPKitExecStatus *)setLocation:(nonnull MPLocation *)location {
+    CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(location.latitude, location.longitude);
+    [CleverTap setLocation:coordinate];
     return [self execStatus:MPKitReturnCodeSuccess];
 }
 

Kits/localytics/localytics-6/Package.swift

@@ -11,8 +11,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/mParticle/mparticle-apple-sdk",
-                 branch: "workstation/9.0-Release"),
+        // Standalone kit CI/releases: use .package(url: "https://github.com/mParticle/mparticle-apple-sdk", branch: "…").
+        .package(name: "mparticle-apple-sdk", path: "../../../"),
         .package(url: "https://github.com/localytics/Localytics-swiftpm",
                  .upToNextMajor(from: "6.0.0"))
     ],
@@ -24,7 +24,16 @@ let package = Package(
                 .product(name: "Localytics", package: "Localytics-swiftpm")
             ],
             resources: [.process("PrivacyInfo.xcprivacy")],
-            publicHeadersPath: "include"
+            publicHeadersPath: "include",
+            cSettings: [
+                .unsafeFlags([
+                    "-Wno-non-modular-include-in-framework-module",
+                    "-Wno-error=non-modular-include-in-framework-module"
+                ])
+            ],
+            linkerSettings: [
+                .linkedFramework("CoreLocation")
+            ]
         ),
         .testTarget(
             name: "mParticle-LocalyticsTests",

Kits/localytics/localytics-6/Sources/mParticle-Localytics/MPKitLocalytics.m

@@ -1,4 +1,6 @@
 #import "MPKitLocalytics.h"
+@import CoreLocation;
+#import "MPLocation.h"
 
 #if defined(__has_include) && __has_include(<Localytics/Localytics.h>)
     #import <Localytics/Localytics.h>
@@ -213,8 +215,9 @@ - (nonnull MPKitExecStatus *)userNotificationCenter:(nonnull UNUserNotificationC
     return execStatus;
 }
 
-- (MPKitExecStatus *)setLocation:(CLLocation *)location {
-    [Localytics setLocation:location.coordinate];
+- (MPKitExecStatus *)setLocation:(MPLocation *)location {
+    CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(location.latitude, location.longitude);
+    [Localytics setLocation:coordinate];
 
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:@(MPKitInstanceLocalytics) returnCode:MPKitReturnCodeSuccess];
     return execStatus;

Kits/localytics/localytics-7/Package.swift

@@ -11,8 +11,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/mParticle/mparticle-apple-sdk",
-                 branch: "workstation/9.0-Release"),
+        // Standalone kit CI/releases: use .package(url: "https://github.com/mParticle/mparticle-apple-sdk", branch: "…").
+        .package(name: "mparticle-apple-sdk", path: "../../../"),
         .package(url: "https://github.com/localytics/Localytics-swiftpm",
                  .upToNextMajor(from: "7.0.0"))
     ],
@@ -24,7 +24,16 @@ let package = Package(
                 .product(name: "Localytics", package: "Localytics-swiftpm")
             ],
             resources: [.process("PrivacyInfo.xcprivacy")],
-            publicHeadersPath: "include"
+            publicHeadersPath: "include",
+            cSettings: [
+                .unsafeFlags([
+                    "-Wno-non-modular-include-in-framework-module",
+                    "-Wno-error=non-modular-include-in-framework-module"
+                ])
+            ],
+            linkerSettings: [
+                .linkedFramework("CoreLocation")
+            ]
         ),
         .testTarget(
             name: "mParticle-LocalyticsTests",

Kits/localytics/localytics-7/Sources/mParticle-Localytics/MPKitLocalytics.m

@@ -1,4 +1,6 @@
 #import "MPKitLocalytics.h"
+@import CoreLocation;
+#import "MPLocation.h"
 
 #if defined(__has_include) && __has_include(<Localytics/Localytics.h>)
     #import <Localytics/Localytics.h>
@@ -213,8 +215,9 @@ - (nonnull MPKitExecStatus *)userNotificationCenter:(nonnull UNUserNotificationC
     return execStatus;
 }
 
-- (MPKitExecStatus *)setLocation:(CLLocation *)location {
-    [Localytics setLocation:location.coordinate];
+- (MPKitExecStatus *)setLocation:(MPLocation *)location {
+    CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(location.latitude, location.longitude);
+    [Localytics setLocation:coordinate];
 
     MPKitExecStatus *execStatus = [[MPKitExecStatus alloc] initWithSDKCode:@(MPKitInstanceLocalytics) returnCode:MPKitReturnCodeSuccess];
     return execStatus;

mParticle-Apple-SDK.xcodeproj/project.pbxproj

@@ -109,6 +109,7 @@
 		53A79D0C29CE23F700E7489F /* MPExtensionProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2829CDFB4800E7489F /* MPExtensionProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A79D0D29CE23F700E7489F /* MPIdentityApiRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3929CDFB4800E7489F /* MPIdentityApiRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A79D0F29CE23F700E7489F /* MPForwardRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2529CDFB4800E7489F /* MPForwardRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7AF100032F50000300E74801 /* MPLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF100012F50000100E74801 /* MPLocation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A79D1029CE23F700E7489F /* FilteredMParticleUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2929CDFB4800E7489F /* FilteredMParticleUser.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A79D1129CE23F700E7489F /* MPCommerceEvent+Dictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C3F29CDFB4800E7489F /* MPCommerceEvent+Dictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		53A79D1329CE23F700E7489F /* MPPromotion.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79C2B29CDFB4800E7489F /* MPPromotion.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -202,6 +203,7 @@
 		53A79D9129CE23F700E7489F /* MPConsentKitFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AF829CDFB1F00E7489F /* MPConsentKitFilter.m */; };
 		53A79D9229CE23F700E7489F /* MPKitRegister.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B4C29CDFB1F00E7489F /* MPKitRegister.m */; };
 		53A79D9329CE23F700E7489F /* MPForwardRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79ACA29CDFB1E00E7489F /* MPForwardRecord.m */; };
+		7AF100042F50000400E74801 /* MPLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AF100022F50000200E74801 /* MPLocation.m */; };
 		53A79D9429CE23F700E7489F /* MPConnector.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AAE29CDFB1E00E7489F /* MPConnector.m */; };
 		53A79D9529CE23F700E7489F /* MPBreadcrumb.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AC129CDFB1E00E7489F /* MPBreadcrumb.m */; };
 		53A79D9629CE23F700E7489F /* MPEnums.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AD029CDFB1F00E7489F /* MPEnums.m */; };
@@ -409,6 +411,8 @@
 		53A79AC829CDFB1E00E7489F /* MPBreadcrumb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPBreadcrumb.h; sourceTree = "<group>"; };
 		53A79AC929CDFB1E00E7489F /* MPUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUpload.m; sourceTree = "<group>"; };
 		53A79ACA29CDFB1E00E7489F /* MPForwardRecord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPForwardRecord.m; sourceTree = "<group>"; };
+		7AF100012F50000100E74801 /* MPLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLocation.h; sourceTree = "<group>"; };
+		7AF100022F50000200E74801 /* MPLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLocation.m; sourceTree = "<group>"; };
 		53A79ACB29CDFB1E00E7489F /* MPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMessage.h; sourceTree = "<group>"; };
 		53A79ACC29CDFB1E00E7489F /* MPSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSession.m; sourceTree = "<group>"; };
 		53A79ACD29CDFB1E00E7489F /* MPIntegrationAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIntegrationAttributes.m; sourceTree = "<group>"; };
@@ -855,6 +859,7 @@
 				53A79AC829CDFB1E00E7489F /* MPBreadcrumb.h */,
 				53A79AC929CDFB1E00E7489F /* MPUpload.m */,
 				53A79ACA29CDFB1E00E7489F /* MPForwardRecord.m */,
+				7AF100022F50000200E74801 /* MPLocation.m */,
 				53A79ACB29CDFB1E00E7489F /* MPMessage.h */,
 				53A79ACC29CDFB1E00E7489F /* MPSession.m */,
 				53A79ACD29CDFB1E00E7489F /* MPIntegrationAttributes.m */,
@@ -1012,6 +1017,7 @@
 				53A79C2429CDFB4800E7489F /* MPBaseEvent.h */,
 				D3724C182AE02AF60074CD67 /* mParticle_Apple_SDK.h */,
 				53A79C2529CDFB4800E7489F /* MPForwardRecord.h */,
+				7AF100012F50000100E74801 /* MPLocation.h */,
 				53A79C2629CDFB4800E7489F /* MPKitProtocol.h */,
 				53A79C2729CDFB4800E7489F /* mParticle.h */,
 				53A79C2829CDFB4800E7489F /* MPExtensionProtocol.h */,
@@ -1229,6 +1235,7 @@
 				53A79D0C29CE23F700E7489F /* MPExtensionProtocol.h in Headers */,
 				53A79D0D29CE23F700E7489F /* MPIdentityApiRequest.h in Headers */,
 				53A79D0F29CE23F700E7489F /* MPForwardRecord.h in Headers */,
+				7AF100032F50000300E74801 /* MPLocation.h in Headers */,
 				53A79D1029CE23F700E7489F /* FilteredMParticleUser.h in Headers */,
 				53A79D1129CE23F700E7489F /* MPCommerceEvent+Dictionary.h in Headers */,
 				53A79D1329CE23F700E7489F /* MPPromotion.h in Headers */,
@@ -1635,6 +1642,7 @@
 				729721792EAC2B750045E55C /* AppEnvironmentProvider.m in Sources */,
 				53A79D9229CE23F700E7489F /* MPKitRegister.m in Sources */,
 				53A79D9329CE23F700E7489F /* MPForwardRecord.m in Sources */,
+				7AF100042F50000400E74801 /* MPLocation.m in Sources */,
 				53A79D9429CE23F700E7489F /* MPConnector.m in Sources */,
 				53A79D9529CE23F700E7489F /* MPBreadcrumb.m in Sources */,
 				53A79D9629CE23F700E7489F /* MPEnums.m in Sources */,

mParticle-Apple-SDK/Data Model/MPLocation.m

@@ -0,0 +1,27 @@
+#import "MPLocation.h"
+
+@implementation MPLocation
+
+- (nonnull instancetype)initWithLatitude:(double)latitude
+                               longitude:(double)longitude
+                                altitude:(double)altitude
+                      horizontalAccuracy:(double)horizontalAccuracy
+                        verticalAccuracy:(double)verticalAccuracy
+                                  course:(double)course
+                                   speed:(double)speed
+                               timestamp:(nonnull NSDate *)timestamp {
+    self = [super init];
+    if (self) {
+        _latitude = latitude;
+        _longitude = longitude;
+        _altitude = altitude;
+        _horizontalAccuracy = horizontalAccuracy;
+        _verticalAccuracy = verticalAccuracy;
+        _course = course;
+        _speed = speed;
+        _timestamp = [timestamp copy];
+    }
+    return self;
+}
+
+@end

mParticle-Apple-SDK/Include/MPKitProtocol.h

@@ -4,8 +4,8 @@
 #import <Foundation/Foundation.h>
 #import "MPEnums.h"
 #import "MPForwardRecord.h"
+#import "MPLocation.h"
 #import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
 
 @class RoktEmbeddedView;
 @class RoktConfig;
@@ -74,9 +74,9 @@
 #pragma mark Location tracking
 // We shouldn't remove this methods it is part of kit interface so MParticle will never send any event and data
 // And these methods will be required when we reimplement location support as separate module
-- (nonnull MPKitExecStatus *)beginLocationTracking:(CLLocationAccuracy)accuracy minDistance:(CLLocationDistance)distanceFilter;
+- (nonnull MPKitExecStatus *)beginLocationTracking:(MPLocationAccuracy)accuracy minDistance:(MPLocationDistance)distanceFilter;
 - (nonnull MPKitExecStatus *)endLocationTracking;
-- (nonnull MPKitExecStatus *)setLocation:(nonnull CLLocation *)location;
+- (nonnull MPKitExecStatus *)setLocation:(nonnull MPLocation *)location;
 
 #pragma mark Session management
 - (nonnull MPKitExecStatus *)beginSession;

mParticle-Apple-SDK/Include/MPLocation.h

@@ -0,0 +1,49 @@
+#ifndef mParticle_Apple_SDK_MPLocation_h
+#define mParticle_Apple_SDK_MPLocation_h
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Accuracy for location tracking, in meters. Uses the same numeric values as `CLLocationAccuracy`
+ * from Core Location (for example `kCLLocationAccuracyBest` when Core Location is available).
+ */
+typedef double MPLocationAccuracy;
+
+/**
+ * Distance in meters. Same semantics as `CLLocationDistance` from Core Location.
+ */
+typedef double MPLocationDistance;
+
+/**
+ * Location snapshot passed to kits via `MPKitProtocol`. Does not depend on Core Location.
+ * Kits that need `CLLocation` or `CLLocationCoordinate2D` should import CoreLocation and convert.
+ */
+@interface MPLocation : NSObject
+
+@property (nonatomic, readonly) double latitude;
+@property (nonatomic, readonly) double longitude;
+@property (nonatomic, readonly) double altitude;
+@property (nonatomic, readonly) double horizontalAccuracy;
+@property (nonatomic, readonly) double verticalAccuracy;
+@property (nonatomic, readonly) double course;
+@property (nonatomic, readonly) double speed;
+@property (nonatomic, readonly, copy) NSDate *timestamp;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+- (nonnull instancetype)initWithLatitude:(double)latitude
+                               longitude:(double)longitude
+                                altitude:(double)altitude
+                      horizontalAccuracy:(double)horizontalAccuracy
+                        verticalAccuracy:(double)verticalAccuracy
+                                  course:(double)course
+                                   speed:(double)speed
+                               timestamp:(nonnull NSDate *)timestamp NS_DESIGNATED_INITIALIZER;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif