Skip to content

Commit

Permalink
[MOB-8891] Release/11.0.1 (#724)
Browse files Browse the repository at this point in the history
* Bump version to 11.0.1

* fix(android): remove unmatched 'fi' token in android upload_sourcemap.sh (#722)

* [MOB-8883] Add CI job to validate shell files and increase e2e_android resources (#720)

* Add CI job to validate shell files

* Fix Android shell script error

Remove extra fi operator

* Increase e2e_android job resources

* Fix Network-related Tests (#723)

* Update CHANGELOG.md

* Run Dependabot in Root Only (#721)

* [MOB-8892] Update codecov version (#725)

* Update package.json

* Update config.yml

* Increase CI emulator memory (#727)

* [MOB-8895] Improve iOS Autolinking through leveraging the path attribute (#726)

* Fix iOS Autolinking Script Path

* Update CHANGELOG.md

Co-authored-by: Ali Abdelfattah <ali.abdelfattah.xa@gmail.com>

Co-authored-by: Matthew Koevort <35453138+matt-koevort@users.noreply.github.com>
Co-authored-by: Youssef Raafat <99807625+TheBuggedYRN@users.noreply.github.com>
  • Loading branch information
3 people authored Jun 13, 2022
1 parent ade4d7c commit cacec43
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 9 deletions.
20 changes: 19 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
test_module:
working_directory: ~/project
docker:
- image: circleci/node:8
- image: circleci/node:10
steps:
- checkout:
path: ~/project
Expand Down Expand Up @@ -89,6 +89,20 @@ jobs:
working-directory: ./android
test-command: ./gradlew test

validate_shell_files:
machine:
image: ubuntu-2004:current
working_directory: ~/project
steps:
- checkout:
path: ~/project
- run:
name: Validate Android Script
command: bash -n android/upload_sourcemap.sh
- run:
name: Validate iOS Script
command: bash -n ios/upload_sourcemap.sh

test_ios:
macos:
xcode: "12.3.0"
Expand Down Expand Up @@ -149,6 +163,7 @@ jobs:
executor:
name: android/android-machine
tag: "2022.03.1"
resource-class: large
working_directory: ~/project/InstabugSample/android
steps:
- checkout:
Expand All @@ -169,6 +184,7 @@ jobs:
- android/start-emulator:
avd-name: Nexus_6P_API_27
no-window: true
memory: 2048
post-emulator-launch-assemble-command: |
rm -rf ~/.gradle/caches
./gradlew androidDependencies
Expand Down Expand Up @@ -198,6 +214,7 @@ workflows:
- test_module
- test_sample
- test_android
- validate_shell_files
- test_ios
- e2e_ios
- e2e_android
Expand All @@ -206,6 +223,7 @@ workflows:
- test_module
- test_sample
- test_android
- validate_shell_files
- test_ios
- e2e_ios
- e2e_android
Expand Down
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2

updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## master
## 11.0.1 (2022-06-13)

* Fixes an issue with network responses of type JSON not getting logged
* Fixes an issue that may cause the android build to fail
* Fixes an issue with iOS autolinking that causes the user local path to be referenced in xcode

## 11.0.0 (2022-06-07)

Expand Down
4 changes: 3 additions & 1 deletion __tests__/networkLogger.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ describe('NetworkLogger Module', () => {
});

it('should test that apollo handler called with catch error', async () => {
const operation = {};
const operation = {
setContext : (callback) => callback({ headers: {} }),
};
const forward = jest.fn();

NetworkLogger.apolloLinkRequestHandler(operation, forward);
Expand Down
4 changes: 2 additions & 2 deletions __tests__/xhrNetworkInterceptor.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe('Network Interceptor', () => {
done();
})
FakeRequest.open(method, url);
FakeRequest.setResponseType('text')
FakeRequest.setResponseType('json')
FakeRequest.send();
FakeRequest.mockResponse(requests[0], null, JSON.stringify(responseBody));
});
Expand Down Expand Up @@ -213,7 +213,7 @@ describe('Network Interceptor', () => {
});
FakeRequest.open(method, url);
FakeRequest.setRequestHeaders(headers);
FakeRequest.setResponseType('text');
FakeRequest.setResponseType('json');
FakeRequest.send();
FakeRequest.mockResponse(requests[0], null, JSON.stringify(responseBody));
});
Expand Down
1 change: 0 additions & 1 deletion android/upload_sourcemap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ else
echo "Instabug: err: entry file not found. Make sure" "\"${ENTRY_FILE}\"" "exists in your projects root directory. Or add the environment variable INSTABUG_ENTRY_FILE with the name of your entry file"
exit 0
fi
fi
VERSION='{"code":"'"$INSTABUG_APP_VERSION_CODE"'","name":"'"$INSTABUG_APP_VERSION_NAME"'"}'
echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""
echo "Instabug: Version Code found" "\""${INSTABUG_APP_VERSION_CODE}"\""
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "instabug-reactnative",
"version": "11.0.0",
"version": "11.0.1",
"description": "React Native plugin for integrating the Instabug SDK",
"main": "index.js",
"types": "index.d.ts",
Expand Down Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^24.8.0",
"codecov": "~3.7.0",
"codecov": "~3.8.3",
"jest": "^24.8.0",
"metro-react-native-babel-preset": "0.51.1",
"react": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
scriptPhases: [
{
name: '[instabug-reactnative] Upload Sourcemap',
script: `bash "${path.resolve(__dirname, 'ios/upload_sourcemap.sh')}"`,
path: './ios/upload_sourcemap.sh',
execution_position: 'after_compile',
},
],
Expand Down

0 comments on commit cacec43

Please sign in to comment.