Skip to content

Commit 56121cf

Browse files
authored
Merge pull request #585 from leotm/rn-69.0-rc.0-react-18
Upgrade React Native 0.68.1 to 0.69.0-rc.0 and React 18 w New Arch
2 parents 0eb431f + 313ccd8 commit 56121cf

File tree

383 files changed

+4668
-1348
lines changed

Some content is hidden

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

383 files changed

+4668
-1348
lines changed

β€Ž.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ module.exports = {
8585
* - class Atom extends Component<{ children: ReactNode, onPress: () => void }>
8686
* - const Atom = ({ children, onPress }: { children: ReactNode; onPress: () => void }) => <></> // Inferred JSX.Element
8787
* - const Atom: FC<{ onPress: () => void }>
88+
* React 17 PropsWithChildren, now removed for generic P in React 18
8889
*/
8990
'@typescript-eslint/no-unnecessary-type-arguments': 'off',
9091
'@typescript-eslint/no-unused-vars': [

β€Ž.flowconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,5 @@ untyped-import
6464
untyped-type-import
6565

6666
[version]
67-
^0.170.0
67+
^0.176.3
68+

β€Ž.github/workflows/gradle.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,16 @@ jobs:
5252

5353
- name: Install all project dependencies
5454
run: yarn
55+
56+
- name: Get and extract cmake-3.23.1-linux-x86_64.tar.gz to /usr/local/lib/android/sdk
57+
run: |
58+
wget https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-linux-x86_64.tar.gz
59+
tar xzf cmake-3.23.1-linux-x86_64.tar.gz
60+
rm -rf cmake-3.23.1-linux-x86_64.tar.gz
61+
mkdir -p /usr/local/lib/android/sdk/cmake/3.22.1
62+
cp -rf cmake-3.23.1-linux-x86_64/* /usr/local/lib/android/sdk/cmake/3.22.1
63+
cd cmake-3.23.1-linux-x86_64
64+
./bin/cmake --version
5565
5666
# Avoid poisoned cache problems
5767
- name: Delete Android build pre-computed outputs

β€Ž.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
ios/.xcode.env.local
2324
project.xcworkspace
2425

2526
# Android/IntelliJ
@@ -53,9 +54,10 @@ buck-out/
5354
# For more information about the recommended setup visit:
5455
# https://docs.fastlane.tools/best-practices/source-control/
5556

56-
*/fastlane/report.xml
57-
*/fastlane/Preview.html
58-
*/fastlane/screenshots
57+
**/fastlane/report.xml
58+
**/fastlane/Preview.html
59+
**/fastlane/screenshots
60+
**/fastlane/test_output
5961

6062
# Bundle artifact
6163
*.jsbundle

β€Ž.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.5
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
Β (0)