Skip to content

Commit

Permalink
Merge pull request #576 from Instabug/rel/10.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bsameh-at-instabug authored May 10, 2021
2 parents 427a521 + b55fa79 commit a271d14
Show file tree
Hide file tree
Showing 303 changed files with 78,349 additions and 236 deletions.
30 changes: 15 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
test_sample:
working_directory: ~/project
docker:
- image: circleci/node:8
- image: circleci/node:lts
steps:
- checkout:
path: ~/project
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## v10.4.0 (2021-05-10)

* Migrates iOS to use XCFramework
* Bumps Instabug native SDKs to v10.4
* Fixes crashes related to the network request data not being parsed correctly
* Fixes issues related to the automatic sourcemap file upload on Android
* Adds missing TypeScript definitions
* Deprecates Instabug.setVideoRecordingFloatingButtonPosition in favor of BugReporting.setVideoRecordingFloatingButtonPosition
* Includes native fix which removes the usage of android:requestLegacyExternalStorage permission
* Various other bug fixes and improvements

## v10.0.0 (2021-02-16)

* Introduces Instabug’s new App Performance Monitoring (APM)
Expand Down
2 changes: 1 addition & 1 deletion InstabugSample/__e2e__/firstTest.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Example', () => {
beforeEach(async () => {
await device.reloadReactNative();
await device.launchApp();
});

it('should have welcome screen', async () => {
Expand Down
6 changes: 1 addition & 5 deletions InstabugSample/ios/InstabugSample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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; };
Expand All @@ -74,7 +72,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C006102922E9EBCA00EDC852 /* libOCMock.a in Frameworks */,
39B75062AA5F42B6E4C8E3C7 /* libPods-InstabugSampleTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -132,7 +129,6 @@
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
isa = PBXGroup;
children = (
C006102822E9EBCA00EDC852 /* libOCMock.a */,
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
A0EF1FBF0176E13B30EA2D29 /* libPods-InstabugSample.a */,
7A03A15E2685C1231729CA8B /* libPods-InstabugSampleTests.a */,
Expand Down Expand Up @@ -350,7 +346,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-InstabugSample/Pods-InstabugSample-frameworks.sh",
"${PODS_ROOT}/../../node_modules/instabug-reactnative/ios/Instabug.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Instabug/Instabug.framework/Instabug",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
Expand Down
1 change: 1 addition & 0 deletions InstabugSample/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target 'InstabugSample' do
target 'InstabugSampleTests' do
inherit! :search_paths
# Pods for testing
pod 'OCMock'
end

use_native_modules!
Expand Down
Binary file removed InstabugSample/ios/usr/lib/libOCMock.a
Binary file not shown.
6 changes: 3 additions & 3 deletions InstabugSample/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit a271d14

Please sign in to comment.