Skip to content

Commit 3181d25

Browse files
author
Joseph Kalash
committed
Carthage Dynamic Framework building for iOS 10 / Xcode 8 fix.
1 parent 6d2c71f commit 3181d25

File tree

13 files changed

+96
-24
lines changed

13 files changed

+96
-24
lines changed

‎iOS_SDK/Framework/OneSignal.framework/Versions/A/OneSignal‎

22 KB
Binary file not shown.

‎iOS_SDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,23 @@
1717
3E14F6341D3DB0E7008BF4E2 /* OneSignalWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E14F6331D3DB0E7008BF4E2 /* OneSignalWebView.m */; };
1818
3E2400401D4FFC39008BDE70 /* OneSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37E277041ACB940000D49C8D /* OneSignal.h */; settings = {ATTRIBUTES = (Public, ); }; };
1919
3E3414621D42F1A200EB2546 /* UIApplication+Swizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E3414611D42F1A200EB2546 /* UIApplication+Swizzling.m */; };
20+
3E464ECA1D88ED0C00DCF7E9 /* OneSignalAlertViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ECE8FDC1D39829300742055 /* OneSignalAlertViewDelegate.m */; };
21+
3E464ECB1D88ED0C00DCF7E9 /* OneSignalLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F2D1021C94D10F00DE95D0 /* OneSignalLocation.m */; };
22+
3E464ECC1D88ED0C00DCF7E9 /* OneSignalTrackIAP.m in Sources */ = {isa = PBXBuildFile; fileRef = 371FDED819F1A486001479B7 /* OneSignalTrackIAP.m */; };
23+
3E464ECD1D88ED0C00DCF7E9 /* OneSignalHTTPClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 37747FBD1914837300558FAD /* OneSignalHTTPClient.m */; };
24+
3E464ED51D88ED0C00DCF7E9 /* NSObject+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD84001D4936F9008F135D /* NSObject+Extras.m */; };
25+
3E464ED61D88ED0C00DCF7E9 /* NSString+Hash.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD84031D49416A008F135D /* NSString+Hash.m */; };
26+
3E464ED71D88ED1F00DCF7E9 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37E6B2BA19D9CAF300D0C601 /* UIKit.framework */; };
27+
3E464ED81D88ED2400DCF7E9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E08E2701D49A5C8002176DE /* SystemConfiguration.framework */; };
28+
3E464EDA1D88EE6A00DCF7E9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E464ED91D88EE6A00DCF7E9 /* Foundation.framework */; };
29+
3E464EDB1D88EF0B00DCF7E9 /* UIApplication+Swizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E3414611D42F1A200EB2546 /* UIApplication+Swizzling.m */; };
30+
3E464EDC1D88EF3C00DCF7E9 /* OneSignalWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E14F6331D3DB0E7008BF4E2 /* OneSignalWebView.m */; };
31+
3E464EDD1D88F48C00DCF7E9 /* OneSignalHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD83FD1D49364E008F135D /* OneSignalHelper.m */; };
32+
3E464EDF1D88F4A400DCF7E9 /* OneSignalReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 37668EE81AA80B7E0095D813 /* OneSignalReachability.m */; };
33+
3E464EE01D88F4B000DCF7E9 /* OneSignalJailbreakDetection.m in Sources */ = {isa = PBXBuildFile; fileRef = 3724485719F6D1DE00573B5A /* OneSignalJailbreakDetection.m */; };
34+
3E464EE11D88F4B500DCF7E9 /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 37D6E07D1B1EAE6500EC3624 /* OneSignalMobileProvision.m */; };
35+
3E464EE21D88F4B900DCF7E9 /* OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = 37E277031ACB940000D49C8D /* OneSignal.m */; };
36+
3E464EE31D88F4BF00DCF7E9 /* OneSignalTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EB26DBE1D5121D000E51BD4 /* OneSignalTracker.m */; };
2037
3E84C6231D4AE53500ED8557 /* NSObject+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EBD84001D4936F9008F135D /* NSObject+Extras.m */; };
2138
3E8998B61D37268F0066A9ED /* OneSignal.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 37E277041ACB940000D49C8D /* OneSignal.h */; };
2239
3EB26DBF1D5121D000E51BD4 /* OneSignalTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EB26DBE1D5121D000E51BD4 /* OneSignalTracker.m */; };
@@ -61,6 +78,7 @@
6178
3E2400381D4FFC31008BDE70 /* OneSignal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignal.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6279
3E24003B1D4FFC31008BDE70 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6380
3E3414611D42F1A200EB2546 /* UIApplication+Swizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIApplication+Swizzling.m"; path = "OneSignal/UIApplication+Swizzling.m"; sourceTree = "<group>"; };
81+
3E464ED91D88EE6A00DCF7E9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6482
3EB26DBD1D5121D000E51BD4 /* OneSignalTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OneSignalTracker.h; sourceTree = "<group>"; };
6583
3EB26DBE1D5121D000E51BD4 /* OneSignalTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OneSignalTracker.m; sourceTree = "<group>"; };
6684
3EBD83FC1D49364E008F135D /* OneSignalHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OneSignalHelper.h; path = OneSignal/OneSignalHelper.h; sourceTree = "<group>"; };
@@ -88,6 +106,9 @@
88106
isa = PBXFrameworksBuildPhase;
89107
buildActionMask = 2147483647;
90108
files = (
109+
3E464EDA1D88EE6A00DCF7E9 /* Foundation.framework in Frameworks */,
110+
3E464ED81D88ED2400DCF7E9 /* SystemConfiguration.framework in Frameworks */,
111+
3E464ED71D88ED1F00DCF7E9 /* UIKit.framework in Frameworks */,
91112
);
92113
runOnlyForDeploymentPostprocessing = 0;
93114
};
@@ -146,6 +167,7 @@
146167
37747F9519147D6500558FAD /* Frameworks */ = {
147168
isa = PBXGroup;
148169
children = (
170+
3E464ED91D88EE6A00DCF7E9 /* Foundation.framework */,
149171
3E08E2701D49A5C8002176DE /* SystemConfiguration.framework */,
150172
37E6B2BA19D9CAF300D0C601 /* UIKit.framework */,
151173
);
@@ -385,6 +407,20 @@
385407
isa = PBXSourcesBuildPhase;
386408
buildActionMask = 2147483647;
387409
files = (
410+
3E464EE31D88F4BF00DCF7E9 /* OneSignalTracker.m in Sources */,
411+
3E464EE21D88F4B900DCF7E9 /* OneSignal.m in Sources */,
412+
3E464EE11D88F4B500DCF7E9 /* OneSignalMobileProvision.m in Sources */,
413+
3E464EE01D88F4B000DCF7E9 /* OneSignalJailbreakDetection.m in Sources */,
414+
3E464EDF1D88F4A400DCF7E9 /* OneSignalReachability.m in Sources */,
415+
3E464EDD1D88F48C00DCF7E9 /* OneSignalHelper.m in Sources */,
416+
3E464EDC1D88EF3C00DCF7E9 /* OneSignalWebView.m in Sources */,
417+
3E464EDB1D88EF0B00DCF7E9 /* UIApplication+Swizzling.m in Sources */,
418+
3E464ECA1D88ED0C00DCF7E9 /* OneSignalAlertViewDelegate.m in Sources */,
419+
3E464ECB1D88ED0C00DCF7E9 /* OneSignalLocation.m in Sources */,
420+
3E464ECC1D88ED0C00DCF7E9 /* OneSignalTrackIAP.m in Sources */,
421+
3E464ECD1D88ED0C00DCF7E9 /* OneSignalHTTPClient.m in Sources */,
422+
3E464ED51D88ED0C00DCF7E9 /* NSObject+Extras.m in Sources */,
423+
3E464ED61D88ED0C00DCF7E9 /* NSString+Hash.m in Sources */,
388424
);
389425
runOnlyForDeploymentPostprocessing = 0;
390426
};

‎iOS_SDK/OneSignal/NSObject+Extras.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
* THE SOFTWARE.
2626
*/
2727

28+
#import <UIKit/UIKit.h>
29+
#import <Foundation/Foundation.h>
30+
2831
#import "NSObject+Extras.h"
2932

3033
@implementation NSObject (Extras)

‎iOS_SDK/OneSignal/OneSignalAlertViewDelegate.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*/
2727

2828
#import <Foundation/Foundation.h>
29+
#import <UIKit/UIKit.h>
2930

3031
@interface OneSignalAlertViewDelegate : NSObject <UIAlertViewDelegate>
3132
- (id)initWithMessageDict:(NSDictionary*)messageDict;

‎iOS_SDK/OneSignal/OneSignalHTTPClient.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* THE SOFTWARE.
2626
*/
2727

28+
#import <Foundation/Foundation.h>
2829
#import "OneSignalHTTPClient.h"
2930

3031
#define DEFAULT_PUSH_HOST @"https://onesignal.com/api/v1/"

‎iOS_SDK/OneSignal/OneSignalHelper.m‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
* THE SOFTWARE.
2626
*/
2727

28+
#import <UIKit/UIKit.h>
29+
#import <Foundation/Foundation.h>
30+
2831
#import "OneSignalReachability.h"
2932
#import "OneSignalHelper.h"
3033
#import "NSObject+Extras.h"
@@ -175,32 +178,49 @@ - (id)initWithPayload:(OSNotificationPayload *)payload displayType:(OSNotificati
175178

176179
- (NSString*)stringify {
177180

178-
NSDictionary * obj = @{@"payload" : @{@"notificationID" : self.payload.notificationID,
179-
@"sound" : self.payload.sound,
180-
@"title" : self.payload.title,
181-
@"body" : self.payload.body,
182-
@"subtitle" : self.payload.subtitle,
183-
@"launchURL" : self.payload.launchURL,
184-
@"additionalData" : self.payload.additionalData,
185-
@"actionButtons" : self.payload.actionButtons,
186-
@"rawPayload" : self.payload.rawPayload
187-
}
188-
};
181+
NSMutableDictionary * obj = [NSMutableDictionary new];
182+
[obj setObject:[NSMutableDictionary new] forKeyedSubscript:@"payload"];
183+
if(self.payload.notificationID)
184+
[obj[@"payload"] setObject:self.payload.notificationID forKeyedSubscript: @"notificationID"];
185+
186+
if(self.payload.sound)
187+
[obj[@"payload"] setObject:self.payload.sound forKeyedSubscript: @"sound"];
188+
189+
if(self.payload.title)
190+
[obj[@"payload"] setObject:self.payload.title forKeyedSubscript: @"title"];
191+
192+
if(self.payload.body)
193+
[obj[@"payload"] setObject:self.payload.body forKeyedSubscript: @"body"];
194+
195+
if(self.payload.subtitle)
196+
[obj[@"payload"] setObject:self.payload.subtitle forKeyedSubscript: @"subtitle"];
197+
198+
if(self.payload.additionalData)
199+
[obj[@"payload"] setObject:self.payload.additionalData forKeyedSubscript: @"additionalData"];
200+
201+
if(self.payload.actionButtons)
202+
[obj[@"payload"] setObject:self.payload.actionButtons forKeyedSubscript: @"actionButtons"];
203+
204+
if(self.payload.rawPayload)
205+
[obj[@"payload"] setObject:self.payload.rawPayload forKeyedSubscript: @"rawPayload"];
206+
207+
if(self.payload.launchURL)
208+
[obj[@"payload"] setObject:self.payload.launchURL forKeyedSubscript: @"launchURL"];
189209

190210
if(self.payload.contentAvailable)
191-
[obj[@"payload"] setValue:@(self.payload.contentAvailable) forKey: @"contentAvailable"];
211+
[obj[@"payload"] setObject:@(self.payload.contentAvailable) forKeyedSubscript: @"contentAvailable"];
192212

193213
if(self.payload.badge)
194-
[obj[@"payload"] setValue:@(self.payload.badge) forKey: @"badge"];
214+
[obj[@"payload"] setObject:@(self.payload.badge) forKeyedSubscript: @"badge"];
195215

196216
if(self.displayType)
197-
[obj setValue:@(self.displayType) forKey: @"displayType"];
217+
[obj setObject:@(self.displayType) forKeyedSubscript: @"displayType"];
198218

199219
if(self.shown)
200-
[obj setValue:@(self.shown) forKey: @"shown"];
220+
[obj setObject:@(self.shown) forKeyedSubscript: @"shown"];
201221

202222
if(self.silentNotification)
203-
[obj setValue:@(self.silentNotification) forKey: @"silentNotification"];
223+
[obj setObject:@(self.silentNotification) forKeyedSubscript: @"silentNotification"];
204224

205225

206226
//Convert obj into a serialized
@@ -231,14 +251,13 @@ - (NSString*)stringify {
231251
options:NSJSONReadingMutableContainers
232252
error:&jsonError];
233253

234-
235-
NSDictionary * obj = @{@"action" : @{@"actionID" : self.action.actionID
236-
},
237-
@"notification" : notifDict
238-
};
239-
254+
NSMutableDictionary* obj = [NSMutableDictionary new];
255+
NSMutableDictionary* action = [NSMutableDictionary new];
256+
[action setObject:self.action.actionID forKeyedSubscript:@"actionID"];
257+
[obj setObject:action forKeyedSubscript:@"action"];
258+
[obj setObject:notifDict forKeyedSubscript:@"notification"];
240259
if(self.action.type)
241-
[obj[@"action"] setValue:@(self.action.type) forKey: @"type"];
260+
[obj[@"action"] setObject:@(self.action.type) forKeyedSubscript: @"type"];
242261

243262
//Convert obj into a serialized
244263
NSError * err;

‎iOS_SDK/OneSignal/OneSignalLocation.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#ifndef OneSignalLocation_h
2929
#define OneSignalLocation_h
3030

31+
#import <Foundation/Foundation.h>
32+
3133
typedef struct os_location_coordinate {
3234
double latitude;
3335
double longitude;

‎iOS_SDK/OneSignal/OneSignalLocation.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
* THE SOFTWARE.
2626
*/
2727

28+
#import <UIKit/UIKit.h>
29+
2830
#import "OneSignalLocation.h"
2931
#import "OneSignalHTTPClient.h"
3032
#import "OneSignalHelper.h"
3133
#import "OneSignal.h"
32-
#import <CoreLocation/CoreLocation.h>
3334

3435
@interface OneSignal ()
3536
void onesignal_Log(ONE_S_LOG_LEVEL logLevel, NSString* message);

‎iOS_SDK/OneSignal/UIApplication+Swizzling.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
* THE SOFTWARE.
2626
*/
2727

28+
#import <UIKit/UIKit.h>
29+
2830
#import <objc/runtime.h>
2931

3032
#import "OneSignal.h"

‎iOS_SDK/OneSignalJailbreakDettection/OneSignalJailbreakDetection.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
// Renamed DTTJailbreakDetection.m to OneSignalJailbreakDetection.m to avoid conflicts with other libraries.
2424

25+
#import <UIKit/UIKit.h>
26+
2527
#import "OneSignalJailbreakDetection.h"
2628

2729
@implementation OneSignalJailbreakDetection

0 commit comments

Comments
 (0)