Skip to content

Commit df2a000

Browse files
vonovakvonovak
committed
attempt 1
attempt 2 again again again again again again again again again again again again again again again again again again again
1 parent 2ed4600 commit df2a000

File tree

4 files changed

+1186
-692
lines changed

4 files changed

+1186
-692
lines changed

‎.circleci/config.yml‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,65 @@
1-
version: 2.1
2-
31
orbs:
42
rn: react-native-community/[email protected]
3+
version: 2.1
54

65
jobs:
76
checkout_code:
8-
executor: rn/linux_js
7+
executor:
8+
name: rn/linux_js
9+
node_version: '10'
910
steps:
1011
- checkout
1112
- persist_to_workspace:
12-
root: .
1313
paths: .
14-
15-
analyse:
14+
root: .
15+
analyse_js:
1616
executor: rn/linux_js
1717
steps:
1818
- attach_workspace:
1919
at: .
20+
- rn/yarn_install
2021
- run:
21-
name: Install
22-
command: yarn install --frozen-lockfile
23-
- run:
24-
name: Lint JS Code (ESLint)
25-
command: yarn run lint
22+
command: yarn lint
23+
name: Run ESLint
2624
- run:
25+
command: yarn flow
2726
name: Flow
28-
command: yarn run flow
2927
- run:
28+
command: yarn test
3029
name: Jest
31-
command: yarn run test
3230

3331
workflows:
3432
test:
3533
jobs:
3634
- checkout_code
37-
- analyse:
35+
- analyse_js:
3836
requires:
3937
- checkout_code
40-
# - rn/android_build:
41-
# name: build_android_release
42-
# project_path: "example/android"
43-
# requires:
44-
# - analyse
45-
# - rn/android_test:
46-
# detox_configuration: "android.emu.release"
47-
# requires:
48-
# - build_android_release
49-
# - rn/ios_build_and_test:
50-
# project_path: "example/ios/example.xcodeproj"
51-
# device: "iPhone X"
52-
# build_configuration: "Release"
53-
# scheme: "example"
54-
# detox_configuration: "ios.sim.release"
55-
# requires:
56-
# - analyse
38+
# - rn/android_build:
39+
# build_type: release
40+
# name: build_android_release
41+
# project_path: android
42+
# requires:
43+
# - analyse_js
44+
# - rn/android_test:
45+
# detox_configuration: android.emu.release
46+
# requires:
47+
# - build_android_release
48+
- rn/ios_build_and_test:
49+
on_after_initialize: |
50+
sed '$d' $BASH_ENV | sed '$d' > $BASH_ENV
51+
npm install -g detox-cli
52+
source $BASH_ENV
53+
mkdir -p example/ios/build/Build/Products/Release-iphonesimulator/example.app
54+
node node_modules/react-native/cli.js bundle --entry-file example/index.js --platform ios --dev false --reset-cache --bundle-output example/ios/build/Build/Products/Release-iphonesimulator/example.app/main.jsbundle --assets-dest example/ios/build/Build/Products/Release-iphonesimulator/example.app
55+
cd example/ios && pod install && cd -
56+
build_configuration: Release
57+
detox_configuration: ios.sim.release
58+
device: iPhone 11
59+
derived_data_path: example/ios/build
60+
node_version: '12.10.0'
61+
project_path: example/ios/example.xcworkspace
62+
project_type: workspace
63+
requires:
64+
- analyse_js
65+
scheme: example

‎example/ios/Podfile.lock‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,77 +11,77 @@ PODS:
1111
- DoubleConversion
1212
- glog
1313
- glog (0.3.5)
14-
- React (0.60.5):
15-
- React-Core (= 0.60.5)
16-
- React-DevSupport (= 0.60.5)
17-
- React-RCTActionSheet (= 0.60.5)
18-
- React-RCTAnimation (= 0.60.5)
19-
- React-RCTBlob (= 0.60.5)
20-
- React-RCTImage (= 0.60.5)
21-
- React-RCTLinking (= 0.60.5)
22-
- React-RCTNetwork (= 0.60.5)
23-
- React-RCTSettings (= 0.60.5)
24-
- React-RCTText (= 0.60.5)
25-
- React-RCTVibration (= 0.60.5)
26-
- React-RCTWebSocket (= 0.60.5)
27-
- React-Core (0.60.5):
14+
- React (0.60.6):
15+
- React-Core (= 0.60.6)
16+
- React-DevSupport (= 0.60.6)
17+
- React-RCTActionSheet (= 0.60.6)
18+
- React-RCTAnimation (= 0.60.6)
19+
- React-RCTBlob (= 0.60.6)
20+
- React-RCTImage (= 0.60.6)
21+
- React-RCTLinking (= 0.60.6)
22+
- React-RCTNetwork (= 0.60.6)
23+
- React-RCTSettings (= 0.60.6)
24+
- React-RCTText (= 0.60.6)
25+
- React-RCTVibration (= 0.60.6)
26+
- React-RCTWebSocket (= 0.60.6)
27+
- React-Core (0.60.6):
2828
- Folly (= 2018.10.22.00)
29-
- React-cxxreact (= 0.60.5)
30-
- React-jsiexecutor (= 0.60.5)
31-
- yoga (= 0.60.5.React)
32-
- React-cxxreact (0.60.5):
29+
- React-cxxreact (= 0.60.6)
30+
- React-jsiexecutor (= 0.60.6)
31+
- yoga (= 0.60.6.React)
32+
- React-cxxreact (0.60.6):
3333
- boost-for-react-native (= 1.63.0)
3434
- DoubleConversion
3535
- Folly (= 2018.10.22.00)
3636
- glog
37-
- React-jsinspector (= 0.60.5)
38-
- React-DevSupport (0.60.5):
39-
- React-Core (= 0.60.5)
40-
- React-RCTWebSocket (= 0.60.5)
41-
- React-jsi (0.60.5):
37+
- React-jsinspector (= 0.60.6)
38+
- React-DevSupport (0.60.6):
39+
- React-Core (= 0.60.6)
40+
- React-RCTWebSocket (= 0.60.6)
41+
- React-jsi (0.60.6):
4242
- boost-for-react-native (= 1.63.0)
4343
- DoubleConversion
4444
- Folly (= 2018.10.22.00)
4545
- glog
46-
- React-jsi/Default (= 0.60.5)
47-
- React-jsi/Default (0.60.5):
46+
- React-jsi/Default (= 0.60.6)
47+
- React-jsi/Default (0.60.6):
4848
- boost-for-react-native (= 1.63.0)
4949
- DoubleConversion
5050
- Folly (= 2018.10.22.00)
5151
- glog
52-
- React-jsiexecutor (0.60.5):
52+
- React-jsiexecutor (0.60.6):
5353
- DoubleConversion
5454
- Folly (= 2018.10.22.00)
5555
- glog
56-
- React-cxxreact (= 0.60.5)
57-
- React-jsi (= 0.60.5)
58-
- React-jsinspector (0.60.5)
59-
- React-RCTActionSheet (0.60.5):
60-
- React-Core (= 0.60.5)
61-
- React-RCTAnimation (0.60.5):
62-
- React-Core (= 0.60.5)
63-
- React-RCTBlob (0.60.5):
64-
- React-Core (= 0.60.5)
65-
- React-RCTNetwork (= 0.60.5)
66-
- React-RCTWebSocket (= 0.60.5)
67-
- React-RCTImage (0.60.5):
68-
- React-Core (= 0.60.5)
69-
- React-RCTNetwork (= 0.60.5)
70-
- React-RCTLinking (0.60.5):
71-
- React-Core (= 0.60.5)
72-
- React-RCTNetwork (0.60.5):
73-
- React-Core (= 0.60.5)
74-
- React-RCTSettings (0.60.5):
75-
- React-Core (= 0.60.5)
76-
- React-RCTText (0.60.5):
77-
- React-Core (= 0.60.5)
78-
- React-RCTVibration (0.60.5):
79-
- React-Core (= 0.60.5)
80-
- React-RCTWebSocket (0.60.5):
81-
- React-Core (= 0.60.5)
82-
- RNDateTimePicker (2.1.2):
56+
- React-cxxreact (= 0.60.6)
57+
- React-jsi (= 0.60.6)
58+
- React-jsinspector (0.60.6)
59+
- React-RCTActionSheet (0.60.6):
60+
- React-Core (= 0.60.6)
61+
- React-RCTAnimation (0.60.6):
62+
- React-Core (= 0.60.6)
63+
- React-RCTBlob (0.60.6):
64+
- React-Core (= 0.60.6)
65+
- React-RCTNetwork (= 0.60.6)
66+
- React-RCTWebSocket (= 0.60.6)
67+
- React-RCTImage (0.60.6):
68+
- React-Core (= 0.60.6)
69+
- React-RCTNetwork (= 0.60.6)
70+
- React-RCTLinking (0.60.6):
71+
- React-Core (= 0.60.6)
72+
- React-RCTNetwork (0.60.6):
73+
- React-Core (= 0.60.6)
74+
- React-RCTSettings (0.60.6):
75+
- React-Core (= 0.60.6)
76+
- React-RCTText (0.60.6):
77+
- React-Core (= 0.60.6)
78+
- React-RCTVibration (0.60.6):
79+
- React-Core (= 0.60.6)
80+
- React-RCTWebSocket (0.60.6):
81+
- React-Core (= 0.60.6)
82+
- RNDateTimePicker (2.3.1):
8383
- React
84-
- yoga (0.60.5.React)
84+
- yoga (0.60.6.React)
8585

8686
DEPENDENCIES:
8787
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -162,26 +162,26 @@ SPEC CHECKSUMS:
162162
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
163163
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
164164
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
165-
React: 53c53c4d99097af47cf60594b8706b4e3321e722
166-
React-Core: ba421f6b4f4cbe2fb17c0b6fc675f87622e78a64
167-
React-cxxreact: 8384287780c4999351ad9b6e7a149d9ed10a2395
168-
React-DevSupport: 197fb409737cff2c4f9986e77c220d7452cb9f9f
169-
React-jsi: 4d8c9efb6312a9725b18d6fc818ffc103f60fec2
170-
React-jsiexecutor: 90ad2f9db09513fc763bc757fdc3c4ff8bde2a30
171-
React-jsinspector: e08662d1bf5b129a3d556eb9ea343a3f40353ae4
172-
React-RCTActionSheet: b0f1ea83f4bf75fb966eae9bfc47b78c8d3efd90
173-
React-RCTAnimation: 359ba1b5690b1e87cc173558a78e82d35919333e
174-
React-RCTBlob: 5e2b55f76e9a1c7ae52b826923502ddc3238df24
175-
React-RCTImage: f5f1c50922164e89bdda67bcd0153952a5cfe719
176-
React-RCTLinking: d0ecbd791e9ddddc41fa1f66b0255de90e8ee1e9
177-
React-RCTNetwork: e26946300b0ab7bb6c4a6348090e93fa21f33a9d
178-
React-RCTSettings: d0d37cb521b7470c998595a44f05847777cc3f42
179-
React-RCTText: b074d89033583d4f2eb5faf7ea2db3a13c7553a2
180-
React-RCTVibration: 2105b2e0e2b66a6408fc69a46c8a7fb5b2fdade0
181-
React-RCTWebSocket: cd932a16b7214898b6b7f788c8bddb3637246ac4
182-
RNDateTimePicker: abaac403abbc72e127bf678d65e0abd312e4b6a7
183-
yoga: 312528f5bbbba37b4dcea5ef00e8b4033fdd9411
165+
React: 68e7f8dfc27729eade18423072a143120f2f32ab
166+
React-Core: fc9dace551f6c8c1007dd2d3cb1bc10c90a01d3e
167+
React-cxxreact: abe59014fce932d41a08bf1aa5dcad9ca8f0a2c5
168+
React-DevSupport: b0da2fd9ad4ffb25561bf2a328ab84f78f871bdd
169+
React-jsi: 1a4248256b96fa453536a8dafe11b784e24e789d
170+
React-jsiexecutor: 2279e559b921d02dfc6253ebef3dcb3a9dc6c07e
171+
React-jsinspector: a58b86545a0185f69768e78ac96ca9fe43fa3694
172+
React-RCTActionSheet: 49f6a67a7efa6688f637296383d453b97ef13645
173+
React-RCTAnimation: e8047438b2927ebbe630bbf600c7309374075df3
174+
React-RCTBlob: 2c4b28daca5b3e6e356706d8e0c7436a0e8ef492
175+
React-RCTImage: 273501f0529775962551613259c20ccdf1a87cd2
176+
React-RCTLinking: 76c88b3cc98657915a2ba2f20d208e44d0530a43
177+
React-RCTNetwork: 77c11e672ccdcc33da5d047705f100b016497b15
178+
React-RCTSettings: f727c25ad26a8a9bd7272a8ba93781bd1f53952a
179+
React-RCTText: d91537e29e38dc69cf09cbca0875cf5dc7402da6
180+
React-RCTVibration: 7655d72dfb919dd6d8e135ca108a5a2bd9fcd7b4
181+
React-RCTWebSocket: 7cd2c8d0f8ddd680dc76404defba7ab1f56b83af
182+
RNDateTimePicker: 5b151d197435a4e929bfb6f285ed2372561e3578
183+
yoga: 5079887aa3e4c62142d6bcee493022643ee4d730
184184

185-
PODFILE CHECKSUM: 9d4fcddc60c204830591affd670263270598f3c1
185+
PODFILE CHECKSUM: 02bf92e8a7d12d3f6dd494033c0b149461530448
186186

187187
COCOAPODS: 1.8.4

‎package.json‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
"@babel/core": "^7.5.5",
5454
"@babel/runtime": "^7.5.5",
5555
"@react-native-community/eslint-config": "^1.0.0",
56-
"babel-jest": "^24.8.0",
57-
"detox": "^14.0.2",
56+
"babel-jest": "^25.2.4",
57+
"detox": "^16.0.2",
5858
"eslint": "^6.8.0",
5959
"eslint-plugin-prettier": "^3.1.2",
6060
"flow-bin": "^0.98.0",
6161
"flow-typed": "^2.6.0",
62-
"jest": "^24.8.0",
62+
"jest": "^25.2.4",
6363
"metro-react-native-babel-preset": "^0.55.0",
6464
"moment": "^2.24.0",
6565
"react": "^16.8.6",
@@ -79,27 +79,35 @@
7979
"configurations": {
8080
"ios.sim.debug": {
8181
"binaryPath": "example/ios/build/Build/Products/Debug-iphonesimulator/example.app",
82-
"build": "export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -project example/ios/example.xcodeproj -destination 'platform=iOS Simulator,name=iPhone X' -scheme example -configuration Debug -derivedDataPath example/ios/build -UseModernBuildSystem=YES",
82+
"build": "export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -project example/ios/example.xcodeproj -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 11' -scheme example -configuration Debug -derivedDataPath example/ios/build -UseModernBuildSystem=YES",
8383
"type": "ios.simulator",
84-
"name": "iPhone X"
84+
"device": {
85+
"type": "iPhone 11 Pro"
86+
}
8587
},
8688
"ios.sim.release": {
8789
"binaryPath": "example/ios/build/Build/Products/Release-iphonesimulator/example.app",
88-
"build": "export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -project example/ios/example.xcodeproj -destination 'platform=iOS Simulator,name=iPhone X' -scheme example -configuration Release -derivedDataPath example/ios/build -UseModernBuildSystem=YES",
90+
"build": "export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -project example/ios/example.xcodeproj -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 11' -scheme example -configuration Release -derivedDataPath example/ios/build -UseModernBuildSystem=YES",
8991
"type": "ios.simulator",
90-
"name": "iPhone X"
92+
"device": {
93+
"type": "iPhone 11 Pro"
94+
}
9195
},
9296
"android.emu.debug": {
9397
"binaryPath": "example/android/app/build/outputs/apk/debug/app-debug.apk",
9498
"build": "export RCT_NO_LAUNCH_PACKAGER=true && cd example/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ../..",
9599
"type": "android.emulator",
96-
"name": "TestingAVD"
100+
"device": {
101+
"avdName": "Pixel_API_28"
102+
}
97103
},
98104
"android.emu.release": {
99105
"binaryPath": "example/android/app/build/outputs/apk/release/app-release.apk",
100106
"build": "export RCT_NO_LAUNCH_PACKAGER=true && cd example/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ../..",
101107
"type": "android.emulator",
102-
"name": "TestingAVD"
108+
"device": {
109+
"avdName": "Pixel_API_28"
110+
}
103111
}
104112
}
105113
}

0 commit comments

Comments
 (0)