From efd1ddd8abfe1d3b7682e3d9992d933955f5c66d Mon Sep 17 00:00:00 2001 From: Ian Y Date: Thu, 13 Jun 2024 10:51:39 +0800 Subject: [PATCH 1/5] build: bump peerDep and example app to RN 0.74 --- example/App/example1.tsx | 7 +- example/Gemfile | 5 +- example/android/app/build.gradle | 1 - .../android/app/src/main/AndroidManifest.xml | 7 +- .../main/java/com/example/MainApplication.kt | 14 +- .../res/drawable/rn_edit_text_material.xml | 3 +- example/android/build.gradle | 8 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/gradlew | 14 +- example/android/gradlew.bat | 22 +- example/ios/Podfile | 18 +- example/ios/Podfile.lock | 978 ++++++++-------- example/ios/example.xcodeproj/project.pbxproj | 18 +- example/ios/example/AppDelegate.mm | 4 +- example/ios/example/Info.plist | 2 +- example/ios/example/PrivacyInfo.xcprivacy | 46 + example/metro.config.js | 2 +- example/package.json | 10 +- example/yarn.lock | 1040 ++++++++--------- package.json | 2 +- 20 files changed, 1127 insertions(+), 1076 deletions(-) create mode 100644 example/ios/example/PrivacyInfo.xcprivacy diff --git a/example/App/example1.tsx b/example/App/example1.tsx index eeaf840a..688ed1c8 100644 --- a/example/App/example1.tsx +++ b/example/App/example1.tsx @@ -60,11 +60,16 @@ const Example = () => { runStatus = `${runStatus}\n- Reading ArrayBuffer from "example1.txt"`; setResult(runStatus); - const arrayBuffer = await RNFS.readFile(readPath, 'arraybuffer'); + let osFilePath = readPath; + if (Platform.OS === 'android') { + osFilePath = `file://${readPath}`; + } + const arrayBuffer = await RNFS.readFile(osFilePath, 'arraybuffer'); if (typeof arrayBuffer !== 'string') { setResult(`${runStatus}\n- Got ArrayBuffer - Size: ${arrayBuffer.byteLength}`); } } catch (err) { + console.log(err); setResult('Error Running Example'); } finally { setRunningAction(false); diff --git a/example/Gemfile b/example/Gemfile index 1fa2c2e1..ec21e32c 100644 --- a/example/Gemfile +++ b/example/Gemfile @@ -3,4 +3,7 @@ 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.12' +# 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' \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 8a9f5226..96b6966c 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -110,7 +110,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") } else { diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 4122f36a..1dfa0ebc 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,10 @@ - + + { - // 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 +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 f35d9962..650a08a9 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" + >