From cc847e3cfb376f55ee3626821ff4631410f54809 Mon Sep 17 00:00:00 2001 From: HermanKhodyrevBanubaTechSupport Date: Fri, 6 Sep 2024 15:21:43 +0300 Subject: [PATCH] Update project to React Native 0.75.2 --- .gitignore | 12 +- Gemfile | 5 +- README.md | 7 +- android/app/build.gradle | 23 +- .../MainApplication.kt | 4 +- .../res/drawable/rn_edit_text_material.xml | 3 +- android/build.gradle | 2 +- android/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/gradlew | 16 +- android/gradlew.bat | 20 +- android/settings.gradle | 4 +- babel.config.js | 4 +- ios/AppDelegate.swift | 4 +- ios/Podfile | 3 +- ios/Podfile.lock | 1414 -- .../project.pbxproj | 31 +- .../Info.plist | 4 +- package-lock.json | 12456 ++++++------ package.json | 16 +- yarn.lock | 15668 +++++++--------- 21 files changed, 12349 insertions(+), 17354 deletions(-) delete mode 100644 ios/Podfile.lock diff --git a/.gitignore b/.gitignore index 55fc6b0..dd9ad22 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -60,5 +60,13 @@ buck-out/ *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ + +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions \ No newline at end of file diff --git a/Gemfile b/Gemfile index 82ee969..2a7ce35 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,6 @@ 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.15.2' -gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' +# Exclude problematic versions of cocoapods and activesupport that causes build failures. +gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' +gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' diff --git a/README.md b/README.md index 2372974..218334d 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,10 @@ Set Banuba license token [within the app](App.js#L13). 4. Follow [Video Editor](mddocs/quickstart_ve_ios.md) and [Photo Editor](mddocs/quickstart_pe_ios.md) quickstart guides to quickly integrate Video and Photo Editor SDK into your React Native project on iOS. ## Dependencies -| | Version | + +| | Version | |--------------|:-------:| | Yarn | 4.1.1 | -| React Native | 0.73.5 | +| React Native | 0.75.2 | | Android | 6.0+ | -| iOS | 14.0+ | +| iOS | 15.0+ | diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a516ec..ddf04f3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,14 +15,14 @@ apply plugin: "com.facebook.react" react { /* Folders */ - // The root of your project, i.e. where "package.json" lives. Default is '..' - // root = file("../") - // The folder where the react-native NPM package is. Default is ../node_modules/react-native - // reactNativeDir = file("../node_modules/react-native") - // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen - // codegenDir = file("../node_modules/@react-native/codegen") - // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js - // cliFile = file("../node_modules/react-native/cli.js") + // The root of your project, i.e. where "package.json" lives. Default is '../..' + // root = file("../../") + // The folder where the react-native NPM package is. Default is ../../node_modules/react-native + // reactNativeDir = file("../../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen + // codegenDir = file("../../node_modules/@react-native/codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js + // cliFile = file("../../node_modules/react-native/cli.js") /* Variants */ // The list of variants to that are debuggable. For those we're going to // skip the bundling of the JS bundle and the assets. By default is just 'debug'. @@ -53,6 +53,9 @@ react { // // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" // hermesFlags = ["-O", "-output-source-map"] + + /* Autolinking */ + autolinkLibrariesWithApp() } @@ -131,7 +134,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") @@ -166,6 +168,3 @@ dependencies { def banubaPESdkVersion = '1.2.5' implementation "com.banuba.sdk:pe-sdk:${banubaPESdkVersion}" } - -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - diff --git a/android/app/src/main/java/com/vesdkreactnativecliintegrationsample/MainApplication.kt b/android/app/src/main/java/com/vesdkreactnativecliintegrationsample/MainApplication.kt index c4ce179..96f7ba1 100644 --- a/android/app/src/main/java/com/vesdkreactnativecliintegrationsample/MainApplication.kt +++ b/android/app/src/main/java/com/vesdkreactnativecliintegrationsample/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 import com.rndiffapp.BuildConfig @@ -34,7 +33,7 @@ class MainApplication : Application(), ReactApplication { } override val reactHost: ReactHost - get() = getDefaultReactHost(this.applicationContext, reactNativeHost) + get() = getDefaultReactHost(applicationContext, reactNativeHost) override fun onCreate() { super.onCreate() @@ -43,6 +42,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 f35d996..650a08a 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" + >