mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-23 15:09:33 +01:00
upgrade to react-native 0.66.1
This commit is contained in:
@@ -27,8 +27,7 @@ node_modules/react-native/flow/
|
|||||||
[options]
|
[options]
|
||||||
emoji=true
|
emoji=true
|
||||||
|
|
||||||
esproposal.optional_chaining=enable
|
format.bracket_spacing=false
|
||||||
esproposal.nullish_coalescing=enable
|
|
||||||
|
|
||||||
module.file_ext=.js
|
module.file_ext=.js
|
||||||
module.file_ext=.json
|
module.file_ext=.json
|
||||||
@@ -71,4 +70,4 @@ untyped-import
|
|||||||
untyped-type-import
|
untyped-type-import
|
||||||
|
|
||||||
[version]
|
[version]
|
||||||
^0.113.0
|
^0.158.0
|
||||||
|
|||||||
2
apps/mobile/.gitignore
vendored
2
apps/mobile/.gitignore
vendored
@@ -20,7 +20,7 @@ DerivedData
|
|||||||
*.hmap
|
*.hmap
|
||||||
*.ipa
|
*.ipa
|
||||||
*.xcuserstate
|
*.xcuserstate
|
||||||
|
*.hprof
|
||||||
# Android/IntelliJ
|
# Android/IntelliJ
|
||||||
#
|
#
|
||||||
build/
|
build/
|
||||||
|
|||||||
@@ -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="android:windowDisablePreview">true</item>
|
<item name="android:windowDisablePreview">true</item>
|
||||||
<item name="android:editTextBackground">@drawable/edit_text</item>
|
<item name="android:editTextBackground">@drawable/edit_text</item>
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -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.75.1
|
FLIPPER_VERSION=0.99.0
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
require_relative '../node_modules/react-native/scripts/react_native_pods'
|
require_relative '../node_modules/react-native/scripts/react_native_pods'
|
||||||
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
||||||
|
|
||||||
platform :ios, '10.0'
|
platform :ios, '11.0'
|
||||||
|
|
||||||
permissions_path = '../node_modules/react-native-permissions/ios'
|
permissions_path = '../node_modules/react-native-permissions/ios'
|
||||||
|
|
||||||
@@ -59,6 +59,7 @@ end
|
|||||||
|
|
||||||
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)
|
||||||
installer.pods_project.targets.each do |target|
|
installer.pods_project.targets.each do |target|
|
||||||
target.build_configurations.each do |config|
|
target.build_configurations.each do |config|
|
||||||
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
|
config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO'
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
diff --git a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
||||||
index c52f449..9075edd 100644
|
index 5fa44b5..af6d7be 100644
|
||||||
--- a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
--- a/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
||||||
+++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
+++ b/node_modules/react-native/React/Views/ScrollView/RCTScrollView.m
|
||||||
@@ -624,7 +624,18 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
|
@@ -623,7 +623,18 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView
|
||||||
: MAX(0, _scrollView.contentSize.height - viewportSize.height);
|
: MAX(0, _scrollView.contentSize.height - viewportSize.height);
|
||||||
|
|
||||||
// Calculate the snap offsets adjacent to the initial offset target
|
// Calculate the snap offsets adjacent to the initial offset target
|
||||||
Reference in New Issue
Block a user