Skip to content

Commit 26a85db

Browse files
committed
feat: Upgrade react-native to v0.66.1
1 parent c11fa05 commit 26a85db

File tree

21 files changed

+2344
-2903
lines changed

21 files changed

+2344
-2903
lines changed

example/base/.flowconfig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ node_modules/react-native/flow/
2323
[options]
2424
emoji=true
2525

26-
esproposal.optional_chaining=enable
27-
esproposal.nullish_coalescing=enable
28-
2926
exact_by_default=true
3027

28+
format.bracket_spacing=false
29+
3130
module.file_ext=.js
3231
module.file_ext=.json
3332
module.file_ext=.ios.js
@@ -63,4 +62,4 @@ untyped-import
6362
untyped-type-import
6463

6564
[version]
66-
^0.137.0
65+
^0.158.0

example/base/android/app/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
120120
*/
121121
def enableHermes = project.ext.react.get("enableHermes", false);
122122

123+
/**
124+
* Architectures to build native code for in debug.
125+
*/
126+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
127+
123128
android {
124129
ndkVersion rootProject.ext.ndkVersion
125130

@@ -151,6 +156,11 @@ android {
151156
buildTypes {
152157
debug {
153158
signingConfig signingConfigs.debug
159+
if (nativeArchitectures) {
160+
ndk {
161+
abiFilters nativeArchitectures.split(',')
162+
}
163+
}
154164
}
155165
release {
156166
// Caution! In production, you need to generate your own keystore file.
@@ -186,7 +196,7 @@ dependencies {
186196
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
187197

188198
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
189-
exclude group:'com.facebook.fbjni'
199+
exclude group:'com.facebook.fbjni'
190200
}
191201

192202
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {

example/base/android/app/src/main/res/values/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
6-
<item name="android:textColor">#000000</item>
76
</style>
87

98
</resources>

example/base/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 30
88
targetSdkVersion = 30
9-
ndkVersion = "20.1.5948944"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:4.2.1")
16+
classpath("com.android.tools.build:gradle:4.2.2")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}

example/base/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.93.0
28+
FLIPPER_VERSION=0.99.0

example/base/ios/AwesomeProject.xcodeproj/project.pbxproj

Lines changed: 68 additions & 66 deletions
Large diffs are not rendered by default.

example/base/ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ target 'AwesomeProject' do
2525

2626
post_install do |installer|
2727
react_native_post_install(installer)
28+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
2829
end
2930
end

0 commit comments

Comments
 (0)