Skip to content

Commit ff21d11

Browse files
avishayilavishayil
authored
Merge pull request #370 from Nightsd01/master
Fix Linker/Simulator Issue
2 parents f6ac0cd + 38cf561 commit ff21d11

File tree

5 files changed

+28
-13
lines changed

5 files changed

+28
-13
lines changed

‎android/src/main/java/com/geektime/rnonesignalandroid/RNOneSignal.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ public void setlogLevel(int logLevel, int visualLogLevel) {
182182
OneSignal.setLogLevel(logLevel, visualLogLevel);
183183
}
184184

185+
@ReactMethod
186+
public void setLocationShared(Boolean shared) {
187+
OneSignal.setLocationShared(shared);
188+
}
189+
185190
@ReactMethod
186191
public void postNotification(String contents, String data, String playerId, String otherParameters) {
187192
try {

‎index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,10 @@ export default class OneSignal {
194194
console.log("This function is not supported on iOS");
195195
}
196196
}
197-
197+
198+
static setLocationShared(shared) {
199+
RNOneSignal.setLocationShared(shared);
200+
}
198201

199202
static setSubscription(enable) {
200203
RNOneSignal.setSubscription(enable);

‎ios/RCTOneSignal.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
CA1CC868200FE3C3005B66AA /* RCTOneSignalExtensionService.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1CC867200FE3C3005B66AA /* RCTOneSignalExtensionService.m */; };
11-
CA1CC87C200FFC23005B66AA /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA1CC87B200FFC23005B66AA /* libOneSignal.a */; };
11+
CA1CCB572016BFC1005B66AA /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA1CCB562016BFC1005B66AA /* libOneSignal.a */; };
1212
FD2CCC851C772B4200B2B24E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD2CCC841C772B4200B2B24E /* SystemConfiguration.framework */; };
1313
FDB40CC41C5E4E5500CBF09B /* RCTOneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = FDB40CC31C5E4E5500CBF09B /* RCTOneSignal.m */; };
1414
/* End PBXBuildFile section */
@@ -29,8 +29,8 @@
2929
3245CDED1BFEE35C00EABF68 /* libRCTOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
3030
CA1CC866200FE3C3005B66AA /* RCTOneSignalExtensionService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTOneSignalExtensionService.h; sourceTree = "<group>"; };
3131
CA1CC867200FE3C3005B66AA /* RCTOneSignalExtensionService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTOneSignalExtensionService.m; sourceTree = "<group>"; };
32-
CA1CC87B200FFC23005B66AA /* libOneSignal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOneSignal.a; sourceTree = "<group>"; };
33-
CA1CC87D200FFC2F005B66AA /* OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignal.h; sourceTree = "<group>"; };
32+
CA1CCB552016BE92005B66AA /* OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignal.h; sourceTree = "<group>"; };
33+
CA1CCB562016BFC1005B66AA /* libOneSignal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOneSignal.a; sourceTree = "<group>"; };
3434
FD2CCC841C772B4200B2B24E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
3535
FDB40CC21C5E4E5500CBF09B /* RCTOneSignal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTOneSignal.h; sourceTree = "<group>"; };
3636
FDB40CC31C5E4E5500CBF09B /* RCTOneSignal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTOneSignal.m; sourceTree = "<group>"; };
@@ -41,7 +41,7 @@
4141
isa = PBXFrameworksBuildPhase;
4242
buildActionMask = 2147483647;
4343
files = (
44-
CA1CC87C200FFC23005B66AA /* libOneSignal.a in Frameworks */,
44+
CA1CCB572016BFC1005B66AA /* libOneSignal.a in Frameworks */,
4545
FD2CCC851C772B4200B2B24E /* SystemConfiguration.framework in Frameworks */,
4646
);
4747
runOnlyForDeploymentPostprocessing = 0;
@@ -81,8 +81,8 @@
8181
CA1CC858200FDEFC005B66AA /* Frameworks */ = {
8282
isa = PBXGroup;
8383
children = (
84-
CA1CC87D200FFC2F005B66AA /* OneSignal.h */,
85-
CA1CC87B200FFC23005B66AA /* libOneSignal.a */,
84+
CA1CCB552016BE92005B66AA /* OneSignal.h */,
85+
CA1CCB562016BFC1005B66AA /* libOneSignal.a */,
8686
);
8787
name = Frameworks;
8888
sourceTree = "<group>";
@@ -154,6 +154,7 @@
154154
3245CDFF1BFEE35C00EABF68 /* Debug */ = {
155155
isa = XCBuildConfiguration;
156156
buildSettings = {
157+
ALWAYS_SEARCH_USER_PATHS = YES;
157158
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
158159
CLANG_CXX_LIBRARY = "libc++";
159160
CLANG_ENABLE_MODULES = YES;
@@ -198,6 +199,7 @@
198199
3245CE001BFEE35C00EABF68 /* Release */ = {
199200
isa = XCBuildConfiguration;
200201
buildSettings = {
202+
ALWAYS_SEARCH_USER_PATHS = YES;
201203
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
202204
CLANG_CXX_LIBRARY = "libc++";
203205
CLANG_ENABLE_MODULES = YES;
@@ -237,23 +239,24 @@
237239
buildSettings = {
238240
FRAMEWORK_SEARCH_PATHS = (
239241
"$(inherited)",
240-
"$(PROJECT_DIR)/Frameworks",
242+
"$(PROJECT_DIR)/Frameworks/**",
241243
"$(PROJECT_DIR)/**",
244+
"$(PROJECT_DIR)",
242245
);
243246
HEADER_SEARCH_PATHS = (
244247
"$(inherited)",
245-
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
246248
"$(SRCROOT)/../../react-native/React/**",
247249
);
248250
LIBRARY_SEARCH_PATHS = (
249251
"$(inherited)",
250252
"$(PROJECT_DIR)/**",
251253
"$(PROJECT_DIR)/RCTOneSignal",
252-
"$(PROJECT_DIR)",
253254
);
255+
ONLY_ACTIVE_ARCH = NO;
254256
OTHER_LDFLAGS = "-ObjC";
255257
PRODUCT_NAME = "$(TARGET_NAME)";
256258
SKIP_INSTALL = YES;
259+
VALID_ARCHS = "arm64 armv7 armv7s";
257260
};
258261
name = Debug;
259262
};
@@ -262,23 +265,23 @@
262265
buildSettings = {
263266
FRAMEWORK_SEARCH_PATHS = (
264267
"$(inherited)",
265-
"$(PROJECT_DIR)/Frameworks",
268+
"$(PROJECT_DIR)/Frameworks/**",
266269
"$(PROJECT_DIR)/**",
270+
"$(PROJECT_DIR)",
267271
);
268272
HEADER_SEARCH_PATHS = (
269273
"$(inherited)",
270-
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
271274
"$(SRCROOT)/../../react-native/React/**",
272275
);
273276
LIBRARY_SEARCH_PATHS = (
274277
"$(inherited)",
275278
"$(PROJECT_DIR)/**",
276279
"$(PROJECT_DIR)/RCTOneSignal",
277-
"$(PROJECT_DIR)",
278280
);
279281
OTHER_LDFLAGS = "-ObjC";
280282
PRODUCT_NAME = "$(TARGET_NAME)";
281283
SKIP_INSTALL = YES;
284+
VALID_ARCHS = "arm64 armv7 armv7s";
282285
};
283286
name = Release;
284287
};

‎ios/RCTOneSignal/RCTOneSignal.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ - (void)handleRemoteNotificationsRegistered:(NSNotification *)notification {
259259
}];
260260
}
261261

262+
RCT_EXPORT_METHOD(setLocationShared:(BOOL)shared) {
263+
[OneSignal setLocationShared:shared];
264+
}
265+
262266
RCT_EXPORT_METHOD(deleteTag:(NSString *)key) {
263267
[OneSignal deleteTag:key];
264268
}

‎ios/libOneSignal.a‎

4.75 MB
Binary file not shown.

0 commit comments

Comments
 (0)