Merge branch 'chore/update-rn-0.66.4' into 'main'
Chore/update RN 0.66.4 See merge request bloodyhealth/drip!528
This commit is contained in:
@@ -32,6 +32,7 @@ build/
|
|||||||
.gradle
|
.gradle
|
||||||
local.properties
|
local.properties
|
||||||
*.iml
|
*.iml
|
||||||
|
*.hprof
|
||||||
|
|
||||||
# node.js
|
# node.js
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
|
|||||||
*/
|
*/
|
||||||
def enableHermes = project.ext.react.get("enableHermes", false);
|
def enableHermes = project.ext.react.get("enableHermes", false);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Architectures to build native code for in debug.
|
||||||
|
*/
|
||||||
|
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
|
||||||
|
|
||||||
android {
|
android {
|
||||||
ndkVersion rootProject.ext.ndkVersion
|
ndkVersion rootProject.ext.ndkVersion
|
||||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||||
@@ -164,6 +169,11 @@ android {
|
|||||||
buildTypes {
|
buildTypes {
|
||||||
debug {
|
debug {
|
||||||
signingConfig signingConfigs.debug
|
signingConfig signingConfigs.debug
|
||||||
|
if (nativeArchitectures) {
|
||||||
|
ndk {
|
||||||
|
abiFilters nativeArchitectures.split(',')
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
// Caution! In production, you need to generate your own keystore file.
|
// Caution! In production, you need to generate your own keystore file.
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
<!-- Base application theme. -->
|
<!-- Base application theme. -->
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||||
<!-- Customize your theme here. -->
|
<!-- Customize your theme here. -->
|
||||||
<item name="android:textColor">#000000</item>
|
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
ext.kotlinVersion = "1.3.10"
|
ext.kotlinVersion = "1.3.10"
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:4.2.1")
|
classpath("com.android.tools.build:gradle:4.2.2")
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
@@ -48,7 +48,7 @@ ext {
|
|||||||
minSdkVersion = 23
|
minSdkVersion = 23
|
||||||
compileSdkVersion = 30
|
compileSdkVersion = 30
|
||||||
targetSdkVersion = 30
|
targetSdkVersion = 30
|
||||||
ndkVersion = "20.1.5948944"
|
ndkVersion = "21.4.7075529"
|
||||||
}
|
}
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
|
|||||||
@@ -25,4 +25,4 @@ android.useAndroidX=true
|
|||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
|
||||||
# Version of flipper SDK to use with React Native
|
# Version of flipper SDK to use with React Native
|
||||||
FLIPPER_VERSION=0.93.0
|
FLIPPER_VERSION=0.99.0
|
||||||
@@ -19,5 +19,6 @@ target 'drip' do
|
|||||||
|
|
||||||
post_install do |installer|
|
post_install do |installer|
|
||||||
react_native_post_install(installer)
|
react_native_post_install(installer)
|
||||||
|
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+2
-3
@@ -44,7 +44,7 @@
|
|||||||
"prop-types": "^15.8.1",
|
"prop-types": "^15.8.1",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
"react-i18next": "^11.18.3",
|
"react-i18next": "^11.18.3",
|
||||||
"react-native": "0.65.2",
|
"react-native": "0.66.4",
|
||||||
"react-native-calendars": "^1.1287.0",
|
"react-native-calendars": "^1.1287.0",
|
||||||
"react-native-document-picker": "^8.1.1",
|
"react-native-document-picker": "^8.1.1",
|
||||||
"react-native-fs": "^2.20.0",
|
"react-native-fs": "^2.20.0",
|
||||||
@@ -69,10 +69,9 @@
|
|||||||
"husky": "^8.0.0",
|
"husky": "^8.0.0",
|
||||||
"jest": "^28.1.3",
|
"jest": "^28.1.3",
|
||||||
"jetifier": "^1.6.6",
|
"jetifier": "^1.6.6",
|
||||||
"metro-react-native-babel-preset": "^0.66.0",
|
"metro-react-native-babel-preset": "^0.66.2",
|
||||||
"prettier": "2.4.0",
|
"prettier": "2.4.0",
|
||||||
"pretty-quick": "^3.1.1",
|
"pretty-quick": "^3.1.1",
|
||||||
"react-native-codegen": "^0.0.7",
|
|
||||||
"react-native-version": "^3.1.0",
|
"react-native-version": "^3.1.0",
|
||||||
"readline": "^1.3.0"
|
"readline": "^1.3.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1690,10 +1690,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-1.0.0.tgz#c52a99d4fe01049102d47dc45d40cbde4f720ab6"
|
resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-1.0.0.tgz#c52a99d4fe01049102d47dc45d40cbde4f720ab6"
|
||||||
integrity sha512-xUNRvNmCl3UGCPbbHvfyFMnpvLPoOjDCcp5bT9m2k+TF/ZBklEQwhPZlkrxRx2NhgFh1X3a5uL7mJ7ZR+8G7Qg==
|
integrity sha512-xUNRvNmCl3UGCPbbHvfyFMnpvLPoOjDCcp5bT9m2k+TF/ZBklEQwhPZlkrxRx2NhgFh1X3a5uL7mJ7ZR+8G7Qg==
|
||||||
|
|
||||||
"@react-native/polyfills@1.0.0":
|
"@react-native/polyfills@2.0.0":
|
||||||
version "1.0.0"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-1.0.0.tgz#05bb0031533598f9458cf65a502b8df0eecae780"
|
resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-2.0.0.tgz#4c40b74655c83982c8cf47530ee7dc13d957b6aa"
|
||||||
integrity sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==
|
integrity sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==
|
||||||
|
|
||||||
"@realm.io/common@^0.1.1":
|
"@realm.io/common@^0.1.1":
|
||||||
version "0.1.1"
|
version "0.1.1"
|
||||||
@@ -4098,10 +4098,10 @@ has@^1.0.3:
|
|||||||
dependencies:
|
dependencies:
|
||||||
function-bind "^1.1.1"
|
function-bind "^1.1.1"
|
||||||
|
|
||||||
hermes-engine@~0.8.1:
|
hermes-engine@~0.9.0:
|
||||||
version "0.8.1"
|
version "0.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.8.1.tgz#b6d0d70508ac5add2d198304502fb968cdecb8b2"
|
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.9.0.tgz#84d9cfe84e8f6b1b2020d6e71b350cec84ed982f"
|
||||||
integrity sha512-as9Iccj/qrqqtDmfYUHbOIjt5xsQbUB6pjNIW3i1+RVr+pCAdz5S8/Jry778mz3rJWplYzHWdR1u1xQSYfBRYw==
|
integrity sha512-r7U+Y4P2Qg/igFVZN+DpT7JFfXUn1MM4dFne8aW+cCrF6RRymof+VqrUHs1kl07j8h8V2CNesU19RKgWbr3qPw==
|
||||||
|
|
||||||
hermes-parser@0.4.7:
|
hermes-parser@0.4.7:
|
||||||
version "0.4.7"
|
version "0.4.7"
|
||||||
@@ -5623,7 +5623,7 @@ metro-minify-uglify@0.66.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
uglify-es "^3.1.9"
|
uglify-es "^3.1.9"
|
||||||
|
|
||||||
metro-react-native-babel-preset@0.66.2, metro-react-native-babel-preset@^0.66.0:
|
metro-react-native-babel-preset@0.66.2, metro-react-native-babel-preset@^0.66.2:
|
||||||
version "0.66.2"
|
version "0.66.2"
|
||||||
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.66.2.tgz#fddebcf413ad4ea617d4f47f7c1da401052de734"
|
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.66.2.tgz#fddebcf413ad4ea617d4f47f7c1da401052de734"
|
||||||
integrity sha512-H/nLBAz0MgfDloSe1FjyH4EnbokHFdncyERvLPXDACY3ROVRCeUyFNo70ywRGXW2NMbrV4H7KUyU4zkfWhC2HQ==
|
integrity sha512-H/nLBAz0MgfDloSe1FjyH4EnbokHFdncyERvLPXDACY3ROVRCeUyFNo70ywRGXW2NMbrV4H7KUyU4zkfWhC2HQ==
|
||||||
@@ -6758,7 +6758,7 @@ rc@^1.2.7:
|
|||||||
minimist "^1.2.0"
|
minimist "^1.2.0"
|
||||||
strip-json-comments "~2.0.1"
|
strip-json-comments "~2.0.1"
|
||||||
|
|
||||||
react-devtools-core@^4.6.0:
|
react-devtools-core@^4.13.0:
|
||||||
version "4.25.0"
|
version "4.25.0"
|
||||||
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.25.0.tgz#78b11a2c9f81dd9ebff3745ab4ee2147cc96c12a"
|
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.25.0.tgz#78b11a2c9f81dd9ebff3745ab4ee2147cc96c12a"
|
||||||
integrity sha512-iewRrnu0ZnmfL+jJayKphXj04CFh6i3ezVnpCtcnZbTPSQgN09XqHAzXbKbqNDl7aTg9QLNkQRP6M3DvdrinWA==
|
integrity sha512-iewRrnu0ZnmfL+jJayKphXj04CFh6i3ezVnpCtcnZbTPSQgN09XqHAzXbKbqNDl7aTg9QLNkQRP6M3DvdrinWA==
|
||||||
@@ -6898,10 +6898,10 @@ react-native-version@^3.1.0:
|
|||||||
resolve-from "^5.0.0"
|
resolve-from "^5.0.0"
|
||||||
semver "^6.0.0"
|
semver "^6.0.0"
|
||||||
|
|
||||||
react-native@0.65.2:
|
react-native@0.66.4:
|
||||||
version "0.65.2"
|
version "0.66.4"
|
||||||
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.65.2.tgz#5d580ffe7b64c4966e6178a910aeefd3b40d4fdb"
|
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.66.4.tgz#bf89a5fb18bd23046d889fb4de4ea2822a4d7805"
|
||||||
integrity sha512-0pzZFmSv38691PB2Zj2JE3x+57a8vdgGeUw2ai0MR3p6psdRes3BBR8miEv/gB7fgFKNDKdRJGDuyFVioKN1jA==
|
integrity sha512-9vx5dlSfQlKbbDtr8+xMon6qsmSu7jvjdXWZpEKh3XVKpUidbbODv7048gwVKX8YAel1egeR7hN8vzSeI6ssTw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@jest/create-cache-key-function" "^27.0.1"
|
"@jest/create-cache-key-function" "^27.0.1"
|
||||||
"@react-native-community/cli" "^6.0.0"
|
"@react-native-community/cli" "^6.0.0"
|
||||||
@@ -6909,12 +6909,12 @@ react-native@0.65.2:
|
|||||||
"@react-native-community/cli-platform-ios" "^6.0.0"
|
"@react-native-community/cli-platform-ios" "^6.0.0"
|
||||||
"@react-native/assets" "1.0.0"
|
"@react-native/assets" "1.0.0"
|
||||||
"@react-native/normalize-color" "1.0.0"
|
"@react-native/normalize-color" "1.0.0"
|
||||||
"@react-native/polyfills" "1.0.0"
|
"@react-native/polyfills" "2.0.0"
|
||||||
abort-controller "^3.0.0"
|
abort-controller "^3.0.0"
|
||||||
anser "^1.4.9"
|
anser "^1.4.9"
|
||||||
base64-js "^1.1.2"
|
base64-js "^1.1.2"
|
||||||
event-target-shim "^5.0.1"
|
event-target-shim "^5.0.1"
|
||||||
hermes-engine "~0.8.1"
|
hermes-engine "~0.9.0"
|
||||||
invariant "^2.2.4"
|
invariant "^2.2.4"
|
||||||
jsc-android "^250230.2.1"
|
jsc-android "^250230.2.1"
|
||||||
metro-babel-register "0.66.2"
|
metro-babel-register "0.66.2"
|
||||||
@@ -6925,7 +6925,8 @@ react-native@0.65.2:
|
|||||||
pretty-format "^26.5.2"
|
pretty-format "^26.5.2"
|
||||||
promise "^8.0.3"
|
promise "^8.0.3"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
react-devtools-core "^4.6.0"
|
react-devtools-core "^4.13.0"
|
||||||
|
react-native-codegen "^0.0.7"
|
||||||
react-refresh "^0.4.0"
|
react-refresh "^0.4.0"
|
||||||
regenerator-runtime "^0.13.2"
|
regenerator-runtime "^0.13.2"
|
||||||
scheduler "^0.20.2"
|
scheduler "^0.20.2"
|
||||||
|
|||||||
Reference in New Issue
Block a user