Skip to content

Commit cacec43

Browse files
Ali Abdelfattahmatt-koevortTheBuggedYRN
authored
[MOB-8891] Release/11.0.1 (#724)
* 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 <[email protected]> Co-authored-by: Matthew Koevort <[email protected]> Co-authored-by: Youssef Raafat <[email protected]>
1 parent ade4d7c commit cacec43

8 files changed

+37
-9
lines changed

.circleci/config.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
test_module:
1212
working_directory: ~/project
1313
docker:
14-
- image: circleci/node:8
14+
- image: circleci/node:10
1515
steps:
1616
- checkout:
1717
path: ~/project
@@ -89,6 +89,20 @@ jobs:
8989
working-directory: ./android
9090
test-command: ./gradlew test
9191

92+
validate_shell_files:
93+
machine:
94+
image: ubuntu-2004:current
95+
working_directory: ~/project
96+
steps:
97+
- checkout:
98+
path: ~/project
99+
- run:
100+
name: Validate Android Script
101+
command: bash -n android/upload_sourcemap.sh
102+
- run:
103+
name: Validate iOS Script
104+
command: bash -n ios/upload_sourcemap.sh
105+
92106
test_ios:
93107
macos:
94108
xcode: "12.3.0"
@@ -149,6 +163,7 @@ jobs:
149163
executor:
150164
name: android/android-machine
151165
tag: "2022.03.1"
166+
resource-class: large
152167
working_directory: ~/project/InstabugSample/android
153168
steps:
154169
- checkout:
@@ -169,6 +184,7 @@ jobs:
169184
- android/start-emulator:
170185
avd-name: Nexus_6P_API_27
171186
no-window: true
187+
memory: 2048
172188
post-emulator-launch-assemble-command: |
173189
rm -rf ~/.gradle/caches
174190
./gradlew androidDependencies
@@ -198,6 +214,7 @@ workflows:
198214
- test_module
199215
- test_sample
200216
- test_android
217+
- validate_shell_files
201218
- test_ios
202219
- e2e_ios
203220
- e2e_android
@@ -206,6 +223,7 @@ workflows:
206223
- test_module
207224
- test_sample
208225
- test_android
226+
- validate_shell_files
209227
- test_ios
210228
- e2e_ios
211229
- e2e_android

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "npm"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
## master
1+
## 11.0.1 (2022-06-13)
22

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

57
## 11.0.0 (2022-06-07)
68

__tests__/networkLogger.spec.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ describe('NetworkLogger Module', () => {
172172
});
173173

174174
it('should test that apollo handler called with catch error', async () => {
175-
const operation = {};
175+
const operation = {
176+
setContext : (callback) => callback({ headers: {} }),
177+
};
176178
const forward = jest.fn();
177179

178180
NetworkLogger.apolloLinkRequestHandler(operation, forward);

__tests__/xhrNetworkInterceptor.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe('Network Interceptor', () => {
139139
done();
140140
})
141141
FakeRequest.open(method, url);
142-
FakeRequest.setResponseType('text')
142+
FakeRequest.setResponseType('json')
143143
FakeRequest.send();
144144
FakeRequest.mockResponse(requests[0], null, JSON.stringify(responseBody));
145145
});
@@ -213,7 +213,7 @@ describe('Network Interceptor', () => {
213213
});
214214
FakeRequest.open(method, url);
215215
FakeRequest.setRequestHeaders(headers);
216-
FakeRequest.setResponseType('text');
216+
FakeRequest.setResponseType('json');
217217
FakeRequest.send();
218218
FakeRequest.mockResponse(requests[0], null, JSON.stringify(responseBody));
219219
});

android/upload_sourcemap.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ else
4141
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"
4242
exit 0
4343
fi
44-
fi
4544
VERSION='{"code":"'"$INSTABUG_APP_VERSION_CODE"'","name":"'"$INSTABUG_APP_VERSION_NAME"'"}'
4645
echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""
4746
echo "Instabug: Version Code found" "\""${INSTABUG_APP_VERSION_CODE}"\""

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "instabug-reactnative",
3-
"version": "11.0.0",
3+
"version": "11.0.1",
44
"description": "React Native plugin for integrating the Instabug SDK",
55
"main": "index.js",
66
"types": "index.d.ts",
@@ -34,7 +34,7 @@
3434
"devDependencies": {
3535
"babel-core": "7.0.0-bridge.0",
3636
"babel-jest": "^24.8.0",
37-
"codecov": "~3.7.0",
37+
"codecov": "~3.8.3",
3838
"jest": "^24.8.0",
3939
"metro-react-native-babel-preset": "0.51.1",
4040
"react": "^16.8.6",

react-native.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
scriptPhases: [
88
{
99
name: '[instabug-reactnative] Upload Sourcemap',
10-
script: `bash "${path.resolve(__dirname, 'ios/upload_sourcemap.sh')}"`,
10+
path: './ios/upload_sourcemap.sh',
1111
execution_position: 'after_compile',
1212
},
1313
],

0 commit comments

Comments
 (0)