Skip to content

Commit 36f7923

Browse files
authored
Merge pull request #637 from Instabug/feature/SampleAppUpdated
[MOB-6103] Update SampleApp
2 parents 353f07c + ceb8a91 commit 36f7923

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5302
-4189
lines changed

.circleci/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- run:
111111
name: Build and run tests
112112
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
113-
113+
no_output_timeout: 30m
114114
e2e_ios:
115115
macos:
116116
xcode: "12.3.0"
@@ -203,7 +203,6 @@ jobs:
203203
sudo chmod -R 777 /Users/distiller/Library/Detox
204204
detox test --configuration android.emu.release --cleanup
205205
206-
207206
publish:
208207
macos:
209208
xcode: "12.5.1"
@@ -224,7 +223,7 @@ workflows:
224223
context: cross-platform
225224
- test_module
226225
- test_sample
227-
- test_android
226+
# - test_android
228227
- test_ios
229228
- e2e_ios
230229
# - e2e_android
@@ -247,4 +246,3 @@ workflows:
247246
filters:
248247
branches:
249248
only: master
250-

InstabugSample/.detoxrc.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"test-runner": "jest",
3+
"runner-config": "__e2e__/config.json",
4+
"configurations": {
5+
"ios.sim.debug": {
6+
"binaryPath": "ios/build/Build/Products/Debug-iphonesimulator/InstabugSample.app",
7+
"build": "xcodebuild -workspace ios/InstabugSample.xcworkspace -scheme InstabugSample -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build",
8+
"type": "ios.simulator",
9+
"name": "iPhone 12"
10+
},
11+
"ios.sim.release": {
12+
"binaryPath": "ios/build/Build/Products/Release-iphonesimulator/InstabugSample.app",
13+
"build": "xcodebuild -workspace ios/InstabugSample.xcworkspace -scheme InstabugSample -configuration Release -sdk iphonesimulator -derivedDataPath ios/build",
14+
"type": "ios.simulator",
15+
"name": "iPhone 12"
16+
},
17+
"android.emu.debug": {
18+
"binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",
19+
"build": "cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
20+
"type": "android.emulator",
21+
"name": "Pixel_3_API_28"
22+
},
23+
"android.emu.release": {
24+
"binaryPath": "android/app/build/outputs/apk/release/app-release.apk",
25+
"build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..",
26+
"type": "android.emulator",
27+
"name": "Nexus_6P_API_27"
28+
}
29+
}
30+
}

InstabugSample/.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Windows files
2+
[*.bat]
3+
end_of_line = crlf

InstabugSample/.flowconfig

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,74 +5,42 @@
55
; Ignore "BUCK" generated dirs
66
<PROJECT_ROOT>/\.buckd/
77

8-
; Ignore unexpected extra "@providesModule"
9-
.*/node_modules/.*/node_modules/fbjs/.*
10-
11-
; Ignore duplicate module providers
12-
; For RN Apps installed via npm, "Libraries" folder is inside
13-
; "node_modules/react-native" but in the source repo it is in the root
14-
node_modules/react-native/Libraries/react-native/React.js
15-
168
; Ignore polyfills
179
node_modules/react-native/Libraries/polyfills/.*
1810

19-
; These should not be required directly
20-
; require from fbjs/lib instead: require('fbjs/lib/warning')
21-
node_modules/warning/.*
22-
2311
; Flow doesn't support platforms
24-
.*/Libraries/Utilities/HMRLoadingView.js
12+
.*/Libraries/Utilities/LoadingView.js
2513

2614
[untyped]
2715
.*/node_modules/@react-native-community/cli/.*/.*
2816

2917
[include]
3018

3119
[libs]
32-
node_modules/react-native/Libraries/react-native/react-native-interface.js
20+
node_modules/react-native/interface.js
3321
node_modules/react-native/flow/
3422

3523
[options]
3624
emoji=true
3725

38-
esproposal.optional_chaining=enable
39-
esproposal.nullish_coalescing=enable
26+
exact_by_default=true
27+
28+
format.bracket_spacing=false
4029

4130
module.file_ext=.js
4231
module.file_ext=.json
4332
module.file_ext=.ios.js
4433

45-
module.system=haste
46-
module.system.haste.use_name_reducers=true
47-
# get basename
48-
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
49-
# strip .js or .js.flow suffix
50-
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
51-
# strip .ios suffix
52-
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
53-
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
54-
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
55-
module.system.haste.paths.blacklist=.*/__tests__/.*
56-
module.system.haste.paths.blacklist=.*/__mocks__/.*
57-
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
58-
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
59-
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
60-
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
61-
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
62-
6334
munge_underscores=true
6435

65-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
36+
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
37+
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
6638

6739
suppress_type=$FlowIssue
6840
suppress_type=$FlowFixMe
6941
suppress_type=$FlowFixMeProps
7042
suppress_type=$FlowFixMeState
7143

72-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
73-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
74-
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
75-
7644
[lints]
7745
sketchy-null-number=warn
7846
sketchy-null-mixed=warn
@@ -81,10 +49,8 @@ untyped-type-import=warn
8149
nonstrict-import=warn
8250
deprecated-type=warn
8351
unsafe-getters-setters=warn
84-
inexact-spread=warn
8552
unnecessary-invariant=warn
8653
signature-verification-failure=warn
87-
deprecated-utility=error
8854

8955
[strict]
9056
deprecated-type
@@ -96,4 +62,4 @@ untyped-import
9662
untyped-type-import
9763

9864
[version]
99-
^0.98.0
65+
^0.158.0

InstabugSample/.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
*.pbxproj -text
1+
# Windows files should use crlf line endings
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
*.bat text eol=crlf

InstabugSample/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ DerivedData
2222
*.xcuserstate
2323
project.xcworkspace
2424
InstabugSample.xcworkspace
25+
local.properties
2526

2627
# Android/IntelliJ
2728
#
@@ -30,6 +31,7 @@ build/
3031
.gradle
3132
local.properties
3233
*.iml
34+
*.hprof
3335

3436
# node.js
3537
#
@@ -41,6 +43,7 @@ yarn-error.log
4143
buck-out/
4244
\.buckd/
4345
*.keystore
46+
!debug.keystore
4447

4548
# fastlane
4649
#

InstabugSample/.prettierrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

InstabugSample/.prettierrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
arrowParens : 'avoid',
3+
bracketSameLine : true,
4+
printWidth : 100,
5+
singleQuote : true,
6+
trailingComma : 'all',
7+
};
8+

0 commit comments

Comments
 (0)