From 28bbff001361e63c4bdc4af38cb2b7ff046669b5 Mon Sep 17 00:00:00 2001 From: Jakub Sys <32591413+MrRefactor@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:55:18 +0200 Subject: [PATCH] Update example app to RN 0.74.2 (#320) --- .gitignore | 9 +- example/Gemfile | 8 + example/Gemfile.lock | 133 ++ example/android/app/build.gradle | 1 - .../com/geolocationexample/MainApplication.kt | 4 +- .../res/drawable/rn_edit_text_material.xml | 3 +- example/android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/gradlew | 14 +- example/android/gradlew.bat | 20 +- .../project.pbxproj | 24 +- example/ios/GeolocationExample/AppDelegate.mm | 4 +- example/ios/GeolocationExample/Info.plist | 2 +- .../GeolocationExample/PrivacyInfo.xcprivacy | 37 + example/ios/Podfile | 24 +- example/ios/Podfile.lock | 887 +++++---- example/package.json | 14 +- example/patches/react-native+0.73.4.patch | 48 - example/yarn.lock | 1650 +++++++++++++---- metro.config.js | 2 +- 20 files changed, 2037 insertions(+), 855 deletions(-) create mode 100644 example/Gemfile create mode 100644 example/Gemfile.lock create mode 100644 example/ios/GeolocationExample/PrivacyInfo.xcprivacy delete mode 100644 example/patches/react-native+0.73.4.patch diff --git a/.gitignore b/.gitignore index 9c3e891..b021bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ DerivedData *.hmap *.ipa *.xcuserstate - # Android/IntelliJ build/ .idea @@ -56,3 +55,11 @@ android/keystores/debug.keystore # testing /coverage + +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions \ No newline at end of file diff --git a/example/Gemfile b/example/Gemfile new file mode 100644 index 0000000..b23a340 --- /dev/null +++ b/example/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version +ruby ">= 2.6.10" + +# 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' \ No newline at end of file diff --git a/example/Gemfile.lock b/example/Gemfile.lock new file mode 100644 index 0000000..762acc9 --- /dev/null +++ b/example/Gemfile.lock @@ -0,0 +1,133 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (7.1.3.4) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + base64 (0.2.0) + bigdecimal (3.1.8) + claide (1.1.0) + cocoapods (1.14.3) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.14.3) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.3) + activesupport (>= 5.0, < 8) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (2.1) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + drb (2.2.1) + escape (0.0.4) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.17.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + json (2.7.2) + minitest (5.24.0) + molinillo (0.8.0) + mutex_m (0.2.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + nkf (0.2.0) + public_suffix (4.0.7) + rexml (3.2.9) + strscan + ruby-macho (2.5.1) + strscan (3.1.0) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + +PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + cocoapods (>= 1.13, < 1.15) + +RUBY VERSION + ruby 3.3.0p0 + +BUNDLED WITH + 2.5.3 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 86a7003..6cc7eae 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -145,7 +145,6 @@ android { dependencies { implementation("com.facebook.react:react-android") - implementation("com.facebook.react:flipper-integration") implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" if (hermesEnabled.toBoolean()) { diff --git a/example/android/app/src/main/java/com/geolocationexample/MainApplication.kt b/example/android/app/src/main/java/com/geolocationexample/MainApplication.kt index ceddea5..51a4919 100644 --- a/example/android/app/src/main/java/com/geolocationexample/MainApplication.kt +++ b/example/android/app/src/main/java/com/geolocationexample/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/example/android/app/src/main/res/drawable/rn_edit_text_material.xml b/example/android/app/src/main/res/drawable/rn_edit_text_material.xml index f35d996..650a08a 100644 --- a/example/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/example/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" + >