Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
612c4a0
Android RN 62
diegolmello Apr 2, 2020
99838b7
First steps iOS
diegolmello Apr 3, 2020
443f4a7
Second step iOS
diegolmello Apr 3, 2020
9be8eee
iOS compiling
diegolmello Apr 3, 2020
d82bee0
"New" build system
diegolmello Apr 3, 2020
e37fa04
Finish iOS
diegolmello Apr 3, 2020
9be170f
Flipper
diegolmello Apr 3, 2020
94cd186
Update to RN 0.62.1
diegolmello Apr 3, 2020
e2e7da8
expo libs
diegolmello Apr 7, 2020
6bfe88a
Hermes working
diegolmello Apr 8, 2020
e90a85c
Fix lint
diegolmello Apr 8, 2020
c48402e
Fix android build
diegolmello Apr 8, 2020
be82079
Patches
diegolmello Apr 8, 2020
3cb6c53
Dev patches
diegolmello Apr 8, 2020
0429a59
Merge branch 'develop' into update-deps
diegolmello May 5, 2020
bd4a2b0
Patch WatermelonDB: https://github.com/Nozbe/WatermelonDB/pull/660
diegolmello May 5, 2020
2809484
Fix jitsi
diegolmello May 5, 2020
33314ef
Update several minors
diegolmello May 5, 2020
59a22c7
Update dev minors and lint
diegolmello May 5, 2020
06212fa
react-native-keyboard-input
diegolmello May 6, 2020
30af910
Few updates
diegolmello May 6, 2020
72bc7f3
device info
diegolmello May 6, 2020
af38ad0
react-native-fast-image
diegolmello May 6, 2020
a379fec
Navigation bar color
diegolmello May 6, 2020
1af21c8
react-native-picker-select
diegolmello May 6, 2020
624c37d
webview
diegolmello May 6, 2020
066c930
reactotron-react-native
diegolmello May 6, 2020
b7a8140
Watermelondb
diegolmello May 6, 2020
634b5c4
RN 0.62.2
diegolmello May 6, 2020
6b4099c
Few updates
diegolmello May 6, 2020
a485d5b
Fix selection
diegolmello May 6, 2020
fe892de
update gems
diegolmello May 7, 2020
35e61b4
remove lib
diegolmello May 7, 2020
625abef
finishing
diegolmello May 7, 2020
ecf2cde
tests
diegolmello May 7, 2020
720861d
Use node 10
diegolmello May 7, 2020
beb443e
Re-enable app bundle
diegolmello May 7, 2020
c517bc7
iOS build
diegolmello May 7, 2020
fa1ccb6
Update jitsi ios
diegolmello May 8, 2020
8ac95b5
Merge branch 'develop' into update-deps
diegolmello May 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
lint-testunit:
<<: *defaults
docker:
- image: circleci/node:8
- image: circleci/node:10

environment:
CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
Expand Down Expand Up @@ -59,13 +59,13 @@ jobs:
key: node-v1-mac-{{ checksum "yarn.lock" }}

- run:
name: Install Node 8
name: Install Node 10
command: |
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
source ~/.nvm/nvm.sh
# https://github.com/creationix/nvm/issues/1394
set +e
nvm install 8
nvm install 10

- run:
name: Install appleSimUtils
Expand Down Expand Up @@ -120,13 +120,13 @@ jobs:
key: node-v1-mac-{{ checksum "yarn.lock" }}

- run:
name: Install Node 8
name: Install Node 10
command: |
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
source ~/.nvm/nvm.sh
# https://github.com/creationix/nvm/issues/1394
set +e
nvm install 8
nvm install 10

- run:
name: Install appleSimUtils
Expand Down Expand Up @@ -176,14 +176,14 @@ jobs:
- checkout

- run:
name: Install Node 8
name: Install Node 10
command: |
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
source ~/.nvm/nvm.sh
# https://github.com/creationix/nvm/issues/1394
set +e
nvm install 8
echo 'export PATH="/home/circleci/.nvm/versions/node/v8.16.0/bin:$PATH"' >> ~/.bash_profile
nvm install 10
echo 'export PATH="/home/circleci/.nvm/versions/node/v10.20.1/bin:$PATH"' >> ~/.bash_profile
source ~/.bash_profile

- restore_cache:
Expand All @@ -206,6 +206,7 @@ jobs:
# echo -e "android.enableAapt2=false" >> ./gradle.properties
echo -e "android.useAndroidX=true" >> ./gradle.properties
echo -e "android.enableJetifier=true" >> ./gradle.properties
echo -e "FLIPPER_VERSION=0.33.1" >> ./gradle.properties

if [[ $KEYSTORE ]]; then
echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
Expand Down Expand Up @@ -234,8 +235,7 @@ jobs:
name: Build Android App
command: |
if [[ $KEYSTORE ]]; then
# TODO: enable app bundle again
./gradlew assembleRelease
./gradlew bundleRelease
else
./gradlew assembleDebug
fi
Expand Down Expand Up @@ -292,13 +292,13 @@ jobs:
key: node-v1-mac-{{ checksum "yarn.lock" }}

- run:
name: Install Node 8
name: Install Node 10
command: |
curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
source ~/.nvm/nvm.sh
# https://github.com/creationix/nvm/issues/1394
set +e
nvm install 8
nvm install 10

- run:
name: Install NPM modules
Expand Down
18 changes: 17 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,23 @@ module.exports = {
"react-native/no-unused-styles": 2,
"react/jsx-one-expression-per-line": 0,
"require-await": 2,
"func-names": 0
"func-names": 0,
"react/sort-comp": ["error", {
"order": [
"static-variables",
"static-methods",
"lifecycle",
"everything-else",
"render"
]
}],
"react/static-property-placement": [0],
"arrow-parens": ["error", "as-needed", { requireForBlockBody: true }],
"react/jsx-props-no-spreading": [1],
"react/jsx-curly-newline": [0],
"react/state-in-constructor": [0],
"no-async-promise-executor": [0],
"max-classes-per-file": [0]
},
"globals": {
"__DEV__": true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ coverage/
buck-out/
\.buckd/
*.keystore
*.jks

# fastlane
#
Expand Down
3 changes: 2 additions & 1 deletion __mocks__/react-native-device-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ export default {
getModel: () => '',
getReadableVersion: () => '',
getBundleId: () => '',
isTablet: () => false
isTablet: () => false,
hasNotch: () => false
};
Loading