Merge pull request #39 from Beaconstac/ios-fix

Fix: simulator build issue

RNNearbee.podspec

@@ -25,5 +25,9 @@ Pod::Spec.new do |s|
     s.dependency 'React-RCTNetwork'
     s.dependency 'React-RCTText'
 
-  s.dependency 'NearBee', '~>0.4.6'
+  s.dependency 'NearBee', '~>0.4.7'
+  s.pod_target_xcconfig = {
+      'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
+    }
+    s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nearbee",
-  "version": "3.3.7",
+  "version": "3.3.8",
   "description": "NearBee SDK for your react native applications",
   "main": "index.js",
   "scripts": {

sample_app/ios/Podfile.lock

@@ -20,9 +20,9 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - NearBee (0.4.4):
+  - NearBee (0.4.7):
     - EddystoneScanner
-    - Socket.IO-Client-Swift
+    - Socket.IO-Client-Swift (= 15.2.0)
   - Permission-BluetoothPeripheral (2.1.5):
     - RNPermissions
   - Permission-LocationAlways (2.1.5):
@@ -259,8 +259,8 @@ PODS:
     - React-jsi (= 0.63.2)
   - RNCAsyncStorage (1.6.2):
     - React
-  - RNNearBee (3.3.3):
-    - NearBee (~> 0.4.4)
+  - RNNearBee (3.3.7):
+    - NearBee (~> 0.4.7)
     - React-Core
     - React-cxxreact
     - React-RCTAnimation
@@ -270,11 +270,13 @@ PODS:
     - React-RCTText
   - RNPermissions (2.1.5):
     - React
-  - RNVectorIcons (6.6.0):
+  - RNVectorIcons (6.7.0):
     - React
   - Socket.IO-Client-Swift (15.2.0):
     - Starscream (~> 3.1)
   - Starscream (3.1.1)
+  - toolbar-android (0.1.0-rc.2):
+    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -314,6 +316,7 @@ DEPENDENCIES:
   - RNNearBee (from `../node_modules/react-native-nearbee`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
+  - "toolbar-android (from `../node_modules/@react-native-community/toolbar-android`)"
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -391,6 +394,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-permissions"
   RNVectorIcons:
     :path: "../node_modules/react-native-vector-icons"
+  toolbar-android:
+    :path: "../node_modules/@react-native-community/toolbar-android"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -402,7 +407,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  NearBee: 92421cda11a9643a2c0a893f5e1c419a1d986b29
+  NearBee: 26c7f8da872f5fc5b134971a6e4af70d57eeb03d
   Permission-BluetoothPeripheral: 4663a8373072abfe3099c44cb06bf10b0c16c110
   Permission-LocationAlways: 155e6251b757b380f6354737cae8e8d59c472495
   Permission-LocationWhenInUse: 3624cf08c12c6019926aba3054efee7f4f8ee91e
@@ -428,13 +433,14 @@ SPEC CHECKSUMS:
   React-RCTVibration: 4d2e726957f4087449739b595f107c0d4b6c2d2d
   ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
   RNCAsyncStorage: 60a80e72d95bf02a01cace55d3697d9724f0d77f
-  RNNearBee: b34b525439f4fb11da98f86b4e80a003333fa19e
+  RNNearBee: 30ba964f31a5617abb7161d54922c5c5bb44c756
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
-  RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
+  RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d
   Socket.IO-Client-Swift: 1e3e3a1f09f3312a167f0d781eb2f383d477357c
   Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
+  toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff
   Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
 
 PODFILE CHECKSUM: e9708e49f78e85df5df3d93402724c482fac8d66
 
-COCOAPODS: 1.9.0
+COCOAPODS: 1.10.1

sample_app/ios/assets/app.json

@@ -0,0 +1,4 @@
+{
+  "name": "sample_app",
+  "displayName": "sample_app"
+}

sample_app/ios/sample_app.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		BE497E11261EDDB500D57BAC /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = BE497E10261EDDB500D57BAC /* main.jsbundle */; };
 		BEFA55E7246A7E8400D540C7 /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEFA55E6246A7E8400D540C7 /* Dummy.swift */; };
 		FA26281DD122F4F58A6B0A70 /* libPods-sample_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C7BC70C302ABC83CDAD7264 /* libPods-sample_app.a */; };
 /* End PBXBuildFile section */
@@ -30,6 +31,7 @@
 		8C7BC70C302ABC83CDAD7264 /* libPods-sample_app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-sample_app.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE0F87F92523136200493E20 /* RNNearBee.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RNNearBee.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE0F87FD2523137100493E20 /* NearBee.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NearBee.framework; path = Pods/NearBee/NearBee/NearBee.framework; sourceTree = "<group>"; };
+		BE497E10261EDDB500D57BAC /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = ../../../../main.jsbundle; sourceTree = "<group>"; };
 		BE57A5B2252DF09E00EA5FDD /* libEddystoneScanner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libEddystoneScanner.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE57A5B4252DF0A600EA5FDD /* libRNNearBee.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNNearBee.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		BEFA55DD2468469B00D540C7 /* libRNNearBee.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNNearBee.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -108,6 +110,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				BE497E10261EDDB500D57BAC /* main.jsbundle */,
 				BEFA55E6246A7E8400D540C7 /* Dummy.swift */,
 				13B07FAE1A68108700A75B9A /* sample_app */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
@@ -205,6 +208,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BE497E11261EDDB500D57BAC /* main.jsbundle in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 			);
@@ -225,7 +229,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		35C645F59AE793A33E8BD6E6 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -473,6 +477,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};