From d148490da0725eb37487a2973e18b863174053e1 Mon Sep 17 00:00:00 2001 From: Miha Drofenik Date: Fri, 6 Dec 2024 14:21:41 +0100 Subject: [PATCH] chore/upgrade-react-native-to-0.74.6 --- .gitignore | 4 +- Gemfile | 7 +- Gemfile.lock | 4 +- android/app/build.gradle | 1 - android/app/src/main/AndroidManifest.xml | 3 +- .../wildlifewatcher/MainApplication.kt | 16 +- .../res/drawable/rn_edit_text_material.xml | 3 +- android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/gradlew | 14 +- android/gradlew.bat | 20 +- ios/Podfile | 19 +- ios/Podfile.lock | 1164 +- ios/WildlifeWatcher.xcodeproj/project.pbxproj | 26 +- ios/WildlifeWatcher/AppDelegate.mm | 4 +- ios/WildlifeWatcher/Info.plist | 2 +- ios/WildlifeWatcher/PrivacyInfo.xcprivacy | 47 + metro.config.js | 8 +- package-lock.json | 14904 +++++++--------- package.json | 16 +- 20 files changed, 7677 insertions(+), 8593 deletions(-) create mode 100644 ios/WildlifeWatcher/PrivacyInfo.xcprivacy diff --git a/.gitignore b/.gitignore index 2c00573..901ddda 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ DerivedData *.hmap *.ipa *.xcuserstate -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -64,7 +64,7 @@ yarn-error.log *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /ios/ipa/ /ios/logs/ /vendor/bundle/ diff --git a/Gemfile b/Gemfile index 33df3ec..6cdcc82 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,11 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 2.6.10" -gem 'cocoapods', '~> 1.13' -gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' +# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper +# bound in the template on Cocoapods with next React Native release. +gem 'cocoapods', '>= 1.13', '< 1.15' +gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' + gem "fastlane" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock index cb44453..fa65d8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,8 +280,8 @@ PLATFORMS ruby DEPENDENCIES - activesupport (>= 6.1.7.3, < 7.1.0) - cocoapods (~> 1.13) + activesupport (>= 6.1.7.5, < 7.1.0) + cocoapods (>= 1.13, < 1.15) fastlane fastlane-plugin-firebase_app_distribution fastlane-plugin-versioning_android diff --git a/android/app/build.gradle b/android/app/build.gradle index 105603c..c232e60 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -130,7 +130,6 @@ android { 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") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 910ad0f..b91d9e7 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -16,7 +16,8 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true"> { - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return PackageList(this).packages - } + override fun getPackages(): List = + PackageList(this).packages.apply { + // Packages that cannot be autolinked yet can be added manually here, for example: + // add(MyReactNativePackage()) + } override fun getJSMainModuleName(): String = "index" @@ -31,7 +31,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 +40,6 @@ 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) + OkHttpClientProvider.setOkHttpClientFactory(IgnoreSSLFactory()) } } 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 73b37e4..5c25e72 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" + >