Upgrade react-native
This commit is contained in:
parent
0bc92e1539
commit
b46f6c8d64
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -30,6 +30,7 @@ build/
|
||||||
local.properties
|
local.properties
|
||||||
*.iml
|
*.iml
|
||||||
*.hprof
|
*.hprof
|
||||||
|
.cxx/
|
||||||
|
|
||||||
# node.js
|
# node.js
|
||||||
#
|
#
|
||||||
|
|
1
.node-version
Normal file
1
.node-version
Normal file
|
@ -0,0 +1 @@
|
||||||
|
16
|
7
android/app/src/main/jni/CMakeLists.txt
Normal file
7
android/app/src/main/jni/CMakeLists.txt
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
cmake_minimum_required(VERSION 3.13)
|
||||||
|
|
||||||
|
# Define the library name here.
|
||||||
|
project(rndiffapp_appmodules)
|
||||||
|
|
||||||
|
# This file includes all the necessary to let you build your application with the New Architecture.
|
||||||
|
include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
|
|
@ -1,12 +1,13 @@
|
||||||
#include "MainApplicationModuleProvider.h"
|
#include "MainApplicationModuleProvider.h"
|
||||||
|
|
||||||
|
#include <rncli.h>
|
||||||
#include <rncore.h>
|
#include <rncore.h>
|
||||||
|
|
||||||
namespace facebook {
|
namespace facebook {
|
||||||
namespace react {
|
namespace react {
|
||||||
|
|
||||||
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
|
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
|
||||||
const std::string moduleName,
|
const std::string &moduleName,
|
||||||
const JavaTurboModule::InitParams ¶ms) {
|
const JavaTurboModule::InitParams ¶ms) {
|
||||||
// Here you can provide your own module provider for TurboModules coming from
|
// Here you can provide your own module provider for TurboModules coming from
|
||||||
// either your application or from external libraries. The approach to follow
|
// either your application or from external libraries. The approach to follow
|
||||||
|
@ -17,6 +18,13 @@ std::shared_ptr<TurboModule> MainApplicationModuleProvider(
|
||||||
// return module;
|
// return module;
|
||||||
// }
|
// }
|
||||||
// return rncore_ModuleProvider(moduleName, params);
|
// return rncore_ModuleProvider(moduleName, params);
|
||||||
|
|
||||||
|
// Module providers autolinked by RN CLI
|
||||||
|
auto rncli_module = rncli_ModuleProvider(moduleName, params);
|
||||||
|
if (rncli_module != nullptr) {
|
||||||
|
return rncli_module;
|
||||||
|
}
|
||||||
|
|
||||||
return rncore_ModuleProvider(moduleName, params);
|
return rncore_ModuleProvider(moduleName, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ namespace facebook {
|
||||||
namespace react {
|
namespace react {
|
||||||
|
|
||||||
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
|
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
|
||||||
const std::string moduleName,
|
const std::string &moduleName,
|
||||||
const JavaTurboModule::InitParams ¶ms);
|
const JavaTurboModule::InitParams ¶ms);
|
||||||
|
|
||||||
} // namespace react
|
} // namespace react
|
||||||
|
|
|
@ -22,21 +22,21 @@ void MainApplicationTurboModuleManagerDelegate::registerNatives() {
|
||||||
|
|
||||||
std::shared_ptr<TurboModule>
|
std::shared_ptr<TurboModule>
|
||||||
MainApplicationTurboModuleManagerDelegate::getTurboModule(
|
MainApplicationTurboModuleManagerDelegate::getTurboModule(
|
||||||
const std::string name,
|
const std::string &name,
|
||||||
const std::shared_ptr<CallInvoker> jsInvoker) {
|
const std::shared_ptr<CallInvoker> &jsInvoker) {
|
||||||
// Not implemented yet: provide pure-C++ NativeModules here.
|
// Not implemented yet: provide pure-C++ NativeModules here.
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<TurboModule>
|
std::shared_ptr<TurboModule>
|
||||||
MainApplicationTurboModuleManagerDelegate::getTurboModule(
|
MainApplicationTurboModuleManagerDelegate::getTurboModule(
|
||||||
const std::string name,
|
const std::string &name,
|
||||||
const JavaTurboModule::InitParams ¶ms) {
|
const JavaTurboModule::InitParams ¶ms) {
|
||||||
return MainApplicationModuleProvider(name, params);
|
return MainApplicationModuleProvider(name, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
|
bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
|
||||||
std::string name) {
|
const std::string &name) {
|
||||||
return getTurboModule(name, nullptr) != nullptr ||
|
return getTurboModule(name, nullptr) != nullptr ||
|
||||||
getTurboModule(name, {.moduleName = name}) != nullptr;
|
getTurboModule(name, {.moduleName = name}) != nullptr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,17 +21,17 @@ class MainApplicationTurboModuleManagerDelegate
|
||||||
static void registerNatives();
|
static void registerNatives();
|
||||||
|
|
||||||
std::shared_ptr<TurboModule> getTurboModule(
|
std::shared_ptr<TurboModule> getTurboModule(
|
||||||
const std::string name,
|
const std::string &name,
|
||||||
const std::shared_ptr<CallInvoker> jsInvoker) override;
|
const std::shared_ptr<CallInvoker> &jsInvoker) override;
|
||||||
std::shared_ptr<TurboModule> getTurboModule(
|
std::shared_ptr<TurboModule> getTurboModule(
|
||||||
const std::string name,
|
const std::string &name,
|
||||||
const JavaTurboModule::InitParams ¶ms) override;
|
const JavaTurboModule::InitParams ¶ms) override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test-only method. Allows user to verify whether a TurboModule can be
|
* Test-only method. Allows user to verify whether a TurboModule can be
|
||||||
* created by instances of this class.
|
* created by instances of this class.
|
||||||
*/
|
*/
|
||||||
bool canCreateTurboModule(std::string name);
|
bool canCreateTurboModule(const std::string &name);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace react
|
} // namespace react
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include <fbjni/fbjni.h>
|
#include <fbjni/fbjni.h>
|
||||||
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
|
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
|
||||||
#include <react/renderer/components/rncore/ComponentDescriptors.h>
|
#include <react/renderer/components/rncore/ComponentDescriptors.h>
|
||||||
|
#include <rncli.h>
|
||||||
|
|
||||||
namespace facebook {
|
namespace facebook {
|
||||||
namespace react {
|
namespace react {
|
||||||
|
@ -14,6 +15,9 @@ std::shared_ptr<ComponentDescriptorProviderRegistry const>
|
||||||
MainComponentsRegistry::sharedProviderRegistry() {
|
MainComponentsRegistry::sharedProviderRegistry() {
|
||||||
auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
|
auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
|
||||||
|
|
||||||
|
// Autolinked providers registered by RN CLI
|
||||||
|
rncli_registerProviders(providerRegistry);
|
||||||
|
|
||||||
// Custom Fabric Components go here. You can register custom
|
// Custom Fabric Components go here. You can register custom
|
||||||
// components coming from your App or from 3rd party libraries here.
|
// components coming from your App or from 3rd party libraries here.
|
||||||
//
|
//
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
import org.apache.tools.ant.taskdefs.condition.Os
|
|
||||||
|
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
|
@ -23,7 +21,7 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath('com.android.tools.build:gradle:7.2.1')
|
classpath("com.android.tools.build:gradle:7.2.1")
|
||||||
classpath("com.facebook.react:react-native-gradle-plugin")
|
classpath("com.facebook.react:react-native-gradle-plugin")
|
||||||
classpath("de.undercouch:gradle-download-task:5.0.1")
|
classpath("de.undercouch:gradle-download-task:5.0.1")
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
BIN
android/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
android/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
24
ios/Podfile
24
ios/Podfile
|
@ -12,9 +12,16 @@ target 'massive' do
|
||||||
|
|
||||||
use_react_native!(
|
use_react_native!(
|
||||||
:path => config[:reactNativePath],
|
:path => config[:reactNativePath],
|
||||||
# to enable hermes on iOS, change `false` to `true` and then install pods
|
# Hermes is now enabled by default. Disable by setting this flag to false.
|
||||||
:hermes_enabled => flags[:hermes_enabled],
|
# Upcoming versions of React Native may rely on get_default_flags(), but
|
||||||
|
# we make it explicit here to aid in the React Native upgrade process.
|
||||||
|
:hermes_enabled => true,
|
||||||
:fabric_enabled => flags[:fabric_enabled],
|
:fabric_enabled => flags[:fabric_enabled],
|
||||||
|
# Enables Flipper.
|
||||||
|
#
|
||||||
|
# Note that if you have use_frameworks! enabled, Flipper will not work and
|
||||||
|
# you should disable the next line.
|
||||||
|
:flipper_configuration => FlipperConfiguration.enabled,
|
||||||
# An absolute path to your application root.
|
# An absolute path to your application root.
|
||||||
:app_path => "#{Pod::Config.instance.installation_root}/.."
|
:app_path => "#{Pod::Config.instance.installation_root}/.."
|
||||||
)
|
)
|
||||||
|
@ -24,14 +31,13 @@ target 'massive' do
|
||||||
# Pods for testing
|
# Pods for testing
|
||||||
end
|
end
|
||||||
|
|
||||||
# Enables Flipper.
|
|
||||||
#
|
|
||||||
# Note that if you have use_frameworks! enabled, Flipper will not work and
|
|
||||||
# you should disable the next line.
|
|
||||||
use_flipper!()
|
|
||||||
|
|
||||||
post_install do |installer|
|
post_install do |installer|
|
||||||
react_native_post_install(installer)
|
react_native_post_install(
|
||||||
|
installer,
|
||||||
|
# Set `mac_catalyst_enabled` to `true` in order to apply patches
|
||||||
|
# necessary for Mac Catalyst builds
|
||||||
|
:mac_catalyst_enabled => false
|
||||||
|
)
|
||||||
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -562,7 +562,7 @@
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
ENABLE_TESTABILITY = YES;
|
ENABLE_TESTABILITY = YES;
|
||||||
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
|
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
|
||||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_NO_COMMON_BLOCKS = YES;
|
GCC_NO_COMMON_BLOCKS = YES;
|
||||||
|
@ -633,7 +633,7 @@
|
||||||
COPY_PHASE_STRIP = YES;
|
COPY_PHASE_STRIP = YES;
|
||||||
ENABLE_NS_ASSERTIONS = NO;
|
ENABLE_NS_ASSERTIONS = NO;
|
||||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
|
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
|
||||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||||
GCC_NO_COMMON_BLOCKS = YES;
|
GCC_NO_COMMON_BLOCKS = YES;
|
||||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
"@types/react-native-svg-charts": "^5.0.12",
|
"@types/react-native-svg-charts": "^5.0.12",
|
||||||
"@types/react-native-vector-icons": "^6.4.11",
|
"@types/react-native-vector-icons": "^6.4.11",
|
||||||
"babel-plugin-transform-remove-console": "^6.9.4",
|
"babel-plugin-transform-remove-console": "^6.9.4",
|
||||||
"react": "18.0.0",
|
"react": "18.1.0",
|
||||||
"react-native": "0.69.1",
|
"react-native": "0.70.1",
|
||||||
"react-native-document-picker": "^8.1.1",
|
"react-native-document-picker": "^8.1.1",
|
||||||
"react-native-file-access": "^2.4.3",
|
"react-native-file-access": "^2.4.3",
|
||||||
"react-native-gesture-handler": "^2.5.0",
|
"react-native-gesture-handler": "^2.5.0",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user