From 2fa0f55e7ebede128b01da1ec93ad103cad89d49 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 13:51:10 -0400 Subject: [PATCH 01/16] Add mParticle-Apple-SDK-Umbrella.podspec for Swift umbrella (CocoaPods) Made-with: Cursor --- mParticle-Apple-SDK-Umbrella.podspec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 mParticle-Apple-SDK-Umbrella.podspec diff --git a/mParticle-Apple-SDK-Umbrella.podspec b/mParticle-Apple-SDK-Umbrella.podspec new file mode 100644 index 000000000..a6b61f862 --- /dev/null +++ b/mParticle-Apple-SDK-Umbrella.podspec @@ -0,0 +1,26 @@ +Pod::Spec.new do |s| + s.name = "mParticle-Apple-SDK-Umbrella" + s.version = "8.44.4" + s.summary = "Swift umbrella sources for mParticle Apple SDK (same paths as SwiftPM product `mParticle-Apple-SDK`)." + + s.description = <<-DESC + Swift-only pod packaging `MParticle/Sources/mParticle_Apple_SDK` (exports + Rokt helpers). + Depends on `mParticle-Apple-SDK` and `RoktContracts`. Intended to be versioned and tagged with the main SDK. + DESC + + s.homepage = "https://www.mparticle.com" + s.license = { :type => 'Apache 2.0', :file => 'LICENSE'} + s.author = { "mParticle" => "support@mparticle.com" } + s.source = { :git => "https://github.com/mParticle/mparticle-apple-sdk.git", :tag => "v" + s.version.to_s } + s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" + s.social_media_url = "https://twitter.com/mparticle" + s.requires_arc = true + s.module_name = 'mParticle_Apple_SDK_Umbrella' + s.ios.deployment_target = "15.6" + s.tvos.deployment_target = "15.6" + s.swift_versions = ["5.0"] + + s.source_files = 'MParticle/Sources/mParticle_Apple_SDK/**/*.swift' + s.dependency 'mParticle-Apple-SDK', s.version.to_s + s.dependency 'RoktContracts', '~> 0.1' +end From affbff5a773b8d596ed047c96fd437270d6fd4ca Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 13:55:01 -0400 Subject: [PATCH 02/16] =?UTF-8?q?ci:=20publish=20CocoaPods=20Swift=20?= =?UTF-8?q?=E2=86=92=20core=20=E2=86=92=20umbrella=20in=20release-publish?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made-with: Cursor --- .github/workflows/release-publish.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 6e8f08b5a..2ecff41ca 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -93,7 +93,13 @@ jobs: if: env.DRY_RUN != 'true' env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - run: pod trunk push mParticle-Apple-SDK.podspec --allow-warnings --synchronous + run: | + set -euo pipefail + PUSH_FLAGS=(--allow-warnings --synchronous) + # Order matters: Swift pod → core ObjC pod (depends on Swift) → umbrella (depends on core). + pod trunk push mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec "${PUSH_FLAGS[@]}" + pod trunk push mParticle-Apple-SDK.podspec "${PUSH_FLAGS[@]}" + pod trunk push mParticle-Apple-SDK-Umbrella.podspec "${PUSH_FLAGS[@]}" - name: Summary run: | From ac51d6f04a460332c8518014858d353587b4acb7 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 14:45:35 -0400 Subject: [PATCH 03/16] Align CocoaPods ObjC module imports across kits - Set mParticle-Apple-SDK pod module_name to mParticle_Apple_SDK_ObjC and mParticle-Apple-SDK-Umbrella to mParticle_Apple_SDK. - Replace __has_include mParticle_Apple_SDK/mParticle.h blocks with @import mParticle_Apple_SDK_ObjC in kit headers, sources, tests, and Obj-C SPM examples. Made-with: Cursor --- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Adjust/include/MPKitAdjust.h | 6 +----- Kits/adobe/adobe-5/Sources/mParticle-Adobe/MPIAdobe.m | 6 +----- .../adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../mParticle-Apptentive/include/MPKitApptentive.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Apptimize/include/MPKitApptimize.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../mParticle-BranchMetrics/include/MPKitBranchMetrics.h | 6 +----- .../braze-12/Sources/mParticle-Braze/include/MPKitBraze.h | 6 +----- .../Tests/mParticle-BrazeTests/mParticle_BrazeTests.m | 2 +- .../braze-13/Sources/mParticle-Braze/include/MPKitBraze.h | 6 +----- .../Tests/mParticle-BrazeTests/mParticle_BrazeTests.m | 2 +- .../braze-14/Sources/mParticle-Braze/include/MPKitBraze.h | 6 +----- .../Tests/mParticle-BrazeTests/mParticle_BrazeTests.m | 2 +- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-CleverTap/include/MPKitCleverTap.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../comscore-6/Sources/mParticle-ComScore/MPKitComScore.m | 6 +----- .../Sources/mParticle-ComScore/include/MPKitComScore.h | 6 +----- .../include/MPKitFirebaseGA4Analytics.h | 8 +------- .../include/MPKitFirebaseGA4Analytics.h | 8 +------- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 8 +------- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 8 +------- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Iterable/include/MPKitIterable.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Kochava/include/MPKitKochava.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Kochava/include/MPKitKochava.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Leanplum/include/MPKitLeanplum.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../mParticle-Localytics/include/MPKitLocalytics.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../mParticle-Localytics/include/MPKitLocalytics.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../onetrust/Sources/mParticle-OneTrust/MPKitOneTrust.m | 2 +- .../Sources/mParticle-OneTrust/include/MPKitOneTrust.h | 6 +----- .../mParticle-Optimizely/include/MPKitOptimizely.h | 6 +----- .../MPKitOptimizelyTests_tvOS.m | 6 +----- .../mParticle-OptimizelyTests/MPKitOptimizelyTests.m | 6 +----- .../mParticle-Optimizely/include/MPKitOptimizely.h | 6 +----- .../MPKitOptimizelyTests_tvOS.m | 6 +----- .../mParticle-OptimizelyTests/MPKitOptimizelyTests.m | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../radar-3/Sources/mParticle-Radar/include/MPKitRadar.h | 6 +----- Kits/rokt/rokt/Sources/mParticle-Rokt/include/MPKitRokt.h | 6 +----- .../SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Singular/include/MPKitSingular.h | 6 +----- .../Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h | 6 +----- .../Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h | 6 +----- mParticle-Apple-SDK-Umbrella.podspec | 2 +- mParticle-Apple-SDK.podspec | 2 +- 57 files changed, 57 insertions(+), 205 deletions(-) diff --git a/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 846b84c8d..1695a8edc 100644 --- a/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Adjust; @interface AppDelegate () diff --git a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h index eb373771a..b672b8d57 100644 --- a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h +++ b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitAdjustAttributionResultKey; extern NSString * _Nonnull const MPKitAdjustErrorKey; diff --git a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/MPIAdobe.m b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/MPIAdobe.m index 3dfe7400c..29c633633 100644 --- a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/MPIAdobe.m +++ b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/MPIAdobe.m @@ -1,9 +1,5 @@ #import "MPIAdobe.h" -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; NSString *const MPIAdobeErrorKey = @"MPIAdobeErrorKey"; diff --git a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h index 63be03e0e..4b00460f5 100644 --- a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h +++ b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #pragma mark - MPIAdobeApi @interface MPIAdobeApi : NSObject diff --git a/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 4fdc43831..b06f3ba4d 100644 --- a/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_AppsFlyer; @interface AppDelegate () diff --git a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h index a8dd398c9..7adba7c45 100644 --- a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h +++ b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitAppsFlyerConversionResultKey; extern NSString * _Nonnull const MPKitAppsFlyerAppOpenResultKey; diff --git a/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index c68902c11..fdc396f3b 100644 --- a/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Apptentive; @interface AppDelegate () diff --git a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h index dbdad2d1a..e95e48311 100644 --- a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h +++ b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitApptentive : NSObject diff --git a/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 3d8b5f889..9ba6cb837 100644 --- a/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Apptimize; @interface AppDelegate () diff --git a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h index 15b0ea08d..a23ab46fc 100644 --- a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h +++ b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitApptimize : NSObject diff --git a/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index a62c54bb1..a25aec34c 100644 --- a/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_BranchMetrics; @interface AppDelegate () diff --git a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h index 8d25f0fd7..2caf23fe1 100644 --- a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h +++ b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitBranchMetrics : NSObject diff --git a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h index b175feb8a..99675b79d 100644 --- a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-12/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m b/Kits/braze/braze-12/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m index ed69788e8..e3203a4ed 100644 --- a/Kits/braze/braze-12/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m +++ b/Kits/braze/braze-12/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m @@ -1,4 +1,4 @@ -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Braze; @import XCTest; @import OCMock; diff --git a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h index b175feb8a..99675b79d 100644 --- a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-13/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m b/Kits/braze/braze-13/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m index ed69788e8..e3203a4ed 100644 --- a/Kits/braze/braze-13/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m +++ b/Kits/braze/braze-13/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m @@ -1,4 +1,4 @@ -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Braze; @import XCTest; @import OCMock; diff --git a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h index b175feb8a..99675b79d 100644 --- a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-14/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m b/Kits/braze/braze-14/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m index ae045b626..774b16ace 100644 --- a/Kits/braze/braze-14/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m +++ b/Kits/braze/braze-14/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m @@ -1,4 +1,4 @@ -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Braze; @import XCTest; @import OCMock; diff --git a/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 6e48a59ca..10a40204c 100644 --- a/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_CleverTap; @interface AppDelegate () diff --git a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h index 0ae3920d6..80d7940ba 100644 --- a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h +++ b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitCleverTap : NSObject diff --git a/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index e33b07531..ef1d7ff18 100644 --- a/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_ComScore; @interface AppDelegate () diff --git a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/MPKitComScore.m b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/MPKitComScore.m index 8513ad10e..02459b749 100644 --- a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/MPKitComScore.m +++ b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/MPKitComScore.m @@ -1,9 +1,5 @@ #import "MPKitComScore.h" -#if defined(__has_include) && __has_include() -#import -#else -#import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import #else diff --git a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h index 38f89fc60..41e04721b 100644 --- a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h +++ b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitComScore : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 5c44a48e0..4879c9191 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,11 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import - #import -#else - #import "mParticle.h" - #import "mParticle_Apple_SDK.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 5c44a48e0..4879c9191 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,11 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import - #import -#else - #import "mParticle.h" - #import "mParticle_Apple_SDK.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h index 869bfa872..a632b98a1 100644 --- a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,11 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import - #import -#else - #import "mParticle.h" - #import "mParticle_Apple_SDK.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebase : NSObject diff --git a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h index 869bfa872..a632b98a1 100644 --- a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,11 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import - #import -#else - #import "mParticle.h" - #import "mParticle_Apple_SDK.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebase : NSObject diff --git a/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index ea1be5199..78bdb763c 100644 --- a/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Iterable; @interface AppDelegate () diff --git a/Kits/iterable/iterable-6/Sources/mParticle-Iterable/include/MPKitIterable.h b/Kits/iterable/iterable-6/Sources/mParticle-Iterable/include/MPKitIterable.h index f80bd9066..e5beaee60 100644 --- a/Kits/iterable/iterable-6/Sources/mParticle-Iterable/include/MPKitIterable.h +++ b/Kits/iterable/iterable-6/Sources/mParticle-Iterable/include/MPKitIterable.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #import "IterableMPHelper.h" diff --git a/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 075051a25..a5f359e8c 100644 --- a/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Kochava; @interface AppDelegate () diff --git a/Kits/kochava/kochava-9/Sources/mParticle-Kochava/include/MPKitKochava.h b/Kits/kochava/kochava-9/Sources/mParticle-Kochava/include/MPKitKochava.h index 864cafb63..aa68bfe87 100644 --- a/Kits/kochava/kochava-9/Sources/mParticle-Kochava/include/MPKitKochava.h +++ b/Kits/kochava/kochava-9/Sources/mParticle-Kochava/include/MPKitKochava.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitKochavaErrorKey; extern NSString * _Nonnull const MPKitKochavaErrorDomain; diff --git a/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 075051a25..a5f359e8c 100644 --- a/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Kochava; @interface AppDelegate () diff --git a/Kits/kochava/kochava-no-tracking-9/Sources/mParticle-Kochava/include/MPKitKochava.h b/Kits/kochava/kochava-no-tracking-9/Sources/mParticle-Kochava/include/MPKitKochava.h index 864cafb63..aa68bfe87 100644 --- a/Kits/kochava/kochava-no-tracking-9/Sources/mParticle-Kochava/include/MPKitKochava.h +++ b/Kits/kochava/kochava-no-tracking-9/Sources/mParticle-Kochava/include/MPKitKochava.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitKochavaErrorKey; extern NSString * _Nonnull const MPKitKochavaErrorDomain; diff --git a/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 2e221da2a..f4b96eb95 100644 --- a/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,6 +1,6 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Leanplum; @interface AppDelegate () diff --git a/Kits/leanplum/leanplum-6/Sources/mParticle-Leanplum/include/MPKitLeanplum.h b/Kits/leanplum/leanplum-6/Sources/mParticle-Leanplum/include/MPKitLeanplum.h index 680be1ced..614789924 100644 --- a/Kits/leanplum/leanplum-6/Sources/mParticle-Leanplum/include/MPKitLeanplum.h +++ b/Kits/leanplum/leanplum-6/Sources/mParticle-Leanplum/include/MPKitLeanplum.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitLeanplum : NSObject diff --git a/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 3f57b15e3..e41d360cb 100644 --- a/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Localytics; @interface AppDelegate () diff --git a/Kits/localytics/localytics-6/Sources/mParticle-Localytics/include/MPKitLocalytics.h b/Kits/localytics/localytics-6/Sources/mParticle-Localytics/include/MPKitLocalytics.h index ae7e38a90..e76fff072 100644 --- a/Kits/localytics/localytics-6/Sources/mParticle-Localytics/include/MPKitLocalytics.h +++ b/Kits/localytics/localytics-6/Sources/mParticle-Localytics/include/MPKitLocalytics.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitLocalytics : NSObject diff --git a/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 3f57b15e3..e41d360cb 100644 --- a/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Localytics; @interface AppDelegate () diff --git a/Kits/localytics/localytics-7/Sources/mParticle-Localytics/include/MPKitLocalytics.h b/Kits/localytics/localytics-7/Sources/mParticle-Localytics/include/MPKitLocalytics.h index ae7e38a90..e76fff072 100644 --- a/Kits/localytics/localytics-7/Sources/mParticle-Localytics/include/MPKitLocalytics.h +++ b/Kits/localytics/localytics-7/Sources/mParticle-Localytics/include/MPKitLocalytics.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitLocalytics : NSObject diff --git a/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index d37324804..e47bc86c3 100644 --- a/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_OneTrust; @interface AppDelegate () diff --git a/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/MPKitOneTrust.m b/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/MPKitOneTrust.m index 592951c43..aa2a549d6 100644 --- a/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/MPKitOneTrust.m +++ b/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/MPKitOneTrust.m @@ -5,7 +5,7 @@ #import #endif -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @implementation MPKitOneTrust diff --git a/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/include/MPKitOneTrust.h b/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/include/MPKitOneTrust.h index a41cea178..fcd736f49 100644 --- a/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/include/MPKitOneTrust.h +++ b/Kits/onetrust/onetrust/Sources/mParticle-OneTrust/include/MPKitOneTrust.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitOneTrust : NSObject diff --git a/Kits/optimizely/optimizely-4/Sources/mParticle-Optimizely/include/MPKitOptimizely.h b/Kits/optimizely/optimizely-4/Sources/mParticle-Optimizely/include/MPKitOptimizely.h index 231ad7a02..a97d4773c 100644 --- a/Kits/optimizely/optimizely-4/Sources/mParticle-Optimizely/include/MPKitOptimizely.h +++ b/Kits/optimizely/optimizely-4/Sources/mParticle-Optimizely/include/MPKitOptimizely.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @class OptimizelyClient; diff --git a/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m b/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m index 7be814d34..10d6f6123 100644 --- a/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m +++ b/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m @@ -14,11 +14,7 @@ @import Optimizely; #endif -#if defined(__has_include) && __has_include() -#import -#else -#import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; static NSString *const oiAPIKey = @"projectId"; static NSString *const oiEventInterval = @"eventInterval"; diff --git a/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m b/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m index fad98f6fe..3fc2ded24 100644 --- a/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m +++ b/Kits/optimizely/optimizely-4/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m @@ -6,11 +6,7 @@ #else @import Optimizely; #endif -#if defined(__has_include) && __has_include() -#import -#else -#import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; static NSString *const oiAPIKey = @"projectId"; static NSString *const oiEventInterval = @"eventInterval"; diff --git a/Kits/optimizely/optimizely-5/Sources/mParticle-Optimizely/include/MPKitOptimizely.h b/Kits/optimizely/optimizely-5/Sources/mParticle-Optimizely/include/MPKitOptimizely.h index 231ad7a02..a97d4773c 100644 --- a/Kits/optimizely/optimizely-5/Sources/mParticle-Optimizely/include/MPKitOptimizely.h +++ b/Kits/optimizely/optimizely-5/Sources/mParticle-Optimizely/include/MPKitOptimizely.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @class OptimizelyClient; diff --git a/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m b/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m index 7be814d34..10d6f6123 100644 --- a/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m +++ b/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests-tvOS/MPKitOptimizelyTests_tvOS.m @@ -14,11 +14,7 @@ @import Optimizely; #endif -#if defined(__has_include) && __has_include() -#import -#else -#import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; static NSString *const oiAPIKey = @"projectId"; static NSString *const oiEventInterval = @"eventInterval"; diff --git a/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m b/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m index fad98f6fe..3fc2ded24 100644 --- a/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m +++ b/Kits/optimizely/optimizely-5/Tests/mParticle-OptimizelyTests/MPKitOptimizelyTests.m @@ -6,11 +6,7 @@ #else @import Optimizely; #endif -#if defined(__has_include) && __has_include() -#import -#else -#import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; static NSString *const oiAPIKey = @"projectId"; static NSString *const oiEventInterval = @"eventInterval"; diff --git a/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index d526db702..556329f17 100644 --- a/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Radar; @interface AppDelegate () diff --git a/Kits/radar/radar-3/Sources/mParticle-Radar/include/MPKitRadar.h b/Kits/radar/radar-3/Sources/mParticle-Radar/include/MPKitRadar.h index 297ea676f..242f44b8b 100644 --- a/Kits/radar/radar-3/Sources/mParticle-Radar/include/MPKitRadar.h +++ b/Kits/radar/radar-3/Sources/mParticle-Radar/include/MPKitRadar.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitRadar : NSObject diff --git a/Kits/rokt/rokt/Sources/mParticle-Rokt/include/MPKitRokt.h b/Kits/rokt/rokt/Sources/mParticle-Rokt/include/MPKitRokt.h index 4087c6ec3..2c1c332cc 100644 --- a/Kits/rokt/rokt/Sources/mParticle-Rokt/include/MPKitRokt.h +++ b/Kits/rokt/rokt/Sources/mParticle-Rokt/include/MPKitRokt.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitRokt : NSObject diff --git a/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 5fceae7a1..6be4b7e74 100644 --- a/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK; +@import mParticle_Apple_SDK_ObjC; @import mParticle_Singular; @interface AppDelegate () diff --git a/Kits/singular/singular-12/Sources/mParticle-Singular/include/MPKitSingular.h b/Kits/singular/singular-12/Sources/mParticle-Singular/include/MPKitSingular.h index 2a9f32bb6..29c350ea8 100644 --- a/Kits/singular/singular-12/Sources/mParticle-Singular/include/MPKitSingular.h +++ b/Kits/singular/singular-12/Sources/mParticle-Singular/include/MPKitSingular.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; #define SINGULAR_DEEPLINK_KEY @"singular_deeplink" #define SINGULAR_PASSTHROUGH_KEY @"singular_passthrough" diff --git a/Kits/urbanairship/urbanairship-19/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h b/Kits/urbanairship/urbanairship-19/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h index 5f6af201b..96b24a083 100755 --- a/Kits/urbanairship/urbanairship-19/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h +++ b/Kits/urbanairship/urbanairship-19/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitUrbanAirship : NSObject diff --git a/Kits/urbanairship/urbanairship-20/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h b/Kits/urbanairship/urbanairship-20/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h index 5f6af201b..96b24a083 100755 --- a/Kits/urbanairship/urbanairship-20/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h +++ b/Kits/urbanairship/urbanairship-20/Sources/mParticle-UrbanAirship/MPKitUrbanAirship.h @@ -1,9 +1,5 @@ #import -#if defined(__has_include) && __has_include() - #import -#else - #import "mParticle.h" -#endif +@import mParticle_Apple_SDK_ObjC; @interface MPKitUrbanAirship : NSObject diff --git a/mParticle-Apple-SDK-Umbrella.podspec b/mParticle-Apple-SDK-Umbrella.podspec index a6b61f862..2ed08ce01 100644 --- a/mParticle-Apple-SDK-Umbrella.podspec +++ b/mParticle-Apple-SDK-Umbrella.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" s.social_media_url = "https://twitter.com/mparticle" s.requires_arc = true - s.module_name = 'mParticle_Apple_SDK_Umbrella' + s.module_name = 'mParticle_Apple_SDK' s.ios.deployment_target = "15.6" s.tvos.deployment_target = "15.6" s.swift_versions = ["5.0"] diff --git a/mParticle-Apple-SDK.podspec b/mParticle-Apple-SDK.podspec index eb50f7a78..d76c0a882 100644 --- a/mParticle-Apple-SDK.podspec +++ b/mParticle-Apple-SDK.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" s.social_media_url = "https://twitter.com/mparticle" s.requires_arc = true - s.module_name = 'mParticle_Apple_SDK' + s.module_name = 'mParticle_Apple_SDK_ObjC' s.ios.deployment_target = "15.6" s.tvos.deployment_target = "15.6" s.swift_versions = ["5.0"] From 8e353825a905c4e4db98000181c4787d1471f5e5 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 15:06:35 -0400 Subject: [PATCH 04/16] fix(kits): enable Clang modules for Apptimize and Adobe Xcode projects Set CLANG_ENABLE_MODULES on mParticle-Apptimize and mParticle-Adobe project configs. Replace @import mParticle_Apple_SDK_ObjC in kit public headers with explicit umbrella imports so builds succeed when modules are disabled or for Firebase/GA4 kits that need mParticle_Apple_SDK.h. Made-with: Cursor --- .../adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h | 2 +- .../adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h | 2 +- Kits/adobe/adobe-5/mParticle-Adobe.xcodeproj/project.pbxproj | 2 ++ .../Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h | 2 +- .../Sources/mParticle-Apptentive/include/MPKitApptentive.h | 2 +- .../Sources/mParticle-Apptimize/include/MPKitApptimize.h | 2 +- .../apptimize-3/mParticle-Apptimize.xcodeproj/project.pbxproj | 2 ++ .../mParticle-BranchMetrics/include/MPKitBranchMetrics.h | 2 +- .../braze-12/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../braze-13/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../braze-14/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../Sources/mParticle-CleverTap/include/MPKitCleverTap.h | 2 +- .../Sources/mParticle-ComScore/include/MPKitComScore.h | 2 +- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 3 ++- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 3 ++- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 3 ++- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 3 ++- 17 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h index b672b8d57..bb030f675 100644 --- a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h +++ b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import extern NSString * _Nonnull const MPKitAdjustAttributionResultKey; extern NSString * _Nonnull const MPKitAdjustErrorKey; diff --git a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h index 4b00460f5..43835a853 100644 --- a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h +++ b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import #pragma mark - MPIAdobeApi @interface MPIAdobeApi : NSObject diff --git a/Kits/adobe/adobe-5/mParticle-Adobe.xcodeproj/project.pbxproj b/Kits/adobe/adobe-5/mParticle-Adobe.xcodeproj/project.pbxproj index 9ca8512fe..1796ff53f 100644 --- a/Kits/adobe/adobe-5/mParticle-Adobe.xcodeproj/project.pbxproj +++ b/Kits/adobe/adobe-5/mParticle-Adobe.xcodeproj/project.pbxproj @@ -178,6 +178,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.6; SDKROOT = iphoneos; @@ -190,6 +191,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.6; SDKROOT = iphoneos; diff --git a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h index 7adba7c45..affdbf34d 100644 --- a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h +++ b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import extern NSString * _Nonnull const MPKitAppsFlyerConversionResultKey; extern NSString * _Nonnull const MPKitAppsFlyerAppOpenResultKey; diff --git a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h index e95e48311..7dd04b968 100644 --- a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h +++ b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import @interface MPKitApptentive : NSObject diff --git a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h index a23ab46fc..aed02595f 100644 --- a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h +++ b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import @interface MPKitApptimize : NSObject diff --git a/Kits/apptimize/apptimize-3/mParticle-Apptimize.xcodeproj/project.pbxproj b/Kits/apptimize/apptimize-3/mParticle-Apptimize.xcodeproj/project.pbxproj index f337cc1be..f13c04753 100644 --- a/Kits/apptimize/apptimize-3/mParticle-Apptimize.xcodeproj/project.pbxproj +++ b/Kits/apptimize/apptimize-3/mParticle-Apptimize.xcodeproj/project.pbxproj @@ -172,6 +172,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.6; SDKROOT = iphoneos; @@ -184,6 +185,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.6; SDKROOT = iphoneos; diff --git a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h index 2caf23fe1..eae0f7c25 100644 --- a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h +++ b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import @interface MPKitBranchMetrics : NSObject diff --git a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h index 99675b79d..9feb191f5 100644 --- a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h index 99675b79d..9feb191f5 100644 --- a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h index 99675b79d..9feb191f5 100644 --- a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import #if defined(__has_include) && __has_include() #import diff --git a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h index 80d7940ba..8c3a77092 100644 --- a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h +++ b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import @interface MPKitCleverTap : NSObject diff --git a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h index 41e04721b..53319afdd 100644 --- a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h +++ b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import @interface MPKitComScore : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 4879c9191..f553f68a9 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,5 +1,6 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import +#import @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 4879c9191..f553f68a9 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,5 +1,6 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import +#import @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h index a632b98a1..52cc6e548 100644 --- a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,5 +1,6 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import +#import @interface MPKitFirebase : NSObject diff --git a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h index a632b98a1..52cc6e548 100644 --- a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,5 +1,6 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import +#import @interface MPKitFirebase : NSObject From 5208351bde2a0265bd5d726795a689bf530ed845 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 15:31:08 -0400 Subject: [PATCH 05/16] fix(kits): restore @import mParticle_Apple_SDK_ObjC in public headers Revert bracket imports; keep using the ObjC module import with Clang modules enabled where configured (e.g. Apptimize, Adobe Xcode projects). Made-with: Cursor --- .../adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h | 2 +- .../adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h | 2 +- .../Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h | 2 +- .../Sources/mParticle-Apptentive/include/MPKitApptentive.h | 2 +- .../Sources/mParticle-Apptimize/include/MPKitApptimize.h | 2 +- .../mParticle-BranchMetrics/include/MPKitBranchMetrics.h | 2 +- .../braze-12/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../braze-13/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../braze-14/Sources/mParticle-Braze/include/MPKitBraze.h | 2 +- .../Sources/mParticle-CleverTap/include/MPKitCleverTap.h | 2 +- .../Sources/mParticle-ComScore/include/MPKitComScore.h | 2 +- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 3 +-- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 3 +-- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 3 +-- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 3 +-- 15 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h index bb030f675..b672b8d57 100644 --- a/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h +++ b/Kits/adjust/adjust-5/Sources/mParticle-Adjust/include/MPKitAdjust.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitAdjustAttributionResultKey; extern NSString * _Nonnull const MPKitAdjustErrorKey; diff --git a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h index 43835a853..4b00460f5 100644 --- a/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h +++ b/Kits/adobe/adobe-5/Sources/mParticle-Adobe/include/MPKitAdobe.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; #pragma mark - MPIAdobeApi @interface MPIAdobeApi : NSObject diff --git a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h index affdbf34d..7adba7c45 100644 --- a/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h +++ b/Kits/appsflyer/appsflyer-6/Sources/mParticle-AppsFlyer/include/MPKitAppsFlyer.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; extern NSString * _Nonnull const MPKitAppsFlyerConversionResultKey; extern NSString * _Nonnull const MPKitAppsFlyerAppOpenResultKey; diff --git a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h index 7dd04b968..e95e48311 100644 --- a/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h +++ b/Kits/apptentive/apptentive-6/Sources/mParticle-Apptentive/include/MPKitApptentive.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitApptentive : NSObject diff --git a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h index aed02595f..a23ab46fc 100644 --- a/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h +++ b/Kits/apptimize/apptimize-3/Sources/mParticle-Apptimize/include/MPKitApptimize.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitApptimize : NSObject diff --git a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h index eae0f7c25..2caf23fe1 100644 --- a/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h +++ b/Kits/branchmetrics/branchmetrics-3/Sources/mParticle-BranchMetrics/include/MPKitBranchMetrics.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitBranchMetrics : NSObject diff --git a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h index 9feb191f5..99675b79d 100644 --- a/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-12/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h index 9feb191f5..99675b79d 100644 --- a/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-13/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h index 9feb191f5..99675b79d 100644 --- a/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h +++ b/Kits/braze/braze-14/Sources/mParticle-Braze/include/MPKitBraze.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; #if defined(__has_include) && __has_include() #import diff --git a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h index 8c3a77092..80d7940ba 100644 --- a/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h +++ b/Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/include/MPKitCleverTap.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitCleverTap : NSObject diff --git a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h index 53319afdd..41e04721b 100644 --- a/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h +++ b/Kits/comscore/comscore-6/Sources/mParticle-ComScore/include/MPKitComScore.h @@ -1,5 +1,5 @@ #import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitComScore : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index f553f68a9..4879c9191 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,6 +1,5 @@ #import -#import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index f553f68a9..4879c9191 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,6 +1,5 @@ #import -#import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h index 52cc6e548..a632b98a1 100644 --- a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,6 +1,5 @@ #import -#import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebase : NSObject diff --git a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h index 52cc6e548..a632b98a1 100644 --- a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,6 +1,5 @@ #import -#import -#import +@import mParticle_Apple_SDK_ObjC; @interface MPKitFirebase : NSObject From 41a1722f6c63e883936037a9e2881fc3f073b596 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 16:12:33 -0400 Subject: [PATCH 06/16] update imports in example apps --- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 3 +-- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/ViewController.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- 30 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 1695a8edc..3a89d2e4a 100644 --- a/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/adjust/adjust-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Adjust; @interface AppDelegate () diff --git a/Kits/adobe/adobe-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/adobe/adobe-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 2421e1cd1..550ee3493 100644 --- a/Kits/adobe/adobe-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/adobe/adobe-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitAdobe.h" @interface AppDelegate () diff --git a/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index b06f3ba4d..09001f56f 100644 --- a/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/appsflyer/appsflyer-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_AppsFlyer; @interface AppDelegate () diff --git a/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index fdc396f3b..38801efaf 100644 --- a/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/apptentive/apptentive-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Apptentive; @interface AppDelegate () diff --git a/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 9ba6cb837..34bba6bf3 100644 --- a/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/apptimize/apptimize-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Apptimize; @interface AppDelegate () diff --git a/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index a25aec34c..2fe8f775e 100644 --- a/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/branchmetrics/branchmetrics-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_BranchMetrics; @interface AppDelegate () diff --git a/Kits/braze/braze-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/braze/braze-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 108749ea9..9a5903a80 100644 --- a/Kits/braze/braze-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/braze/braze-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitBraze.h" @interface AppDelegate () diff --git a/Kits/braze/braze-13/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/braze/braze-13/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 108749ea9..9a5903a80 100644 --- a/Kits/braze/braze-13/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/braze/braze-13/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitBraze.h" @interface AppDelegate () diff --git a/Kits/braze/braze-14/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/braze/braze-14/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 108749ea9..9a5903a80 100644 --- a/Kits/braze/braze-14/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/braze/braze-14/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitBraze.h" @interface AppDelegate () diff --git a/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 10a40204c..3e87d5baa 100644 --- a/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/clevertap/clevertap-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_CleverTap; @interface AppDelegate () diff --git a/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index ef1d7ff18..afe067ba5 100644 --- a/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/comscore/comscore-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_ComScore; @interface AppDelegate () diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index f8169c3fc..0392a9402 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitFirebaseGA4Analytics.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index f8169c3fc..0392a9402 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitFirebaseGA4Analytics.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index acd066f07..cf55b175c 100644 --- a/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitFirebase.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index acd066f07..cf55b175c 100644 --- a/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitFirebase.h" @interface AppDelegate () diff --git a/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 78bdb763c..eb278463d 100644 --- a/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/iterable/iterable-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Iterable; @interface AppDelegate () diff --git a/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index a5f359e8c..566c17e3c 100644 --- a/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/kochava/kochava-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Kochava; @interface AppDelegate () diff --git a/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index a5f359e8c..566c17e3c 100644 --- a/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/kochava/kochava-no-tracking-9/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Kochava; @interface AppDelegate () diff --git a/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index f4b96eb95..2d83d1157 100644 --- a/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/leanplum/leanplum-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,6 +1,5 @@ #import "AppDelegate.h" - -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Leanplum; @interface AppDelegate () diff --git a/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index e41d360cb..175e30fff 100644 --- a/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/localytics/localytics-6/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Localytics; @interface AppDelegate () diff --git a/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index e41d360cb..175e30fff 100644 --- a/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/localytics/localytics-7/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Localytics; @interface AppDelegate () diff --git a/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index e47bc86c3..0b4c634b9 100644 --- a/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/onetrust/onetrust/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_OneTrust; @interface AppDelegate () diff --git a/Kits/optimizely/optimizely-4/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/optimizely/optimizely-4/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index fb7604e46..5d2b7d9db 100644 --- a/Kits/optimizely/optimizely-4/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/optimizely/optimizely-4/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import @interface AppDelegate () diff --git a/Kits/optimizely/optimizely-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/optimizely/optimizely-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index fb7604e46..5d2b7d9db 100644 --- a/Kits/optimizely/optimizely-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/optimizely/optimizely-5/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import @interface AppDelegate () diff --git a/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 556329f17..6daa310d3 100644 --- a/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/radar/radar-3/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Radar; @interface AppDelegate () diff --git a/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 1c82e4bff..587250c01 100644 --- a/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @interface AppDelegate () diff --git a/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/ViewController.m b/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/ViewController.m index d204a6bda..2067aa42e 100644 --- a/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/ViewController.m +++ b/Kits/rokt/rokt/Example/SPM-Objc-Example/SPM-Objc-Example/ViewController.m @@ -1,5 +1,5 @@ #import "ViewController.h" -@import mParticle_Apple_SDK_ObjC; +#import @import RoktContracts; @interface ViewController () diff --git a/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 6be4b7e74..e67640407 100644 --- a/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/singular/singular-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -@import mParticle_Apple_SDK_ObjC; +#import @import mParticle_Singular; @interface AppDelegate () diff --git a/Kits/urbanairship/urbanairship-19/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/urbanairship/urbanairship-19/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 9dde343bf..e6eb2d076 100644 --- a/Kits/urbanairship/urbanairship-19/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/urbanairship/urbanairship-19/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitUrbanAirship.h" @interface AppDelegate () diff --git a/Kits/urbanairship/urbanairship-20/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/urbanairship/urbanairship-20/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 9dde343bf..e6eb2d076 100644 --- a/Kits/urbanairship/urbanairship-20/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/urbanairship/urbanairship-20/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import "mParticle.h" +#import #import "MPKitUrbanAirship.h" @interface AppDelegate () From 6399f02de835314ab276aca8f9859901c77e8582 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 16:30:20 -0400 Subject: [PATCH 07/16] update pod lint --- .github/workflows/build-and-lint.yml | 2 +- .github/workflows/build-kits.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index be9b20fa1..027718bb9 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -38,7 +38,7 @@ jobs: run: find . -path '*.podspec' -exec perl -pi -e 's/.+\.social_media_url.+//' {} \; - name: Lint with CocoaPods - run: pod lib lint --include-podspecs=mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec + run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ - name: Undo twitter change to podspec run: git checkout *.podspec diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index 246a1f94f..846067d11 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -50,7 +50,7 @@ jobs: pod lib lint "${{ matrix.kit.podspec }}" \ --allow-warnings \ --skip-import-validation \ - --include-podspecs="{mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ + --include-podspecs="{mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ && break [ $attempt -lt 3 ] && echo "Attempt $attempt failed, retrying in 60s..." && sleep 60 || exit 1 done From 6321d0caf6b5034444108a82b7031f81558dd636 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 16:33:25 -0400 Subject: [PATCH 08/16] update release scripts --- .github/workflows/release-draft.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index e79f733a6..8226c6b9b 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -71,6 +71,7 @@ jobs: run: | PODSPECS=( "mParticle-Apple-SDK.podspec" + "mParticle-Apple-SDK-Umbrella.podspec" "mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec" ) while IFS= read -r spec; do @@ -119,7 +120,6 @@ jobs: kits-path: Kits # --- Commit, push, and create PR --- - - name: Commit version changes run: | git add \ @@ -127,6 +127,7 @@ jobs: VERSION \ Framework/Info.plist \ mParticle-Apple-SDK.podspec \ + mParticle-Apple-SDK-Umbrella.podspec \ mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec \ mParticle-Apple-SDK/MPIConstants.m \ IntegrationTests/wiremock-recordings/mappings/*.json \ From efce0db026ccdae5a75f0d2456c19ef90db49858 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 16:37:41 -0400 Subject: [PATCH 09/16] update workflows --- .github/workflows/build-and-lint.yml | 2 +- .github/workflows/build-kits.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index 027718bb9..14e48ab7f 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -38,7 +38,7 @@ jobs: run: find . -path '*.podspec' -exec perl -pi -e 's/.+\.social_media_url.+//' {} \; - name: Lint with CocoaPods - run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ + run: pod lib lint --include-podspecs="{mParticle-Apple-SDK.podspec,,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ - name: Undo twitter change to podspec run: git checkout *.podspec diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index 846067d11..a457b670b 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -50,7 +50,7 @@ jobs: pod lib lint "${{ matrix.kit.podspec }}" \ --allow-warnings \ --skip-import-validation \ - --include-podspecs="{mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ + --include-podspecs="{mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ && break [ $attempt -lt 3 ] && echo "Attempt $attempt failed, retrying in 60s..." && sleep 60 || exit 1 done From 26ac7dce3b1aeeadf0ab910b52911ebeb3fb75c7 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 16:39:18 -0400 Subject: [PATCH 10/16] reorder dependencies --- .github/workflows/build-and-lint.yml | 2 +- .github/workflows/build-kits.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index 14e48ab7f..206d5486e 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -38,7 +38,7 @@ jobs: run: find . -path '*.podspec' -exec perl -pi -e 's/.+\.social_media_url.+//' {} \; - name: Lint with CocoaPods - run: pod lib lint --include-podspecs="{mParticle-Apple-SDK.podspec,,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ + run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" \ - name: Undo twitter change to podspec run: git checkout *.podspec diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index a457b670b..6ddbd8b15 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -50,7 +50,7 @@ jobs: pod lib lint "${{ matrix.kit.podspec }}" \ --allow-warnings \ --skip-import-validation \ - --include-podspecs="{mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec,mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec}" \ + --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" \ && break [ $attempt -lt 3 ] && echo "Attempt $attempt failed, retrying in 60s..." && sleep 60 || exit 1 done From ea47e748f897bb1c605d8c10920fdcf4fee29dad Mon Sep 17 00:00:00 2001 From: Nickolas Dimitrakas Date: Wed, 8 Apr 2026 17:06:42 -0400 Subject: [PATCH 11/16] fix(ci): Bump Umbrella podspec version in pod lint CI step Made-with: Cursor --- .github/workflows/build-kits.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index 6ddbd8b15..564646061 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -44,6 +44,7 @@ jobs: # is published to CocoaPods CDN. sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK.podspec sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec + sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK-Umbrella.podspec echo "Linting: ${{ matrix.kit.podspec }}" for attempt in 1 2 3; do From 1a27d2e84aea1578780f823d9a7196fa4837b8c4 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 17:21:35 -0400 Subject: [PATCH 12/16] revert headers --- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 2 +- .../Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m | 2 +- .../Sources/mParticle-Firebase/include/MPKitFirebase.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 4879c9191..5b96bc296 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-11/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import "mParticle.h" @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index 0392a9402..f8169c3fc 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import +#import "mParticle.h" #import "MPKitFirebaseGA4Analytics.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h index 4879c9191..5b96bc296 100644 --- a/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h +++ b/Kits/google-analytics-firebase-ga4/firebase-ga4-12/Sources/mParticle-FirebaseGA4/include/MPKitFirebaseGA4Analytics.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import "mParticle.h" @interface MPKitFirebaseGA4Analytics : NSObject diff --git a/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index cf55b175c..acd066f07 100644 --- a/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase/firebase-11/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import +#import "mParticle.h" #import "MPKitFirebase.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h index a632b98a1..616f3ccbb 100644 --- a/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-11/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import "mParticle.h" @interface MPKitFirebase : NSObject diff --git a/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m b/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m index cf55b175c..acd066f07 100644 --- a/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m +++ b/Kits/google-analytics-firebase/firebase-12/Example/SPM-Objc-Example/SPM-Objc-Example/AppDelegate.m @@ -1,5 +1,5 @@ #import "AppDelegate.h" -#import +#import "mParticle.h" #import "MPKitFirebase.h" @interface AppDelegate () diff --git a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h index a632b98a1..616f3ccbb 100644 --- a/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h +++ b/Kits/google-analytics-firebase/firebase-12/Sources/mParticle-Firebase/include/MPKitFirebase.h @@ -1,5 +1,5 @@ #import -@import mParticle_Apple_SDK_ObjC; +#import "mParticle.h" @interface MPKitFirebase : NSObject From d1d61dfcc5c013ff2621a66fdda57dbb84da73a2 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Wed, 8 Apr 2026 17:49:50 -0400 Subject: [PATCH 13/16] try to fix rokt lint --- Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift b/Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift index 306dcf4e2..b8a55e499 100644 --- a/Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift +++ b/Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift @@ -14,7 +14,7 @@ import SwiftUI import Rokt_Widget import RoktContracts -import mParticle_Apple_SDK +import mParticle_Apple_SDK_ObjC import mParticle_Rokt @available(iOS 15, *) From b1c007e448560534400dd65654a8a27060b1a6ab Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Thu, 9 Apr 2026 09:07:57 -0400 Subject: [PATCH 14/16] remove trailing \ --- .github/workflows/build-and-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index 206d5486e..7c0e8b4f0 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -38,7 +38,7 @@ jobs: run: find . -path '*.podspec' -exec perl -pi -e 's/.+\.social_media_url.+//' {} \; - name: Lint with CocoaPods - run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" \ + run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" - name: Undo twitter change to podspec run: git checkout *.podspec From 26719cf5f3d5ac57af2329681c9dd38606ceffb5 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Thu, 9 Apr 2026 10:06:42 -0400 Subject: [PATCH 15/16] feat(cocoapods): rename podspecs to umbrella + ObjC core - mParticle-Apple-SDK.podspec: Swift umbrella (public pod name unchanged) - mParticle-Apple-SDK-ObjC.podspec: ObjC core (replaces former root podspec) - Remove mParticle-Apple-SDK-Umbrella.podspec - Update release workflows, release.sh, AGENTS.md, and Xcode project refs Made-with: Cursor --- .github/workflows/build-and-lint.yml | 2 +- .github/workflows/build-kits.yml | 4 +- .github/workflows/release-draft.yml | 4 +- .github/workflows/release-publish.yml | 4 +- AGENTS.md | 7 +-- Scripts/release.sh | 6 ++- mParticle-Apple-SDK-ObjC.podspec | 48 +++++++++++++++++++ mParticle-Apple-SDK-Umbrella.podspec | 26 ---------- mParticle-Apple-SDK.podspec | 37 +++----------- mParticle-Apple-SDK.xcodeproj/project.pbxproj | 8 ++-- 10 files changed, 74 insertions(+), 72 deletions(-) create mode 100644 mParticle-Apple-SDK-ObjC.podspec delete mode 100644 mParticle-Apple-SDK-Umbrella.podspec diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml index 7c0e8b4f0..7674b5562 100644 --- a/.github/workflows/build-and-lint.yml +++ b/.github/workflows/build-and-lint.yml @@ -38,7 +38,7 @@ jobs: run: find . -path '*.podspec' -exec perl -pi -e 's/.+\.social_media_url.+//' {} \; - name: Lint with CocoaPods - run: pod lib lint --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" + run: pod lib lint mParticle-Apple-SDK.podspec --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK-ObjC.podspec,mParticle-Apple-SDK.podspec}" - name: Undo twitter change to podspec run: git checkout *.podspec diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index 564646061..5ff3a2067 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -43,15 +43,15 @@ jobs: # TODO: Remove the sed bumps and --include-podspecs once mParticle-Apple-SDK v9.0 # is published to CocoaPods CDN. sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK.podspec + sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK-ObjC.podspec sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec - sed -i '' 's/s\.version[[:space:]]*=.*/s.version = "9.0.0"/' mParticle-Apple-SDK-Umbrella.podspec echo "Linting: ${{ matrix.kit.podspec }}" for attempt in 1 2 3; do pod lib lint "${{ matrix.kit.podspec }}" \ --allow-warnings \ --skip-import-validation \ - --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK.podspec,mParticle-Apple-SDK-Umbrella.podspec}" \ + --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK-ObjC.podspec,mParticle-Apple-SDK.podspec}" \ && break [ $attempt -lt 3 ] && echo "Attempt $attempt failed, retrying in 60s..." && sleep 60 || exit 1 done diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index 8226c6b9b..371b43581 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -71,7 +71,7 @@ jobs: run: | PODSPECS=( "mParticle-Apple-SDK.podspec" - "mParticle-Apple-SDK-Umbrella.podspec" + "mParticle-Apple-SDK-ObjC.podspec" "mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec" ) while IFS= read -r spec; do @@ -127,7 +127,7 @@ jobs: VERSION \ Framework/Info.plist \ mParticle-Apple-SDK.podspec \ - mParticle-Apple-SDK-Umbrella.podspec \ + mParticle-Apple-SDK-ObjC.podspec \ mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec \ mParticle-Apple-SDK/MPIConstants.m \ IntegrationTests/wiremock-recordings/mappings/*.json \ diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 2ecff41ca..973a24cc6 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -96,10 +96,10 @@ jobs: run: | set -euo pipefail PUSH_FLAGS=(--allow-warnings --synchronous) - # Order matters: Swift pod → core ObjC pod (depends on Swift) → umbrella (depends on core). + # Order matters: Swift pod → ObjC core (depends on Swift) → umbrella Swift (depends on ObjC). pod trunk push mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec "${PUSH_FLAGS[@]}" + pod trunk push mParticle-Apple-SDK-ObjC.podspec "${PUSH_FLAGS[@]}" pod trunk push mParticle-Apple-SDK.podspec "${PUSH_FLAGS[@]}" - pod trunk push mParticle-Apple-SDK-Umbrella.podspec "${PUSH_FLAGS[@]}" - name: Summary run: | diff --git a/AGENTS.md b/AGENTS.md index 047d621f7..007b40ce6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -43,7 +43,7 @@ You are a senior iOS SDK engineer specializing in customer data platform (CDP) S - Build: via Xcode scheme or `xcodebuild`. - Run unit tests: `Rokt_WidgetTests/` or via Xcode (Command + U). - Lint: `trunk check` (primary enforcement tool). - - Pod lint: `pod lib lint mParticle-Apple-SDK.podspec`. + - Pod lint: `pod lib lint mParticle-Apple-SDK.podspec --include-podspecs="{mParticle-Apple-SDK-Swift/mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK-ObjC.podspec,mParticle-Apple-SDK.podspec}"` (same as CI). - Size report: Check binary size impact via CI workflow. - Always validate changes with the full sequence in "Code style, quality, and validation" below before proposing or committing. @@ -104,7 +104,8 @@ You are a senior iOS SDK engineer specializing in customer data platform (CDP) S - `Scripts/` — Build, release, and utility scripts. - `release.sh`, `xcframework.sh`, `carthage.sh`, `check_coverage.sh`. - `Package.swift` — SPM manifest (swift-tools-version 5.5). -- `mParticle-Apple-SDK.podspec` — CocoaPods spec (v8.41.1). +- `mParticle-Apple-SDK.podspec` — CocoaPods umbrella (Swift sources; consumer-facing pod name `mParticle-Apple-SDK`). +- `mParticle-Apple-SDK-ObjC.podspec` — CocoaPods ObjC core (`mParticle-Apple-SDK-ObjC`). - `PrivacyInfo.xcprivacy` — iOS privacy manifest. - `ARCHITECTURE.md` — Architecture documentation with sequence diagrams. - `CHANGELOG.md` — Release notes (extensive). @@ -125,7 +126,7 @@ You are a senior iOS SDK engineer specializing in customer data platform (CDP) S 1. `trunk check` — to lint, format-check, and catch style/quality issues. 2. Build the SDK: via Xcode or `xcodebuild` for both iOS and tvOS. 3. Run unit tests: both Objective-C and Swift test suites in `UnitTests/`. - 4. `pod lib lint mParticle-Apple-SDK.podspec` — verify CocoaPods spec is valid. + 4. `pod lib lint` with `--include-podspecs` for Swift + ObjC + umbrella (see Quick Start) — verify CocoaPods specs. 5. If change affects code, assets, or dependencies: check coverage via `Scripts/check_coverage.sh`. - Only propose / commit changes if all steps pass cleanly. - If `trunk check` suggests auto-fixes, apply them first and re-validate. diff --git a/Scripts/release.sh b/Scripts/release.sh index 8dd4ccde4..1e7949af8 100755 --- a/Scripts/release.sh +++ b/Scripts/release.sh @@ -17,8 +17,9 @@ sed -i '' 's/NSString \*const kMParticleSDKVersion = @".*/NSString *const kMPart jq --indent 3 '. += {'"\"$VERSION\""': "'"https://github.com/mParticle/mparticle-apple-sdk/releases/download/$PREFIXED_VERSION/mParticle_Apple_SDK.framework.zip?alt=https://github.com/mParticle/mparticle-apple-sdk/releases/download/$PREFIXED_VERSION/mParticle_Apple_SDK.xcframework.zip"'"}' mParticle_Apple_SDK.json >tmp.json mv tmp.json mParticle_Apple_SDK.json -# Update CocoaPods podspec file -sed -i '' 's/\(^ s.version[^=]*= \).*/\1"'"$VERSION"'"/' mParticle-Apple-SDK.podspec +# Update CocoaPods podspec files +sed -i '' 's/\(^ s.version[^=]*= \).*/\1"'"${VERSION}"'"/' mParticle-Apple-SDK.podspec +sed -i '' 's/\(^ s.version[^=]*= \).*/\1"'"${VERSION}"'"/' mParticle-Apple-SDK-ObjC.podspec # Update SDK version in integration test mappings ./Scripts/update_mapping_versions.sh "${VERSION}" @@ -51,6 +52,7 @@ sed -i '' 's/\(^let mParticle_Apple_SDK_NoLocation_Checksum[^=]*= \).*/\1"'"$SDK git add Package.swift git add mParticle-Apple-SDK.podspec +git add mParticle-Apple-SDK-ObjC.podspec git add mParticle_Apple_SDK.json git add CHANGELOG.md git add mParticle-Apple-SDK/MPIConstants.m diff --git a/mParticle-Apple-SDK-ObjC.podspec b/mParticle-Apple-SDK-ObjC.podspec new file mode 100644 index 000000000..ce5475a98 --- /dev/null +++ b/mParticle-Apple-SDK-ObjC.podspec @@ -0,0 +1,48 @@ +Pod::Spec.new do |s| + s.name = "mParticle-Apple-SDK-ObjC" + s.version = "8.44.4" + s.summary = "mParticle Apple SDK." + + s.description = <<-DESC + This is the mParticle Apple SDK for iOS and tvOS. + + At mParticle our mission is straightforward: make it really easy for apps and app services to connect and allow you to take ownership of your 1st party data. + Like most app owners, you end up implementing and maintaining numerous SDKs ranging from analytics, attribution, push notification, remarketing, + monetization, etc. However, embedding multiple 3rd party libraries creates a number of unintended consequences and hidden costs. + + The mParticle platform addresses all these problems. We support an ever growing number of integrations with services and SDKs, including developer + tools, analytics, attribution, messaging, advertising, and more. mParticle has been designed to be the central hub connecting all these services – + read the [docs](https://docs.mparticle.com/developers/sdk/ios/) or contact us at to learn more. + DESC + + s.homepage = "https://www.mparticle.com" + s.license = { :type => 'Apache 2.0', :file => 'LICENSE'} + s.author = { "mParticle" => "support@mparticle.com" } + s.source = { :git => "https://github.com/mParticle/mparticle-apple-sdk.git", :tag => "v" + s.version.to_s } + s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" + s.social_media_url = "https://twitter.com/mparticle" + s.requires_arc = true + s.module_name = 'mParticle_Apple_SDK_ObjC' + s.ios.deployment_target = "15.6" + s.tvos.deployment_target = "15.6" + s.swift_versions = ["5.0"] + + s.default_subspecs = 'mParticle' + + s.subspec 'mParticle' do |mp| + mp.public_header_files = 'mParticle-Apple-SDK/Include/*.h' + mp.preserve_paths = 'mParticle-Apple-SDK', 'mParticle-Apple-SDK/**', 'mParticle-Apple-SDK/**/*' + mp.source_files = 'mParticle-Apple-SDK/**/*.{h,m}' + mp.resource_bundles = {'mParticle-Privacy' => ['PrivacyInfo.xcprivacy']} + mp.dependency 'mParticle-Apple-SDK-Swift' + mp.dependency 'RoktContracts', '~> 0.1' + end + + s.subspec 'AppExtension' do |ext| + ext.public_header_files = 'mParticle-Apple-SDK/Include/*.h' + ext.preserve_paths = 'mParticle-Apple-SDK', 'mParticle-Apple-SDK/**', 'mParticle-Apple-SDK/**/*' + ext.source_files = 'mParticle-Apple-SDK/**/*.{h,m}' + ext.dependency 'mParticle-Apple-SDK-Swift' + ext.dependency 'RoktContracts', '~> 0.1' + end +end diff --git a/mParticle-Apple-SDK-Umbrella.podspec b/mParticle-Apple-SDK-Umbrella.podspec deleted file mode 100644 index 2ed08ce01..000000000 --- a/mParticle-Apple-SDK-Umbrella.podspec +++ /dev/null @@ -1,26 +0,0 @@ -Pod::Spec.new do |s| - s.name = "mParticle-Apple-SDK-Umbrella" - s.version = "8.44.4" - s.summary = "Swift umbrella sources for mParticle Apple SDK (same paths as SwiftPM product `mParticle-Apple-SDK`)." - - s.description = <<-DESC - Swift-only pod packaging `MParticle/Sources/mParticle_Apple_SDK` (exports + Rokt helpers). - Depends on `mParticle-Apple-SDK` and `RoktContracts`. Intended to be versioned and tagged with the main SDK. - DESC - - s.homepage = "https://www.mparticle.com" - s.license = { :type => 'Apache 2.0', :file => 'LICENSE'} - s.author = { "mParticle" => "support@mparticle.com" } - s.source = { :git => "https://github.com/mParticle/mparticle-apple-sdk.git", :tag => "v" + s.version.to_s } - s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" - s.social_media_url = "https://twitter.com/mparticle" - s.requires_arc = true - s.module_name = 'mParticle_Apple_SDK' - s.ios.deployment_target = "15.6" - s.tvos.deployment_target = "15.6" - s.swift_versions = ["5.0"] - - s.source_files = 'MParticle/Sources/mParticle_Apple_SDK/**/*.swift' - s.dependency 'mParticle-Apple-SDK', s.version.to_s - s.dependency 'RoktContracts', '~> 0.1' -end diff --git a/mParticle-Apple-SDK.podspec b/mParticle-Apple-SDK.podspec index d76c0a882..bed6ed374 100644 --- a/mParticle-Apple-SDK.podspec +++ b/mParticle-Apple-SDK.podspec @@ -1,18 +1,11 @@ Pod::Spec.new do |s| s.name = "mParticle-Apple-SDK" s.version = "8.44.4" - s.summary = "mParticle Apple SDK." + s.summary = "Swift umbrella sources for mParticle Apple SDK (same paths as SwiftPM product `mParticle-Apple-SDK`)." s.description = <<-DESC - This is the mParticle Apple SDK for iOS and tvOS. - - At mParticle our mission is straightforward: make it really easy for apps and app services to connect and allow you to take ownership of your 1st party data. - Like most app owners, you end up implementing and maintaining numerous SDKs ranging from analytics, attribution, push notification, remarketing, - monetization, etc. However, embedding multiple 3rd party libraries creates a number of unintended consequences and hidden costs. - - The mParticle platform addresses all these problems. We support an ever growing number of integrations with services and SDKs, including developer - tools, analytics, attribution, messaging, advertising, and more. mParticle has been designed to be the central hub connecting all these services – - read the [docs](https://docs.mparticle.com/developers/sdk/ios/) or contact us at to learn more. + Swift-only pod packaging `MParticle/Sources/mParticle_Apple_SDK` (exports + Rokt helpers). + Depends on `mParticle-Apple-SDK-ObjC` and `RoktContracts`. Intended to be versioned and tagged with the main SDK. DESC s.homepage = "https://www.mparticle.com" @@ -22,28 +15,12 @@ Pod::Spec.new do |s| s.documentation_url = "https://docs.mparticle.com/developers/sdk/ios/" s.social_media_url = "https://twitter.com/mparticle" s.requires_arc = true - s.module_name = 'mParticle_Apple_SDK_ObjC' + s.module_name = 'mParticle_Apple_SDK' s.ios.deployment_target = "15.6" s.tvos.deployment_target = "15.6" s.swift_versions = ["5.0"] - s.default_subspecs = 'mParticle' - - s.subspec 'mParticle' do |mp| - mp.public_header_files = 'mParticle-Apple-SDK/Include/*.h' - mp.preserve_paths = 'mParticle-Apple-SDK', 'mParticle-Apple-SDK/**', 'mParticle-Apple-SDK/**/*' - mp.source_files = 'mParticle-Apple-SDK/**/*.{h,m}' - mp.resource_bundles = {'mParticle-Privacy' => ['PrivacyInfo.xcprivacy']} - mp.dependency 'mParticle-Apple-SDK-Swift' - mp.dependency 'RoktContracts', '~> 0.1' - end - - s.subspec 'AppExtension' do |ext| - ext.public_header_files = 'mParticle-Apple-SDK/Include/*.h' - ext.preserve_paths = 'mParticle-Apple-SDK', 'mParticle-Apple-SDK/**', 'mParticle-Apple-SDK/**/*' - ext.source_files = 'mParticle-Apple-SDK/**/*.{h,m}' - ext.dependency 'mParticle-Apple-SDK-Swift' - ext.dependency 'RoktContracts', '~> 0.1' - end + s.source_files = 'MParticle/Sources/mParticle_Apple_SDK/**/*.swift' + s.dependency 'mParticle-Apple-SDK-ObjC', s.version.to_s + s.dependency 'RoktContracts', '~> 0.1' end - diff --git a/mParticle-Apple-SDK.xcodeproj/project.pbxproj b/mParticle-Apple-SDK.xcodeproj/project.pbxproj index 491e686ca..39cbf0b88 100644 --- a/mParticle-Apple-SDK.xcodeproj/project.pbxproj +++ b/mParticle-Apple-SDK.xcodeproj/project.pbxproj @@ -109,7 +109,6 @@ 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, ); }; }; @@ -203,7 +202,6 @@ 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 */; }; @@ -269,6 +267,8 @@ 72E8785A2F2AB23600F355F2 /* MPSideloadedKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 72E878592F2AB23600F355F2 /* MPSideloadedKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 72E8785C2F2AB29A00F355F2 /* MPSideloadedKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 72E8785B2F2AB29A00F355F2 /* MPSideloadedKit.m */; }; 72FEBD182E86FE3B00B8341F /* MPIdentityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72FEBD162E86FE2D00B8341F /* MPIdentityTests.swift */; }; + 7AF100032F50000300E74801 /* MPLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF100012F50000100E74801 /* MPLocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 7AF100042F50000400E74801 /* MPLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AF100022F50000200E74801 /* MPLocation.m */; }; 7E0387812DB913D2003B7D5E /* MPRokt.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E03877F2DB913D2003B7D5E /* MPRokt.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7E0387822DB913D2003B7D5E /* MPRokt.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0387802DB913D2003B7D5E /* MPRokt.m */; }; 7E15B2062D94617900C1FF3E /* MPRoktTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E15B2052D94617900C1FF3E /* MPRoktTests.m */; }; @@ -411,8 +411,6 @@ 53A79AC829CDFB1E00E7489F /* MPBreadcrumb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPBreadcrumb.h; sourceTree = ""; }; 53A79AC929CDFB1E00E7489F /* MPUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUpload.m; sourceTree = ""; }; 53A79ACA29CDFB1E00E7489F /* MPForwardRecord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPForwardRecord.m; sourceTree = ""; }; - 7AF100012F50000100E74801 /* MPLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLocation.h; sourceTree = ""; }; - 7AF100022F50000200E74801 /* MPLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLocation.m; sourceTree = ""; }; 53A79ACB29CDFB1E00E7489F /* MPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMessage.h; sourceTree = ""; }; 53A79ACC29CDFB1E00E7489F /* MPSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSession.m; sourceTree = ""; }; 53A79ACD29CDFB1E00E7489F /* MPIntegrationAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIntegrationAttributes.m; sourceTree = ""; }; @@ -601,6 +599,8 @@ 72E878592F2AB23600F355F2 /* MPSideloadedKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPSideloadedKit.h; sourceTree = ""; }; 72E8785B2F2AB29A00F355F2 /* MPSideloadedKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPSideloadedKit.m; sourceTree = ""; }; 72FEBD162E86FE2D00B8341F /* MPIdentityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPIdentityTests.swift; sourceTree = ""; }; + 7AF100012F50000100E74801 /* MPLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLocation.h; sourceTree = ""; }; + 7AF100022F50000200E74801 /* MPLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLocation.m; sourceTree = ""; }; 7E03877F2DB913D2003B7D5E /* MPRokt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPRokt.h; sourceTree = ""; }; 7E0387802DB913D2003B7D5E /* MPRokt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPRokt.m; sourceTree = ""; }; 7E15B2052D94617900C1FF3E /* MPRoktTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPRoktTests.m; sourceTree = ""; }; From b0d6b9b3502d05f4d0e2d9f902b77b1b6a6f2a5d Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Thu, 9 Apr 2026 12:48:54 -0400 Subject: [PATCH 16/16] remove app extention --- mParticle-Apple-SDK-ObjC.podspec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mParticle-Apple-SDK-ObjC.podspec b/mParticle-Apple-SDK-ObjC.podspec index ce5475a98..6c1021da8 100644 --- a/mParticle-Apple-SDK-ObjC.podspec +++ b/mParticle-Apple-SDK-ObjC.podspec @@ -37,12 +37,4 @@ Pod::Spec.new do |s| mp.dependency 'mParticle-Apple-SDK-Swift' mp.dependency 'RoktContracts', '~> 0.1' end - - s.subspec 'AppExtension' do |ext| - ext.public_header_files = 'mParticle-Apple-SDK/Include/*.h' - ext.preserve_paths = 'mParticle-Apple-SDK', 'mParticle-Apple-SDK/**', 'mParticle-Apple-SDK/**/*' - ext.source_files = 'mParticle-Apple-SDK/**/*.{h,m}' - ext.dependency 'mParticle-Apple-SDK-Swift' - ext.dependency 'RoktContracts', '~> 0.1' - end end