diff --git a/apps/mobile/.flowconfig b/apps/mobile/.flowconfig index 786366c4f..9f05abe64 100644 --- a/apps/mobile/.flowconfig +++ b/apps/mobile/.flowconfig @@ -27,8 +27,7 @@ node_modules/react-native/flow/ [options] emoji=true -esproposal.optional_chaining=enable -esproposal.nullish_coalescing=enable +format.bracket_spacing=false module.file_ext=.js module.file_ext=.json @@ -71,4 +70,4 @@ untyped-import untyped-type-import [version] -^0.113.0 +^0.158.0 diff --git a/apps/mobile/.gitignore b/apps/mobile/.gitignore index fab1d45bc..f8823fcf6 100644 --- a/apps/mobile/.gitignore +++ b/apps/mobile/.gitignore @@ -20,7 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate - +*.hprof # Android/IntelliJ # build/ diff --git a/apps/mobile/android/app/src/main/res/values/styles.xml b/apps/mobile/android/app/src/main/res/values/styles.xml index 5f3c23bf9..77124548f 100644 --- a/apps/mobile/android/app/src/main/res/values/styles.xml +++ b/apps/mobile/android/app/src/main/res/values/styles.xml @@ -3,7 +3,6 @@ diff --git a/apps/mobile/android/gradle.properties b/apps/mobile/android/gradle.properties index 9b99c98fb..30f0c824f 100644 --- a/apps/mobile/android/gradle.properties +++ b/apps/mobile/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.75.1 +FLIPPER_VERSION=0.99.0 diff --git a/apps/mobile/android/gradle/wrapper/gradle-wrapper.properties b/apps/mobile/android/gradle/wrapper/gradle-wrapper.properties index 14e30f741..7665b0fa9 100644 --- a/apps/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/apps/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/apps/mobile/ios/Podfile b/apps/mobile/ios/Podfile index 199d0d0bd..39fbeb03f 100644 --- a/apps/mobile/ios/Podfile +++ b/apps/mobile/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' 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' @@ -59,6 +59,7 @@ end post_install do |installer| react_native_post_install(installer) + __apply_Xcode_12_5_M1_post_install_workaround(installer) installer.pods_project.targets.each do |target| target.build_configurations.each do |config| config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'NO' diff --git a/apps/mobile/patches/react-native+0.64.2.patch b/apps/mobile/patches/react-native+0.66.1.patch similarity index 94% rename from apps/mobile/patches/react-native+0.64.2.patch rename to apps/mobile/patches/react-native+0.66.1.patch index 6e69f6bd9..83ab3c921 100644 --- a/apps/mobile/patches/react-native+0.64.2.patch +++ b/apps/mobile/patches/react-native+0.66.1.patch @@ -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 -index c52f449..9075edd 100644 +index 5fa44b5..af6d7be 100644 --- a/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); // Calculate the snap offsets adjacent to the initial offset target