diff --git a/.flowconfig b/.flowconfig index e408c9a58..e3c6ec8a7 100644 --- a/.flowconfig +++ b/.flowconfig @@ -28,6 +28,9 @@ node_modules/react-native/Libraries/polyfills/.* .*/node_modules/@react-native/community-cli-plugin/dist/commands/bundle/index.js.flow .*/node_modules/@react-native/community-cli-plugin/dist/commands/bundle/buildBundle.js.flow .*/node_modules/metro/src/lib/JsonReporter.js.flow +.*/node_modules/hermes-estree/dist/generated/predicates.js.flow +.*/node_modules/react-native/Libraries/StyleSheet/StyleSheetTypes.js +.*/node_modules/react-native/Libraries/Types/ReactDevToolsTypes.js [untyped] .*/node_modules/@react-native-community/cli/.*/.* diff --git a/.gitignore b/.gitignore index 8cfb85237..d6513f6fd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ DerivedData *.ipa *.xcuserstate # Might be used to customize further the path to node that xcode uses, see .xcode.env for our version controlled file -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -47,7 +47,7 @@ yarn-error.log *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ # Temporary files created by Metro to check the health of the file watcher @@ -59,6 +59,14 @@ yarn-error.log # Jest Coverage /coverage +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions + # Secrets file .env* diff --git a/Gemfile b/Gemfile index d6f6463ca..5c69527e9 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ ruby ">= 2.6.10" # bound in the template on Cocoapods with next React Native release. gem "activesupport", ">= 6.1.7.5", "< 7.1.0" gem "cocoapods", ">= 1.13", "< 1.15" +gem "concurrent-ruby", "<= 1.3.4" gem "xcodeproj", "< 1.26.0" gem "fastlane" diff --git a/Gemfile.lock b/Gemfile.lock index 43ea841c5..e46b8cbaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,6 +315,7 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, < 7.1.0) cocoapods (>= 1.13, < 1.15) + concurrent-ruby (<= 1.3.4) fastlane fastlane-sirp! nokogiri diff --git a/android/app/build.gradle b/android/app/build.gradle index 8ae556ba9..eab4ad540 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -162,7 +162,6 @@ dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - implementation("com.facebook.react:flipper-integration") // This is required for getAttributes() to work in Detox on Android: // https://github.com/wix/Detox/issues/3147 diff --git a/android/app/src/main/java/com/inaturalistreactnative/MainApplication.kt b/android/app/src/main/java/com/inaturalistreactnative/MainApplication.kt index 3979fef89..13ccefbb0 100644 --- a/android/app/src/main/java/com/inaturalistreactnative/MainApplication.kt +++ b/android/app/src/main/java/com/inaturalistreactnative/MainApplication.kt @@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost -import com.facebook.react.flipper.ReactNativeFlipper import com.facebook.soloader.SoLoader class MainApplication : Application(), ReactApplication { @@ -31,7 +30,7 @@ class MainApplication : Application(), ReactApplication { } override val reactHost: ReactHost - get() = getDefaultReactHost(this.applicationContext, reactNativeHost) + get() = getDefaultReactHost(applicationContext, reactNativeHost) override fun onCreate() { super.onCreate() @@ -40,6 +39,5 @@ class MainApplication : Application(), ReactApplication { // If you opted-in for the New Architecture, we load the native entry point for this app. load() } - ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) } } diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml index 2d4efe7bb..81a57ff0d 100644 --- a/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -17,7 +17,8 @@ android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material" android:insetRight="@dimen/abc_edit_text_inset_horizontal_material" android:insetTop="@dimen/abc_edit_text_inset_top_material" - android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >