Merge branch 'rel/10.3.0' into fix/setVideoRecordingFloatingButtonPosition

Author: Ali Abdelfattah

.circleci/config.yml

@@ -42,7 +42,7 @@ jobs:
   test_sample:
     working_directory: ~/project
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:lts
     steps:
       - checkout:
           path: ~/project
@@ -91,35 +91,38 @@ jobs:
 
   test_ios:
     macos:
-      xcode: "10.2.0"
-    working_directory: ~/project/InstabugSample/ios
+      xcode: "12.3.0"
+    working_directory: ~/project/InstabugSample
     environment:
       FL_OUTPUT_DIR: output
     steps:
       - checkout:
           path: ~/project
       - run:
-          name: Install node_modules
-          command: cd .. && yarn
+          name: Install CocoaPods
+          command: sudo gem install cocoapods
       - run:
-          name: Fetch CocoaPods Specs
-          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh  | bash -s cf
+          name: Install node_modules
+          command: yarn
       - run:
-          name: Install CocoaPods
-          command: pod install
+          name: Install Pods
+          command: cd ios && pod install
       - run:
           name: Build and run tests
-          command: xcodebuild    -workspace InstabugSample.xcworkspace    -scheme InstabugSample    -sdk iphonesimulator    -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2'    test | xcpretty
+          command: cd ios && xcodebuild  -allowProvisioningUpdates   -workspace InstabugSample.xcworkspace    -scheme InstabugSample    -sdk iphonesimulator    -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max,OS=14.3'    test | xcpretty
 
   e2e_ios:
     macos:
-      xcode: "10.2.0"
+      xcode: "12.3.0"
     working_directory: ~/project/InstabugSample
     environment:
       FL_OUTPUT_DIR: output
     steps:
       - checkout:
           path: ~/project
+      - run:
+          name: Install CocoaPods
+          command: sudo gem install cocoapods
       - run:
           name: Install React Native CLI
           command: npm install -g react-native-cli
@@ -133,10 +136,7 @@ jobs:
           name: Install Node Packages
           command: yarn
       - run:
-          name: Fetch CocoaPods Specs
-          command: cd ios && curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh  | bash -s cf
-      - run:
-          name: Install CocoaPods
+          name: Install Pods
           command: cd ios && pod install
       - run:
           name: Detox - Build Release App

CHANGELOG.md

@@ -1,6 +1,6 @@
 describe('Example', () => {
   beforeEach(async () => {
-    await device.reloadReactNative();
+    await device.launchApp();
   });
 
   it('should have welcome screen', async () => {

InstabugSample/__e2e__/firstTest.spec.js

@@ -20,7 +20,6 @@
 		BAD36E2F22F19788007F5E74 /* InstabugFeatureRequestsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E2E22F19788007F5E74 /* InstabugFeatureRequestsTests.m */; };
 		BAD36E3122F19973007F5E74 /* InstabugRepliesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E3022F19973007F5E74 /* InstabugRepliesTests.m */; };
 		BAD36E3322F19B1B007F5E74 /* InstabugSurveysTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BAD36E3222F19B1B007F5E74 /* InstabugSurveysTests.m */; };
-		C006102922E9EBCA00EDC852 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C006102822E9EBCA00EDC852 /* libOCMock.a */; };
 		C0AB369625854A6100F1E21E /* InstabugAPMTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C0AB369525854A6100F1E21E /* InstabugAPMTests.m */; };
 /* End PBXBuildFile section */
 
@@ -63,7 +62,6 @@
 		BAD36E2E22F19788007F5E74 /* InstabugFeatureRequestsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugFeatureRequestsTests.m; sourceTree = "<group>"; };
 		BAD36E3022F19973007F5E74 /* InstabugRepliesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugRepliesTests.m; sourceTree = "<group>"; };
 		BAD36E3222F19B1B007F5E74 /* InstabugSurveysTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugSurveysTests.m; sourceTree = "<group>"; };
-		C006102822E9EBCA00EDC852 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = usr/lib/libOCMock.a; sourceTree = "<group>"; };
 		C0AB369525854A6100F1E21E /* InstabugAPMTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugAPMTests.m; sourceTree = "<group>"; };
 		C74E4010ABE7AFC7DB5E79DC /* Pods-InstabugSampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InstabugSampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-InstabugSampleTests/Pods-InstabugSampleTests.debug.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -74,7 +72,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C006102922E9EBCA00EDC852 /* libOCMock.a in Frameworks */,
 				39B75062AA5F42B6E4C8E3C7 /* libPods-InstabugSampleTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -132,7 +129,6 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				C006102822E9EBCA00EDC852 /* libOCMock.a */,
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				A0EF1FBF0176E13B30EA2D29 /* libPods-InstabugSample.a */,
 				7A03A15E2685C1231729CA8B /* libPods-InstabugSampleTests.a */,
@@ -221,6 +217,7 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				21BA34F4E1FA153B4E4FB519 /* Upload Sourcemap */,
 				A4F6B49E8609FD1652D0F43E /* [CP] Embed Pods Frameworks */,
+				FE69A7F8F5762FFBE1CCA9AC /* [CP-User] [instabug-reactnative] Upload Sourcemap */,
 			);
 			buildRules = (
 			);
@@ -402,6 +399,16 @@
 			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		FE69A7F8F5762FFBE1CCA9AC /* [CP-User] [instabug-reactnative] Upload Sourcemap */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "bash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

InstabugSample/ios/InstabugSample.xcodeproj/project.pbxproj

@@ -31,6 +31,7 @@ target 'InstabugSample' do
   target 'InstabugSampleTests' do
     inherit! :search_paths
     # Pods for testing
+    pod 'OCMock'
   end
 
   use_native_modules!

InstabugSample/ios/Podfile

@@ -17,7 +17,7 @@
     "@babel/runtime": "^7.5.4",
     "@react-native-community/eslint-config": "^0.0.5",
     "babel-jest": "^24.8.0",
-    "detox": "^13.2.0",
+    "detox": "^18.12.0",
     "eslint": "^6.0.1",
     "jest": "^24.8.0",
     "metro-react-native-babel-preset": "^0.55.0",
@@ -37,13 +37,13 @@
         "binaryPath": "ios/build/Build/Products/Debug-iphonesimulator/InstabugSample.app",
         "build": "xcodebuild -workspace ios/InstabugSample.xcworkspace -scheme InstabugSample -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build",
         "type": "ios.simulator",
-        "name": "iPhone X"
+        "name": "iPhone 12"
       },
       "ios.sim.release": {
         "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/InstabugSample.app",
         "build": "xcodebuild -workspace ios/InstabugSample.xcworkspace -scheme InstabugSample -configuration Release -sdk iphonesimulator -derivedDataPath ios/build",
         "type": "ios.simulator",
-        "name": "iPhone X"
+        "name": "iPhone 12"
       },
       "android.emu.debug": {
         "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",

InstabugSample/ios/usr/lib/libOCMock.a

@@ -15,15 +15,6 @@
 project_path = Dir.glob("#{current_path}/ios/*.xcodeproj").first
 file_name = File.basename(project_path, ".xcodeproj")
 project_location = "./ios/#{file_name}.xcodeproj"
-default_target_name = file_name
-framework_root = '../node_modules/instabug-reactnative/ios'
-framework_name = 'Instabug.framework'
-
-INSTABUG_PHASE_NAME = "Strip Frameworks"
-
-INSTABUG_PHASE_SCRIPT = <<-SCRIPTEND
-bash "${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instabug.framework/strip-frameworks.sh"
-  SCRIPTEND
 
 INSTABUG_UPLOAD_NAME = "Upload Sourcemap"
 
@@ -33,13 +24,9 @@
 
 # Get useful variables
 project = Xcodeproj::Project.open(project_location)
-frameworks_group = project.groups.find { |group| group.display_name == 'Frameworks' }
-frameworks_group ||= project.new_group('Frameworks')
-default_target = project.targets.find { |target| target.to_s == default_target_name } || project.targets.first
 targets = project.targets.select { |target| (target.is_a? Xcodeproj::Project::Object::PBXNativeTarget) &&
 	 																				  (target.product_type == "com.apple.product-type.application") &&
 																					  (target.platform_name == :ios) }
-framework_ref = frameworks_group.new_file("#{framework_root}/#{framework_name}")
 
 targets.each do |target|
 	#Add New Run Script Phase to Build Phases

InstabugSample/package.json

@@ -11,23 +11,14 @@
 project_path = Dir.glob("#{current_path}/ios/*.xcodeproj").first
 file_name = File.basename(project_path, ".xcodeproj")
 project_location = "./ios/#{file_name}.xcodeproj"
-framework_root = '../node_modules/instabug-reactnative/ios'
-framework_name = 'Instabug.framework'
-
-INSTABUG_PHASE_NAME = "Strip Frameworks"
 
 INSTABUG_UPLOAD_NAME = "Upload Sourcemap"
 
 # Get useful variables
 project = Xcodeproj::Project.open(project_location)
-frameworks_group = project.groups.find { |group| group.display_name == 'Frameworks' }
 targets = project.targets.select { |target| (target.is_a? Xcodeproj::Project::Object::PBXNativeTarget) &&
 	 																				  (target.product_type == "com.apple.product-type.application") &&
 																					  (target.platform_name == :ios) }
-framework_ref = frameworks_group.files.find { |file_reference| file_reference.path == "#{framework_root}/#{framework_name}"}
-
-# # Remove Instabug's framework from the Frameworks group
-# frameworks_group.children.delete(framework_ref)
 
 targets.each do |target|
 	#Delete New Run Script Phase from Build Phases

autolink.rb

@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/RNInstabug/*'
   s.platform     = :ios, "9.0"
   s.static_framework = true
-  s.ios.vendored_frameworks = 'ios/Instabug.framework'
+  s.ios.vendored_frameworks = 'ios/Instabug.xcframework'
   s.dependency 'React'
 end