Skip to content

Commit 822aab1

Browse files
committed
Fix: simulator build issue
1 parent fe4af38 commit 822aab1

File tree

8 files changed

+1761
-1668
lines changed

8 files changed

+1761
-1668
lines changed

RNNearbee.podspec

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ Pod::Spec.new do |s|
2525
s.dependency 'React-RCTNetwork'
2626
s.dependency 'React-RCTText'
2727

28-
s.dependency 'NearBee', '~>0.4.6'
28+
s.dependency 'NearBee', '~>0.4.7'
29+
s.pod_target_xcconfig = {
30+
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
31+
}
32+
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
2933
end

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-nearbee",
3-
"version": "3.3.7",
3+
"version": "3.3.8",
44
"description": "NearBee SDK for your react native applications",
55
"main": "index.js",
66
"scripts": {

sample_app/ios/Podfile.lock

+15-9
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ PODS:
2020
- DoubleConversion
2121
- glog
2222
- glog (0.3.5)
23-
- NearBee (0.4.4):
23+
- NearBee (0.4.7):
2424
- EddystoneScanner
25-
- Socket.IO-Client-Swift
25+
- Socket.IO-Client-Swift (= 15.2.0)
2626
- Permission-BluetoothPeripheral (2.1.5):
2727
- RNPermissions
2828
- Permission-LocationAlways (2.1.5):
@@ -259,8 +259,8 @@ PODS:
259259
- React-jsi (= 0.63.2)
260260
- RNCAsyncStorage (1.6.2):
261261
- React
262-
- RNNearBee (3.3.3):
263-
- NearBee (~> 0.4.4)
262+
- RNNearBee (3.3.7):
263+
- NearBee (~> 0.4.7)
264264
- React-Core
265265
- React-cxxreact
266266
- React-RCTAnimation
@@ -270,11 +270,13 @@ PODS:
270270
- React-RCTText
271271
- RNPermissions (2.1.5):
272272
- React
273-
- RNVectorIcons (6.6.0):
273+
- RNVectorIcons (6.7.0):
274274
- React
275275
- Socket.IO-Client-Swift (15.2.0):
276276
- Starscream (~> 3.1)
277277
- Starscream (3.1.1)
278+
- toolbar-android (0.1.0-rc.2):
279+
- React
278280
- Yoga (1.14.0)
279281

280282
DEPENDENCIES:
@@ -314,6 +316,7 @@ DEPENDENCIES:
314316
- RNNearBee (from `../node_modules/react-native-nearbee`)
315317
- RNPermissions (from `../node_modules/react-native-permissions`)
316318
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
319+
- "toolbar-android (from `../node_modules/@react-native-community/toolbar-android`)"
317320
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
318321

319322
SPEC REPOS:
@@ -391,6 +394,8 @@ EXTERNAL SOURCES:
391394
:path: "../node_modules/react-native-permissions"
392395
RNVectorIcons:
393396
:path: "../node_modules/react-native-vector-icons"
397+
toolbar-android:
398+
:path: "../node_modules/@react-native-community/toolbar-android"
394399
Yoga:
395400
:path: "../node_modules/react-native/ReactCommon/yoga"
396401

@@ -402,7 +407,7 @@ SPEC CHECKSUMS:
402407
FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
403408
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
404409
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
405-
NearBee: 92421cda11a9643a2c0a893f5e1c419a1d986b29
410+
NearBee: 26c7f8da872f5fc5b134971a6e4af70d57eeb03d
406411
Permission-BluetoothPeripheral: 4663a8373072abfe3099c44cb06bf10b0c16c110
407412
Permission-LocationAlways: 155e6251b757b380f6354737cae8e8d59c472495
408413
Permission-LocationWhenInUse: 3624cf08c12c6019926aba3054efee7f4f8ee91e
@@ -428,13 +433,14 @@ SPEC CHECKSUMS:
428433
React-RCTVibration: 4d2e726957f4087449739b595f107c0d4b6c2d2d
429434
ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
430435
RNCAsyncStorage: 60a80e72d95bf02a01cace55d3697d9724f0d77f
431-
RNNearBee: b34b525439f4fb11da98f86b4e80a003333fa19e
436+
RNNearBee: 30ba964f31a5617abb7161d54922c5c5bb44c756
432437
RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
433-
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
438+
RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d
434439
Socket.IO-Client-Swift: 1e3e3a1f09f3312a167f0d781eb2f383d477357c
435440
Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
441+
toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff
436442
Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
437443

438444
PODFILE CHECKSUM: e9708e49f78e85df5df3d93402724c482fac8d66
439445

440-
COCOAPODS: 1.9.0
446+
COCOAPODS: 1.10.1

sample_app/ios/assets/app.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "sample_app",
3+
"displayName": "sample_app"
4+
}
186 KB
Loading

sample_app/ios/sample_app.xcodeproj/project.pbxproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
1212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
14+
BE497E11261EDDB500D57BAC /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = BE497E10261EDDB500D57BAC /* main.jsbundle */; };
1415
BEFA55E7246A7E8400D540C7 /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEFA55E6246A7E8400D540C7 /* Dummy.swift */; };
1516
FA26281DD122F4F58A6B0A70 /* libPods-sample_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C7BC70C302ABC83CDAD7264 /* libPods-sample_app.a */; };
1617
/* End PBXBuildFile section */
@@ -30,6 +31,7 @@
3031
8C7BC70C302ABC83CDAD7264 /* libPods-sample_app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sample_app.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3132
BE0F87F92523136200493E20 /* RNNearBee.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RNNearBee.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3233
BE0F87FD2523137100493E20 /* NearBee.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NearBee.framework; path = Pods/NearBee/NearBee/NearBee.framework; sourceTree = "<group>"; };
34+
BE497E10261EDDB500D57BAC /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = ../../../../main.jsbundle; sourceTree = "<group>"; };
3335
BE57A5B2252DF09E00EA5FDD /* libEddystoneScanner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libEddystoneScanner.a; sourceTree = BUILT_PRODUCTS_DIR; };
3436
BE57A5B4252DF0A600EA5FDD /* libRNNearBee.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNNearBee.a; sourceTree = BUILT_PRODUCTS_DIR; };
3537
BEFA55DD2468469B00D540C7 /* libRNNearBee.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNNearBee.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -108,6 +110,7 @@
108110
83CBB9F61A601CBA00E9B192 = {
109111
isa = PBXGroup;
110112
children = (
113+
BE497E10261EDDB500D57BAC /* main.jsbundle */,
111114
BEFA55E6246A7E8400D540C7 /* Dummy.swift */,
112115
13B07FAE1A68108700A75B9A /* sample_app */,
113116
832341AE1AAA6A7D00B99B32 /* Libraries */,
@@ -205,6 +208,7 @@
205208
isa = PBXResourcesBuildPhase;
206209
buildActionMask = 2147483647;
207210
files = (
211+
BE497E11261EDDB500D57BAC /* main.jsbundle in Resources */,
208212
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
209213
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
210214
);
@@ -225,7 +229,7 @@
225229
);
226230
runOnlyForDeploymentPostprocessing = 0;
227231
shellPath = /bin/sh;
228-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
232+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
229233
};
230234
35C645F59AE793A33E8BD6E6 /* [CP] Copy Pods Resources */ = {
231235
isa = PBXShellScriptBuildPhase;
@@ -473,6 +477,7 @@
473477
GCC_WARN_UNUSED_VARIABLE = YES;
474478
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
475479
MTL_ENABLE_DEBUG_INFO = NO;
480+
ONLY_ACTIVE_ARCH = YES;
476481
SDKROOT = iphoneos;
477482
VALIDATE_PRODUCT = YES;
478483
};

sample_app/ios/sample_app.xcworkspace/contents.xcworkspacedata

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)