Skip to content

Commit 6590318

Browse files
authored
fix: Header imports for mParticle SDK (#22)
1 parent 83f8265 commit 6590318

5 files changed

Lines changed: 28 additions & 15 deletions

File tree

mParticle-Adobe-Media/MPIAdobe.m

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
// Be sure to apply changes to both copies of this file in the repository
22
#import "MPIAdobe.h"
33
#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
4-
#import <mParticle_Apple_SDK/mParticle.h>
4+
#import <mParticle_Apple_SDK/mParticle.h>
5+
#import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
6+
#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
7+
#import <mParticle_Apple_SDK_NoLocation/mParticle.h>
8+
#import <mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>
59
#else
6-
#import "mParticle.h"
10+
#import "mParticle.h"
11+
#import "mParticle_Apple_SDK-Swift.h"
712
#endif
813

914
NSString *const MPIAdobeErrorKey = @"MPIAdobeErrorKey";

mParticle-Adobe-Media/MPKitAdobeMedia.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#import <Foundation/Foundation.h>
22
#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
3-
#import <mParticle_Apple_SDK/mParticle.h>
3+
#import <mParticle_Apple_SDK/mParticle.h>
4+
#import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
5+
#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
6+
#import <mParticle_Apple_SDK_NoLocation/mParticle.h>
7+
#import <mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>
48
#else
5-
#import "mParticle.h"
9+
#import "mParticle.h"
10+
#import "mParticle_Apple_SDK-Swift.h"
611
#endif
712

813
#pragma mark - MPIAdobeApi

mParticle-Adobe.podspec

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ Pod::Spec.new do |s|
2121
s.ios.deployment_target = "10.0"
2222
s.tvos.deployment_target = "10.0"
2323

24-
s.ios.pod_target_xcconfig = {
25-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
26-
}
27-
s.ios.user_target_xcconfig = {
28-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
29-
}
30-
3124
s.ios.framework = 'UIKit'
3225

3326
s.subspec 'Adobe' do |ss|

mParticle-Adobe/MPIAdobe.m

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
// Be sure to apply changes to both copies of this file in the repository
22
#import "MPIAdobe.h"
33
#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
4-
#import <mParticle_Apple_SDK/mParticle.h>
4+
#import <mParticle_Apple_SDK/mParticle.h>
5+
#import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
6+
#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
7+
#import <mParticle_Apple_SDK_NoLocation/mParticle.h>
8+
#import <mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>
59
#else
6-
#import "mParticle.h"
10+
#import "mParticle.h"
11+
#import "mParticle_Apple_SDK-Swift.h"
712
#endif
813

914
NSString *const MPIAdobeErrorKey = @"MPIAdobeErrorKey";

mParticle-Adobe/MPKitAdobe.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#import <Foundation/Foundation.h>
22
#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
3-
#import <mParticle_Apple_SDK/mParticle.h>
3+
#import <mParticle_Apple_SDK/mParticle.h>
4+
#import <mParticle_Apple_SDK/mParticle_Apple_SDK-Swift.h>
5+
#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
6+
#import <mParticle_Apple_SDK_NoLocation/mParticle.h>
7+
#import <mParticle_Apple_SDK_NoLocation/mParticle_Apple_SDK-Swift.h>
48
#else
5-
#import "mParticle.h"
9+
#import "mParticle.h"
10+
#import "mParticle_Apple_SDK-Swift.h"
611
#endif
712

813
#pragma mark - MPIAdobeApi

0 commit comments

Comments
 (0)