From 8331e3bf754053996255a7e004296d1c6742edb0 Mon Sep 17 00:00:00 2001
From: jaywcjlove <398188662@qq.com>
Date: Fri, 5 Aug 2022 17:34:15 +0800
Subject: [PATCH] chore: update example & upgrade react-native to v0.69.3.
---
example/.flowconfig | 10 +-
example/.gitignore | 12 +-
example/.prettierrc.js | 4 +-
example/android/app/build.gradle | 127 +-
.../android/app/src/debug/AndroidManifest.xml | 2 +-
.../java/com/example/ReactNativeFlipper.java | 5 +-
.../android/app/src/main/AndroidManifest.xml | 5 +-
.../main/java/com/example/MainActivity.java | 33 +
.../java/com/example/MainApplication.java | 13 +-
.../MainApplicationReactNativeHost.java | 116 +
.../components/MainComponentsRegistry.java | 36 +
...ApplicationTurboModuleManagerDelegate.java | 48 +
example/android/app/src/main/jni/Android.mk | 48 +
.../jni/MainApplicationModuleProvider.cpp | 24 +
.../main/jni/MainApplicationModuleProvider.h | 16 +
...nApplicationTurboModuleManagerDelegate.cpp | 45 +
...ainApplicationTurboModuleManagerDelegate.h | 38 +
.../src/main/jni/MainComponentsRegistry.cpp | 61 +
.../app/src/main/jni/MainComponentsRegistry.h | 32 +
example/android/app/src/main/jni/OnLoad.cpp | 11 +
.../res/drawable/rn_edit_text_material.xml | 36 +
.../app/src/main/res/values/styles.xml | 2 +-
example/android/build.gradle | 33 +-
example/android/gradle.properties | 18 +-
.../android/gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 59536 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
example/android/gradlew | 269 +-
example/android/gradlew.bat | 1 +
example/android/settings.gradle | 8 +
example/ios/Podfile | 23 +-
example/ios/Podfile.lock | 750 +--
example/ios/_xcode.env | 11 +
example/ios/example.xcodeproj/project.pbxproj | 606 +-
example/ios/example/AppDelegate.m | 62 -
example/ios/example/AppDelegate.mm | 133 +
.../AppIcon.appiconset/Contents.json | 45 +-
example/ios/example/main.m | 3 +-
example/ios/exampleTests/exampleTests.m | 27 +-
example/package.json | 20 +-
example/yarn.lock | 5003 ++++++++---------
package.json | 8 +-
41 files changed, 4023 insertions(+), 3723 deletions(-)
create mode 100644 example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java
create mode 100644 example/android/app/src/main/java/com/example/newarchitecture/components/MainComponentsRegistry.java
create mode 100644 example/android/app/src/main/java/com/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
create mode 100644 example/android/app/src/main/jni/Android.mk
create mode 100644 example/android/app/src/main/jni/MainApplicationModuleProvider.cpp
create mode 100644 example/android/app/src/main/jni/MainApplicationModuleProvider.h
create mode 100644 example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
create mode 100644 example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
create mode 100644 example/android/app/src/main/jni/MainComponentsRegistry.cpp
create mode 100644 example/android/app/src/main/jni/MainComponentsRegistry.h
create mode 100644 example/android/app/src/main/jni/OnLoad.cpp
create mode 100644 example/android/app/src/main/res/drawable/rn_edit_text_material.xml
create mode 100644 example/ios/_xcode.env
delete mode 100644 example/ios/example/AppDelegate.m
create mode 100644 example/ios/example/AppDelegate.mm
diff --git a/example/.flowconfig b/example/.flowconfig
index 315f274..74f3a75 100644
--- a/example/.flowconfig
+++ b/example/.flowconfig
@@ -11,6 +11,8 @@ node_modules/react-native/Libraries/polyfills/.*
; Flow doesn't support platforms
.*/Libraries/Utilities/LoadingView.js
+.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
+
[untyped]
.*/node_modules/@react-native-community/cli/.*/.*
@@ -23,11 +25,10 @@ node_modules/react-native/flow/
[options]
emoji=true
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
exact_by_default=true
+format.bracket_spacing=false
+
module.file_ext=.js
module.file_ext=.json
module.file_ext=.ios.js
@@ -51,7 +52,6 @@ nonstrict-import=warn
deprecated-type=warn
unsafe-getters-setters=warn
unnecessary-invariant=warn
-signature-verification-failure=warn
[strict]
deprecated-type
@@ -63,4 +63,4 @@ untyped-import
untyped-type-import
[version]
-^0.137.0
+^0.176.3
diff --git a/example/.gitignore b/example/.gitignore
index ad572e6..344481b 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -20,6 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
+ios/.xcode.env.local
# Android/IntelliJ
#
@@ -28,6 +29,7 @@ build/
.gradle
local.properties
*.iml
+*.hprof
# node.js
#
@@ -48,12 +50,14 @@ buck-out/
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
# Bundle artifact
*.jsbundle
-# CocoaPods
+# Ruby / CocoaPods
/ios/Pods/
+/vendor/bundle/
diff --git a/example/.prettierrc.js b/example/.prettierrc.js
index 84196d9..2b54074 100644
--- a/example/.prettierrc.js
+++ b/example/.prettierrc.js
@@ -1,7 +1,7 @@
module.exports = {
+ arrowParens: 'avoid',
+ bracketSameLine: true,
bracketSpacing: false,
- jsxBracketSameLine: true,
singleQuote: true,
trailingComma: 'all',
- arrowParens: 'avoid',
};
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 7193751..5ab7690 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -114,19 +114,24 @@ def jscFlavor = 'org.webkit:android-jsc:+'
/**
* Whether to enable the Hermes VM.
*
- * This should be set on project.ext.react and mirrored here. If it is not set
+ * This should be set on project.ext.react and that value will be read here. If it is not set
* on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
* and the benefits of using Hermes will therefore be sharply reduced.
*/
def enableHermes = project.ext.react.get("enableHermes", false);
-android {
- compileSdkVersion rootProject.ext.compileSdkVersion
+/**
+ * Architectures to build native code for.
+ */
+def reactNativeArchitectures() {
+ def value = project.getProperties().get("reactNativeArchitectures")
+ return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
+android {
+ ndkVersion rootProject.ext.ndkVersion
+
+ compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.uiwjs.example.alipay"
@@ -134,13 +139,82 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
+ buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+ if (isNewArchitectureEnabled()) {
+ // We configure the NDK build only if you decide to opt-in for the New Architecture.
+ externalNativeBuild {
+ ndkBuild {
+ arguments "APP_PLATFORM=android-21",
+ "APP_STL=c++_shared",
+ "NDK_TOOLCHAIN_VERSION=clang",
+ "GENERATED_SRC_DIR=$buildDir/generated/source",
+ "PROJECT_BUILD_DIR=$buildDir",
+ "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+ "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+ "NODE_MODULES_DIR=$rootDir/../node_modules"
+ cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+ cppFlags "-std=c++17"
+ // Make sure this target name is the same you specify inside the
+ // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+ targets "example_appmodules"
+ }
+ }
+ if (!enableSeparateBuildPerCPUArchitecture) {
+ ndk {
+ abiFilters (*reactNativeArchitectures())
+ }
+ }
+ }
}
+
+ if (isNewArchitectureEnabled()) {
+ // We configure the NDK build only if you decide to opt-in for the New Architecture.
+ externalNativeBuild {
+ ndkBuild {
+ path "$projectDir/src/main/jni/Android.mk"
+ }
+ }
+ def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+ def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+ dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+ from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+ into("$buildDir/react-ndk/exported")
+ }
+ def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+ dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+ from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+ into("$buildDir/react-ndk/exported")
+ }
+ afterEvaluate {
+ // If you wish to add a custom TurboModule or component locally,
+ // you should uncomment this line.
+ // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+ preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+ preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+ // Due to a bug inside AGP, we have to explicitly set a dependency
+ // between configureNdkBuild* tasks and the preBuild tasks.
+ // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+ configureNdkBuildRelease.dependsOn(preReleaseBuild)
+ configureNdkBuildDebug.dependsOn(preDebugBuild)
+ reactNativeArchitectures().each { architecture ->
+ tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+ dependsOn("preDebugBuild")
+ }
+ tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+ dependsOn("preReleaseBuild")
+ }
+ }
+ }
+ }
+
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
- include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+ include (*reactNativeArchitectures())
}
}
signingConfigs {
@@ -169,6 +243,7 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// https://developer.android.com/studio/build/configure-apk-splits.html
+ // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
@@ -182,13 +257,14 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
+
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
- exclude group:'com.facebook.fbjni'
+ exclude group:'com.facebook.fbjni'
}
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
@@ -201,19 +277,44 @@ dependencies {
}
if (enableHermes) {
- def hermesPath = "../../node_modules/hermes-engine/android/";
- debugImplementation files(hermesPath + "hermes-debug.aar")
- releaseImplementation files(hermesPath + "hermes-release.aar")
+ //noinspection GradleDynamicVersion
+ implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+ exclude group:'com.facebook.fbjni'
+ }
} else {
implementation jscFlavor
}
}
+if (isNewArchitectureEnabled()) {
+ // If new architecture is enabled, we let you build RN from source
+ // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+ // This will be applied to all the imported transtitive dependency.
+ configurations.all {
+ resolutionStrategy.dependencySubstitution {
+ substitute(module("com.facebook.react:react-native"))
+ .using(project(":ReactAndroid"))
+ .because("On New Architecture we're building React Native from source")
+ substitute(module("com.facebook.react:hermes-engine"))
+ .using(project(":ReactAndroid:hermes-engine"))
+ .because("On New Architecture we're building Hermes from source")
+ }
+ }
+}
+
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
- from configurations.compile
+ from configurations.implementation
into 'libs'
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+ // To opt-in for the New Architecture, you can either:
+ // - Set `newArchEnabled` to true inside the `gradle.properties` file
+ // - Invoke gradle with `-newArchEnabled=true`
+ // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+ return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
index b2f3ad9..4b185bc 100644
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -8,6 +8,6 @@
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
-
+
diff --git a/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java b/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
index 24deb04..da48dd3 100644
--- a/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
+++ b/example/android/app/src/debug/java/com/example/ReactNativeFlipper.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
*
*
This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
@@ -19,6 +19,7 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
@@ -51,7 +52,7 @@ public class ReactNativeFlipper {
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
- new ReactInstanceManager.ReactInstanceEventListener() {
+ new ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 1b64a37..fb40640 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -13,9 +13,10 @@
+ android:windowSoftInputMode="adjustResize"
+ android:exported="true">
diff --git a/example/android/app/src/main/java/com/example/MainActivity.java b/example/android/app/src/main/java/com/example/MainActivity.java
index 9d26dd5..91da4be 100644
--- a/example/android/app/src/main/java/com/example/MainActivity.java
+++ b/example/android/app/src/main/java/com/example/MainActivity.java
@@ -1,6 +1,8 @@
package com.uiwjs.example.alipay;
import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
public class MainActivity extends ReactActivity {
@@ -12,4 +14,35 @@ public class MainActivity extends ReactActivity {
protected String getMainComponentName() {
return "example";
}
+
+ /**
+ * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
+ * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer
+ * (Paper).
+ */
+ @Override
+ protected ReactActivityDelegate createReactActivityDelegate() {
+ return new MainActivityDelegate(this, getMainComponentName());
+ }
+
+ public static class MainActivityDelegate extends ReactActivityDelegate {
+ public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
+ super(activity, mainComponentName);
+ }
+
+ @Override
+ protected ReactRootView createRootView() {
+ ReactRootView reactRootView = new ReactRootView(getContext());
+ // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+ reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+ return reactRootView;
+ }
+
+ @Override
+ protected boolean isConcurrentRootEnabled() {
+ // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
+ // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
+ return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+ }
+ }
}
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
index 5a9b52d..4ec2358 100644
--- a/example/android/app/src/main/java/com/example/MainApplication.java
+++ b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -7,7 +7,9 @@ import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.soloader.SoLoader;
+import com.uiwjs.example.alipay.newarchitecture.MainApplicationReactNativeHost;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -35,14 +37,23 @@ public class MainApplication extends Application implements ReactApplication {
}
};
+ private final ReactNativeHost mNewArchitectureNativeHost =
+ new MainApplicationReactNativeHost(this);
+
@Override
public ReactNativeHost getReactNativeHost() {
- return mReactNativeHost;
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ return mNewArchitectureNativeHost;
+ } else {
+ return mReactNativeHost;
+ }
}
@Override
public void onCreate() {
super.onCreate();
+ // If you opted-in for the New Architecture, we enable the TurboModule system
+ ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
SoLoader.init(this, /* native exopackage */ false);
initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
diff --git a/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java b/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java
new file mode 100644
index 0000000..8404480
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/newarchitecture/MainApplicationReactNativeHost.java
@@ -0,0 +1,116 @@
+package com.uiwjs.example.alipay.newarchitecture;
+
+import android.app.Application;
+import androidx.annotation.NonNull;
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleProvider;
+import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.react.fabric.CoreComponentsRegistry;
+import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.uiwjs.example.alipay.BuildConfig;
+import com.uiwjs.example.alipay.newarchitecture.components.MainComponentsRegistry;
+import com.uiwjs.example.alipay.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
+ * TurboModule delegates and the Fabric Renderer.
+ *
+ * Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationReactNativeHost extends ReactNativeHost {
+ public MainApplicationReactNativeHost(Application application) {
+ super(application);
+ }
+
+ @Override
+ public boolean getUseDeveloperSupport() {
+ return BuildConfig.DEBUG;
+ }
+
+ @Override
+ protected List getPackages() {
+ List packages = new PackageList(this).getPackages();
+ // Packages that cannot be autolinked yet can be added manually here, for example:
+ // packages.add(new MyReactNativePackage());
+ // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
+ // packages.add(new TurboReactPackage() { ... });
+ // If you have custom Fabric Components, their ViewManagers should also be loaded here
+ // inside a ReactPackage.
+ return packages;
+ }
+
+ @Override
+ protected String getJSMainModuleName() {
+ return "index";
+ }
+
+ @NonNull
+ @Override
+ protected ReactPackageTurboModuleManagerDelegate.Builder
+ getReactPackageTurboModuleManagerDelegateBuilder() {
+ // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
+ // for the new architecture and to use TurboModules correctly.
+ return new MainApplicationTurboModuleManagerDelegate.Builder();
+ }
+
+ @Override
+ protected JSIModulePackage getJSIModulePackage() {
+ return new JSIModulePackage() {
+ @Override
+ public List getJSIModules(
+ final ReactApplicationContext reactApplicationContext,
+ final JavaScriptContextHolder jsContext) {
+ final List specs = new ArrayList<>();
+
+ // Here we provide a new JSIModuleSpec that will be responsible of providing the
+ // custom Fabric Components.
+ specs.add(
+ new JSIModuleSpec() {
+ @Override
+ public JSIModuleType getJSIModuleType() {
+ return JSIModuleType.UIManager;
+ }
+
+ @Override
+ public JSIModuleProvider getJSIModuleProvider() {
+ final ComponentFactory componentFactory = new ComponentFactory();
+ CoreComponentsRegistry.register(componentFactory);
+
+ // Here we register a Components Registry.
+ // The one that is generated with the template contains no components
+ // and just provides you the one from React Native core.
+ MainComponentsRegistry.register(componentFactory);
+
+ final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+
+ ViewManagerRegistry viewManagerRegistry =
+ new ViewManagerRegistry(
+ reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+
+ return new FabricJSIModuleProvider(
+ reactApplicationContext,
+ componentFactory,
+ ReactNativeConfig.DEFAULT_CONFIG,
+ viewManagerRegistry);
+ }
+ });
+ return specs;
+ }
+ };
+ }
+}
diff --git a/example/android/app/src/main/java/com/example/newarchitecture/components/MainComponentsRegistry.java b/example/android/app/src/main/java/com/example/newarchitecture/components/MainComponentsRegistry.java
new file mode 100644
index 0000000..69f7be2
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/newarchitecture/components/MainComponentsRegistry.java
@@ -0,0 +1,36 @@
+package com.uiwjs.example.alipay.newarchitecture.components;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.soloader.SoLoader;
+
+/**
+ * Class responsible to load the custom Fabric Components. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+@DoNotStrip
+public class MainComponentsRegistry {
+ static {
+ SoLoader.loadLibrary("fabricjni");
+ }
+
+ @DoNotStrip private final HybridData mHybridData;
+
+ @DoNotStrip
+ private native HybridData initHybrid(ComponentFactory componentFactory);
+
+ @DoNotStrip
+ private MainComponentsRegistry(ComponentFactory componentFactory) {
+ mHybridData = initHybrid(componentFactory);
+ }
+
+ @DoNotStrip
+ public static MainComponentsRegistry register(ComponentFactory componentFactory) {
+ return new MainComponentsRegistry(componentFactory);
+ }
+}
diff --git a/example/android/app/src/main/java/com/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/example/android/app/src/main/java/com/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
new file mode 100644
index 0000000..98766ac
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java
@@ -0,0 +1,48 @@
+package com.uiwjs.example.alipay.newarchitecture.modules;
+
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+
+/**
+ * Class responsible to load the TurboModules. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ *
Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationTurboModuleManagerDelegate
+ extends ReactPackageTurboModuleManagerDelegate {
+
+ private static volatile boolean sIsSoLibraryLoaded;
+
+ protected MainApplicationTurboModuleManagerDelegate(
+ ReactApplicationContext reactApplicationContext, List packages) {
+ super(reactApplicationContext, packages);
+ }
+
+ protected native HybridData initHybrid();
+
+ native boolean canCreateTurboModule(String moduleName);
+
+ public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+ protected MainApplicationTurboModuleManagerDelegate build(
+ ReactApplicationContext context, List packages) {
+ return new MainApplicationTurboModuleManagerDelegate(context, packages);
+ }
+ }
+
+ @Override
+ protected synchronized void maybeLoadOtherSoLibraries() {
+ if (!sIsSoLibraryLoaded) {
+ // If you change the name of your application .so file in the Android.mk file,
+ // make sure you update the name here as well.
+ SoLoader.loadLibrary("example_appmodules");
+ sIsSoLibraryLoaded = true;
+ }
+ }
+}
diff --git a/example/android/app/src/main/jni/Android.mk b/example/android/app/src/main/jni/Android.mk
new file mode 100644
index 0000000..bb9c671
--- /dev/null
+++ b/example/android/app/src/main/jni/Android.mk
@@ -0,0 +1,48 @@
+THIS_DIR := $(call my-dir)
+
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
+
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to include the following autogenerated makefile.
+# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
+include $(CLEAR_VARS)
+
+LOCAL_PATH := $(THIS_DIR)
+
+# You can customize the name of your application .so file here.
+LOCAL_MODULE := example_appmodules
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to uncomment those lines to include the generated source
+# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
+#
+# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+
+# Here you should add any native library you wish to depend on.
+LOCAL_SHARED_LIBRARIES := \
+ libfabricjni \
+ libfbjni \
+ libfolly_runtime \
+ libglog \
+ libjsi \
+ libreact_codegen_rncore \
+ libreact_debug \
+ libreact_nativemodule_core \
+ libreact_render_componentregistry \
+ libreact_render_core \
+ libreact_render_debug \
+ libreact_render_graphics \
+ librrc_view \
+ libruntimeexecutor \
+ libturbomodulejsijni \
+ libyoga
+
+LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp
new file mode 100644
index 0000000..0ac23cc
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationModuleProvider.cpp
@@ -0,0 +1,24 @@
+#include "MainApplicationModuleProvider.h"
+
+#include
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms) {
+ // Here you can provide your own module provider for TurboModules coming from
+ // either your application or from external libraries. The approach to follow
+ // is similar to the following (for a library called `samplelibrary`:
+ //
+ // auto module = samplelibrary_ModuleProvider(moduleName, params);
+ // if (module != nullptr) {
+ // return module;
+ // }
+ // return rncore_ModuleProvider(moduleName, params);
+ return rncore_ModuleProvider(moduleName, params);
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/MainApplicationModuleProvider.h b/example/android/app/src/main/jni/MainApplicationModuleProvider.h
new file mode 100644
index 0000000..0fa43fa
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationModuleProvider.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include
+#include
+
+#include
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr MainApplicationModuleProvider(
+ const std::string moduleName,
+ const JavaTurboModule::InitParams ¶ms);
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
new file mode 100644
index 0000000..dbbdc3d
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
@@ -0,0 +1,45 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+
+namespace facebook {
+namespace react {
+
+jni::local_ref
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+ jni::alias_ref) {
+ return makeCxxInstance();
+}
+
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+ registerHybrid({
+ makeNativeMethod(
+ "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+ makeNativeMethod(
+ "canCreateTurboModule",
+ MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+ });
+}
+
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) {
+ // Not implemented yet: provide pure-C++ NativeModules here.
+ return nullptr;
+}
+
+std::shared_ptr
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) {
+ return MainApplicationModuleProvider(name, params);
+}
+
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+ std::string name) {
+ return getTurboModule(name, nullptr) != nullptr ||
+ getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
new file mode 100644
index 0000000..9dc2af6
--- /dev/null
+++ b/example/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h
@@ -0,0 +1,38 @@
+#include
+#include
+
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+class MainApplicationTurboModuleManagerDelegate
+ : public jni::HybridClass<
+ MainApplicationTurboModuleManagerDelegate,
+ TurboModuleManagerDelegate> {
+ public:
+ // Adapt it to the package you used for your Java class.
+ static constexpr auto kJavaDescriptor =
+ "Lcom/example/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+
+ static jni::local_ref initHybrid(jni::alias_ref);
+
+ static void registerNatives();
+
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const std::shared_ptr jsInvoker) override;
+ std::shared_ptr getTurboModule(
+ const std::string name,
+ const JavaTurboModule::InitParams ¶ms) override;
+
+ /**
+ * Test-only method. Allows user to verify whether a TurboModule can be
+ * created by instances of this class.
+ */
+ bool canCreateTurboModule(std::string name);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/MainComponentsRegistry.cpp b/example/android/app/src/main/jni/MainComponentsRegistry.cpp
new file mode 100644
index 0000000..8f7edff
--- /dev/null
+++ b/example/android/app/src/main/jni/MainComponentsRegistry.cpp
@@ -0,0 +1,61 @@
+#include "MainComponentsRegistry.h"
+
+#include
+#include
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+
+std::shared_ptr
+MainComponentsRegistry::sharedProviderRegistry() {
+ auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+
+ // Custom Fabric Components go here. You can register custom
+ // components coming from your App or from 3rd party libraries here.
+ //
+ // providerRegistry->add(concreteComponentDescriptorProvider<
+ // AocViewerComponentDescriptor>());
+ return providerRegistry;
+}
+
+jni::local_ref
+MainComponentsRegistry::initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate) {
+ auto instance = makeCxxInstance(delegate);
+
+ auto buildRegistryFunction =
+ [](EventDispatcher::Weak const &eventDispatcher,
+ ContextContainer::Shared const &contextContainer)
+ -> ComponentDescriptorRegistry::Shared {
+ auto registry = MainComponentsRegistry::sharedProviderRegistry()
+ ->createComponentDescriptorRegistry(
+ {eventDispatcher, contextContainer});
+
+ auto mutableRegistry =
+ std::const_pointer_cast(registry);
+
+ mutableRegistry->setFallbackComponentDescriptor(
+ std::make_shared(
+ ComponentDescriptorParameters{
+ eventDispatcher, contextContainer, nullptr}));
+
+ return registry;
+ };
+
+ delegate->buildRegistryFunction = buildRegistryFunction;
+ return instance;
+}
+
+void MainComponentsRegistry::registerNatives() {
+ registerHybrid({
+ makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+ });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/MainComponentsRegistry.h b/example/android/app/src/main/jni/MainComponentsRegistry.h
new file mode 100644
index 0000000..23a9cac
--- /dev/null
+++ b/example/android/app/src/main/jni/MainComponentsRegistry.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include
+#include
+#include
+#include
+
+namespace facebook {
+namespace react {
+
+class MainComponentsRegistry
+ : public facebook::jni::HybridClass {
+ public:
+ // Adapt it to the package you used for your Java class.
+ constexpr static auto kJavaDescriptor =
+ "Lcom/example/newarchitecture/components/MainComponentsRegistry;";
+
+ static void registerNatives();
+
+ MainComponentsRegistry(ComponentFactory *delegate);
+
+ private:
+ static std::shared_ptr
+ sharedProviderRegistry();
+
+ static jni::local_ref initHybrid(
+ jni::alias_ref,
+ ComponentFactory *delegate);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/example/android/app/src/main/jni/OnLoad.cpp b/example/android/app/src/main/jni/OnLoad.cpp
new file mode 100644
index 0000000..c569b6e
--- /dev/null
+++ b/example/android/app/src/main/jni/OnLoad.cpp
@@ -0,0 +1,11 @@
+#include
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+ return facebook::jni::initialize(vm, [] {
+ facebook::react::MainApplicationTurboModuleManagerDelegate::
+ registerNatives();
+ facebook::react::MainComponentsRegistry::registerNatives();
+ });
+}
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
new file mode 100644
index 0000000..f35d996
--- /dev/null
+++ b/example/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
index 9fab0be..7ba83a2 100644
--- a/example/android/app/src/main/res/values/styles.xml
+++ b/example/android/app/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 93232f5..c9bc539 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,19 +1,30 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
- buildToolsVersion = "29.0.3"
+ buildToolsVersion = "31.0.0"
minSdkVersion = 21
- compileSdkVersion = 29
- targetSdkVersion = 29
- ndkVersion = "20.1.5948944"
+ compileSdkVersion = 31
+ targetSdkVersion = 31
+
+ if (System.properties['os.arch'] == "aarch64") {
+ // For M1 Users we need to use the NDK 24 which added support for aarch64
+ ndkVersion = "24.0.8215888"
+ } else {
+ // Otherwise we default to the side-by-side NDK version from AGP.
+ ndkVersion = "21.4.7075529"
+ }
}
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:4.1.0")
+ classpath("com.android.tools.build:gradle:7.1.1")
+ classpath("com.facebook.react:react-native-gradle-plugin")
+ classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -21,7 +32,6 @@ buildscript {
allprojects {
repositories {
- mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url("$rootDir/../node_modules/react-native/android")
@@ -30,9 +40,14 @@ allprojects {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
-
+ mavenCentral {
+ // We don't want to fetch react-native from Maven Central as there are
+ // older versions over there.
+ content {
+ excludeGroup "com.facebook.react"
+ }
+ }
google()
- jcenter()
maven { url 'https://www.jitpack.io' }
}
}
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index d21d03f..fa4feae 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -9,8 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
@@ -25,4 +25,16 @@ android.useAndroidX=true
android.enableJetifier=true
# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.75.1
+FLIPPER_VERSION=0.125.0
+
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.jar b/example/android/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2faf2fc91d853cd5d4242b5547257070..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18411
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
Hzh{2~$&vlj
delta 17345
zcmY(LQ*%V;k`IFI9>nQVmbqF^5gp^`SY~7w-GMiotuKg1mvxMfC5LjF$=Zk9=01qN5S*gtBbi0(H@1KSkbeGV2lb(J4w#Z)g7{;SNF}MQ+Sc(sT
Y>5_
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
QW2~J&pQ{+#&jH5%0<2&hD*ylh
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 14e30f7..669386b 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/example/android/gradlew b/example/android/gradlew
index fbd7c51..1b6c787 100755
--- a/example/android/gradlew
+++ b/example/android/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=`expr $i + 1`
- done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/example/android/gradlew.bat b/example/android/gradlew.bat
index e618921..107acd3 100644
--- a/example/android/gradlew.bat
+++ b/example/android/gradlew.bat
@@ -69,6 +69,7 @@ goto fail
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index 263c9e8..117c005 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -1,3 +1,11 @@
rootProject.name = 'example'
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
+includeBuild('../node_modules/react-native-gradle-plugin')
+
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+ include(":ReactAndroid")
+ project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+ include(":ReactAndroid:hermes-engine")
+ project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
+}
diff --git a/example/ios/Podfile b/example/ios/Podfile
index 20ed940..0205e8f 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -1,15 +1,26 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-platform :ios, '10.0'
+platform :ios, '12.4'
+install! 'cocoapods', :deterministic_uuids => false
+
+production = ENV["PRODUCTION"] == "1"
target 'example' do
config = use_native_modules!
+ # Flags change depending on the env values.
+ flags = get_default_flags()
+
use_react_native!(
:path => config[:reactNativePath],
# to enable hermes on iOS, change `false` to `true` and then install pods
- :hermes_enabled => false
+ :production => production,
+ :hermes_enabled => flags[:hermes_enabled],
+ :fabric_enabled => flags[:fabric_enabled],
+ :flipper_configuration => FlipperConfiguration.enabled,
+ # An absolute path to your application root.
+ :app_path => "#{Pod::Config.instance.installation_root}/.."
)
target 'exampleTests' do
@@ -17,12 +28,8 @@ target 'example' do
# Pods for testing
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|
react_native_post_install(installer)
+ __apply_Xcode_12_5_M1_post_install_workaround(installer)
end
-end
\ No newline at end of file
+end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 53ab5e1..8c85644 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,356 +1,395 @@
PODS:
- - boost-for-react-native (1.63.0)
+ - boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- - FBLazyVector (0.64.1)
- - FBReactNativeSpec (0.64.1):
- - RCT-Folly (= 2020.01.13.00)
- - RCTRequired (= 0.64.1)
- - RCTTypeSafety (= 0.64.1)
- - React-Core (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - Flipper (0.75.1):
- - Flipper-Folly (~> 2.5)
- - Flipper-RSocket (~> 1.3)
- - Flipper-DoubleConversion (1.1.7)
- - Flipper-Folly (2.5.3):
- - boost-for-react-native
+ - FBLazyVector (0.69.3)
+ - FBReactNativeSpec (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTRequired (= 0.69.3)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Core (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - Flipper (0.125.0):
+ - Flipper-Folly (~> 2.6)
+ - Flipper-RSocket (~> 1.4)
+ - Flipper-Boost-iOSX (1.76.0.1.11)
+ - Flipper-DoubleConversion (3.2.0.1)
+ - Flipper-Fmt (7.1.7)
+ - Flipper-Folly (2.6.10):
+ - Flipper-Boost-iOSX
- Flipper-DoubleConversion
+ - Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- - OpenSSL-Universal (= 1.1.180)
- - Flipper-Glog (0.3.6)
+ - OpenSSL-Universal (= 1.1.1100)
+ - Flipper-Glog (0.5.0.5)
- Flipper-PeerTalk (0.0.4)
- - Flipper-RSocket (1.3.1):
- - Flipper-Folly (~> 2.5)
- - FlipperKit (0.75.1):
- - FlipperKit/Core (= 0.75.1)
- - FlipperKit/Core (0.75.1):
- - Flipper (~> 0.75.1)
+ - Flipper-RSocket (1.4.3):
+ - Flipper-Folly (~> 2.6)
+ - FlipperKit (0.125.0):
+ - FlipperKit/Core (= 0.125.0)
+ - FlipperKit/Core (0.125.0):
+ - Flipper (~> 0.125.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- - FlipperKit/CppBridge (0.75.1):
- - Flipper (~> 0.75.1)
- - FlipperKit/FBCxxFollyDynamicConvert (0.75.1):
- - Flipper-Folly (~> 2.5)
- - FlipperKit/FBDefines (0.75.1)
- - FlipperKit/FKPortForwarding (0.75.1):
+ - SocketRocket (~> 0.6.0)
+ - FlipperKit/CppBridge (0.125.0):
+ - Flipper (~> 0.125.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
+ - Flipper-Folly (~> 2.6)
+ - FlipperKit/FBDefines (0.125.0)
+ - FlipperKit/FKPortForwarding (0.125.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- - FlipperKit/FlipperKitHighlightOverlay (0.75.1)
- - FlipperKit/FlipperKitLayoutPlugin (0.75.1):
+ - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
+ - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
+ - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
+ - FlipperKit/Core
+ - FlipperKit/FlipperKitHighlightOverlay
+ - FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18)
- - FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
- - FlipperKit/FlipperKitNetworkPlugin (0.75.1):
+ - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitReactPlugin (0.75.1):
+ - FlipperKit/FlipperKitHighlightOverlay
+ - FlipperKit/FlipperKitLayoutHelpers
+ - FlipperKit/FlipperKitLayoutIOSDescriptors
+ - FlipperKit/FlipperKitLayoutTextSearchable
+ - YogaKit (~> 1.18)
+ - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
+ - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
+ - FlipperKit/FlipperKitReactPlugin (0.125.0):
- FlipperKit/Core
- - FlipperKit/SKIOSNetworkPlugin (0.75.1):
+ - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
+ - FlipperKit/Core
+ - FlipperKit/SKIOSNetworkPlugin (0.125.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
+ - fmt (6.2.1)
- glog (0.3.5)
- libevent (2.1.12)
- - OpenSSL-Universal (1.1.180)
- - RCT-Folly (2020.01.13.00):
- - boost-for-react-native
+ - OpenSSL-Universal (1.1.1100)
+ - RCT-Folly (2021.06.28.00-v2):
+ - boost
+ - DoubleConversion
+ - fmt (~> 6.2.1)
+ - glog
+ - RCT-Folly/Default (= 2021.06.28.00-v2)
+ - RCT-Folly/Default (2021.06.28.00-v2):
+ - boost
+ - DoubleConversion
+ - fmt (~> 6.2.1)
+ - glog
+ - RCTRequired (0.69.3)
+ - RCTTypeSafety (0.69.3):
+ - FBLazyVector (= 0.69.3)
+ - RCTRequired (= 0.69.3)
+ - React-Core (= 0.69.3)
+ - React (0.69.3):
+ - React-Core (= 0.69.3)
+ - React-Core/DevSupport (= 0.69.3)
+ - React-Core/RCTWebSocket (= 0.69.3)
+ - React-RCTActionSheet (= 0.69.3)
+ - React-RCTAnimation (= 0.69.3)
+ - React-RCTBlob (= 0.69.3)
+ - React-RCTImage (= 0.69.3)
+ - React-RCTLinking (= 0.69.3)
+ - React-RCTNetwork (= 0.69.3)
+ - React-RCTSettings (= 0.69.3)
+ - React-RCTText (= 0.69.3)
+ - React-RCTVibration (= 0.69.3)
+ - React-bridging (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-jsi (= 0.69.3)
+ - React-callinvoker (0.69.3)
+ - React-Codegen (0.69.3):
+ - FBReactNativeSpec (= 0.69.3)
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTRequired (= 0.69.3)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Core (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-Core (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default (= 0.69.3)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/CoreModulesHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/Default (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/DevSupport (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default (= 0.69.3)
+ - React-Core/RCTWebSocket (= 0.69.3)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-jsinspector (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTActionSheetHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTAnimationHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTBlobHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTImageHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTLinkingHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTNetworkHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTSettingsHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTTextHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTVibrationHeaders (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-Core/RCTWebSocket (0.69.3):
+ - glog
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Core/Default (= 0.69.3)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsiexecutor (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - Yoga
+ - React-CoreModules (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Codegen (= 0.69.3)
+ - React-Core/CoreModulesHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-RCTImage (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-cxxreact (0.69.3):
+ - boost (= 1.76.0)
- DoubleConversion
- glog
- - RCT-Folly/Default (= 2020.01.13.00)
- - RCT-Folly/Default (2020.01.13.00):
- - boost-for-react-native
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-callinvoker (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-jsinspector (= 0.69.3)
+ - React-logger (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - React-runtimeexecutor (= 0.69.3)
+ - React-jsi (0.69.3):
+ - boost (= 1.76.0)
- DoubleConversion
- glog
- - RCTRequired (0.64.1)
- - RCTTypeSafety (0.64.1):
- - FBLazyVector (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTRequired (= 0.64.1)
- - React-Core (= 0.64.1)
- - React (0.64.1):
- - React-Core (= 0.64.1)
- - React-Core/DevSupport (= 0.64.1)
- - React-Core/RCTWebSocket (= 0.64.1)
- - React-RCTActionSheet (= 0.64.1)
- - React-RCTAnimation (= 0.64.1)
- - React-RCTBlob (= 0.64.1)
- - React-RCTImage (= 0.64.1)
- - React-RCTLinking (= 0.64.1)
- - React-RCTNetwork (= 0.64.1)
- - React-RCTSettings (= 0.64.1)
- - React-RCTText (= 0.64.1)
- - React-RCTVibration (= 0.64.1)
- - React-callinvoker (0.64.1)
- - React-Core (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default (= 0.64.1)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/CoreModulesHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/Default (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/DevSupport (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default (= 0.64.1)
- - React-Core/RCTWebSocket (= 0.64.1)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-jsinspector (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTActionSheetHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTAnimationHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTBlobHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTImageHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTLinkingHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTNetworkHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTSettingsHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTTextHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTVibrationHeaders (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-Core/RCTWebSocket (0.64.1):
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/Default (= 0.64.1)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsiexecutor (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - Yoga
- - React-CoreModules (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.64.1)
- - React-Core/CoreModulesHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-RCTImage (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-cxxreact (0.64.1):
- - boost-for-react-native (= 1.63.0)
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-jsi/Default (= 0.69.3)
+ - React-jsi/Default (0.69.3):
+ - boost (= 1.76.0)
- DoubleConversion
- glog
- - RCT-Folly (= 2020.01.13.00)
- - React-callinvoker (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-jsinspector (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - React-runtimeexecutor (= 0.64.1)
- - React-jsi (0.64.1):
- - boost-for-react-native (= 1.63.0)
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-jsiexecutor (0.69.3):
- DoubleConversion
- glog
- - RCT-Folly (= 2020.01.13.00)
- - React-jsi/Default (= 0.64.1)
- - React-jsi/Default (0.64.1):
- - boost-for-react-native (= 1.63.0)
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - React-jsinspector (0.69.3)
+ - React-logger (0.69.3):
+ - glog
+ - React-perflogger (0.69.3)
+ - React-RCTActionSheet (0.69.3):
+ - React-Core/RCTActionSheetHeaders (= 0.69.3)
+ - React-RCTAnimation (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTAnimationHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTBlob (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTBlobHeaders (= 0.69.3)
+ - React-Core/RCTWebSocket (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-RCTNetwork (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTImage (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTImageHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-RCTNetwork (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTLinking (0.69.3):
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTLinkingHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTNetwork (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTNetworkHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTSettings (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - RCTTypeSafety (= 0.69.3)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTSettingsHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-RCTText (0.69.3):
+ - React-Core/RCTTextHeaders (= 0.69.3)
+ - React-RCTVibration (0.69.3):
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-Codegen (= 0.69.3)
+ - React-Core/RCTVibrationHeaders (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (= 0.69.3)
+ - React-runtimeexecutor (0.69.3):
+ - React-jsi (= 0.69.3)
+ - ReactCommon/turbomodule/core (0.69.3):
- DoubleConversion
- glog
- - RCT-Folly (= 2020.01.13.00)
- - React-jsiexecutor (0.64.1):
- - DoubleConversion
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - React-jsinspector (0.64.1)
- - React-perflogger (0.64.1)
- - React-RCTActionSheet (0.64.1):
- - React-Core/RCTActionSheetHeaders (= 0.64.1)
- - React-RCTAnimation (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.64.1)
- - React-Core/RCTAnimationHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTBlob (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/RCTBlobHeaders (= 0.64.1)
- - React-Core/RCTWebSocket (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-RCTNetwork (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTImage (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.64.1)
- - React-Core/RCTImageHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-RCTNetwork (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTLinking (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - React-Core/RCTLinkingHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTNetwork (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.64.1)
- - React-Core/RCTNetworkHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTSettings (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - RCTTypeSafety (= 0.64.1)
- - React-Core/RCTSettingsHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-RCTText (0.64.1):
- - React-Core/RCTTextHeaders (= 0.64.1)
- - React-RCTVibration (0.64.1):
- - FBReactNativeSpec (= 0.64.1)
- - RCT-Folly (= 2020.01.13.00)
- - React-Core/RCTVibrationHeaders (= 0.64.1)
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (= 0.64.1)
- - React-runtimeexecutor (0.64.1):
- - React-jsi (= 0.64.1)
- - ReactCommon/turbomodule/core (0.64.1):
- - DoubleConversion
- - glog
- - RCT-Folly (= 2020.01.13.00)
- - React-callinvoker (= 0.64.1)
- - React-Core (= 0.64.1)
- - React-cxxreact (= 0.64.1)
- - React-jsi (= 0.64.1)
- - React-perflogger (= 0.64.1)
- - RNAlipay (3.0.0):
- - React
+ - RCT-Folly (= 2021.06.28.00-v2)
+ - React-bridging (= 0.69.3)
+ - React-callinvoker (= 0.69.3)
+ - React-Core (= 0.69.3)
+ - React-cxxreact (= 0.69.3)
+ - React-jsi (= 0.69.3)
+ - React-logger (= 0.69.3)
+ - React-perflogger (= 0.69.3)
+ - SocketRocket (0.6.0)
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
DEPENDENCIES:
+ - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- - Flipper (~> 0.75.1)
- - Flipper-DoubleConversion (= 1.1.7)
- - Flipper-Folly (~> 2.5.3)
- - Flipper-Glog (= 0.3.6)
- - Flipper-PeerTalk (~> 0.0.4)
- - Flipper-RSocket (~> 1.3)
- - FlipperKit (~> 0.75.1)
- - FlipperKit/Core (~> 0.75.1)
- - FlipperKit/CppBridge (~> 0.75.1)
- - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
- - FlipperKit/FBDefines (~> 0.75.1)
- - FlipperKit/FKPortForwarding (~> 0.75.1)
- - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
- - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
- - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
- - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
- - FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
- - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
- - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
+ - Flipper (= 0.125.0)
+ - Flipper-Boost-iOSX (= 1.76.0.1.11)
+ - Flipper-DoubleConversion (= 3.2.0.1)
+ - Flipper-Fmt (= 7.1.7)
+ - Flipper-Folly (= 2.6.10)
+ - Flipper-Glog (= 0.5.0.5)
+ - Flipper-PeerTalk (= 0.0.4)
+ - Flipper-RSocket (= 1.4.3)
+ - FlipperKit (= 0.125.0)
+ - FlipperKit/Core (= 0.125.0)
+ - FlipperKit/CppBridge (= 0.125.0)
+ - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
+ - FlipperKit/FBDefines (= 0.125.0)
+ - FlipperKit/FKPortForwarding (= 0.125.0)
+ - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
+ - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
+ - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
+ - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
+ - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+ - OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
+ - React-bridging (from `../node_modules/react-native/ReactCommon`)
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
+ - React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
@@ -359,6 +398,7 @@ DEPENDENCIES:
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+ - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -371,25 +411,29 @@ DEPENDENCIES:
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
- - RNAlipay (from `../../ios`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
SPEC REPOS:
trunk:
- - boost-for-react-native
- CocoaAsyncSocket
- Flipper
+ - Flipper-Boost-iOSX
- Flipper-DoubleConversion
+ - Flipper-Fmt
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- Flipper-RSocket
- FlipperKit
+ - fmt
- libevent
- OpenSSL-Universal
+ - SocketRocket
- YogaKit
EXTERNAL SOURCES:
+ boost:
+ :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
FBLazyVector:
@@ -406,8 +450,12 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/Libraries/TypeSafety"
React:
:path: "../node_modules/react-native/"
+ React-bridging:
+ :path: "../node_modules/react-native/ReactCommon"
React-callinvoker:
:path: "../node_modules/react-native/ReactCommon/callinvoker"
+ React-Codegen:
+ :path: build/generated/ios
React-Core:
:path: "../node_modules/react-native/"
React-CoreModules:
@@ -420,6 +468,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
React-jsinspector:
:path: "../node_modules/react-native/ReactCommon/jsinspector"
+ React-logger:
+ :path: "../node_modules/react-native/ReactCommon/logger"
React-perflogger:
:path: "../node_modules/react-native/ReactCommon/reactperflogger"
React-RCTActionSheet:
@@ -444,54 +494,58 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
ReactCommon:
:path: "../node_modules/react-native/ReactCommon"
- RNAlipay:
- :path: "../../ios"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
- boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+ boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
- DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
- FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
- FBReactNativeSpec: c9c2aff959cf4135918e0875384219b998242e4e
- Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
- Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
- Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
- Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
+ DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+ FBLazyVector: 1d83d91816fa605d16227a83f1b2e71c8df09d22
+ FBReactNativeSpec: 626e35e73f83c637ff166f906d584f4c6750c251
+ Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
+ Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
+ Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
+ Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
+ Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
+ Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
- Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
- FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
- glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+ Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
+ FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
+ fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
+ glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
- OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
- RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
- RCTRequired: ec2ebc96b7bfba3ca5c32740f5a0c6a014a274d2
- RCTTypeSafety: 22567f31e67c3e088c7ac23ea46ab6d4779c0ea5
- React: a241e3dbb1e91d06332f1dbd2b3ab26e1a4c4b9d
- React-callinvoker: da4d1c6141696a00163960906bc8a55b985e4ce4
- React-Core: 46ba164c437d7dac607b470c83c8308b05799748
- React-CoreModules: 217bd14904491c7b9940ff8b34a3fe08013c2f14
- React-cxxreact: 0090588ae6660c4615d3629fdd5c768d0983add4
- React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
- React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
- React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
- React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
- React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a
- React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309
- React-RCTBlob: f758d4403fc5828a326dc69e27b41e1a92f34947
- React-RCTImage: ce57088705f4a8d03f6594b066a59c29143ba73e
- React-RCTLinking: 852a3a95c65fa63f657a4b4e2d3d83a815e00a7c
- React-RCTNetwork: 9d7ccb8a08d522d71700b4fb677d9fa28cccd118
- React-RCTSettings: d8aaf4389ff06114dee8c42ef5f0f2915946011e
- React-RCTText: 809c12ed6b261796ba056c04fcd20d8b90bcc81d
- React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1
- React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6
- ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca
- RNAlipay: e9567310da367fda84803b006d623355f91e2ecb
- Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
+ OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
+ RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
+ RCTRequired: 66822c147facf02f7774af99825e0a31e39df42e
+ RCTTypeSafety: 309306c4e711b14a83c55c2816a6cc490ec19827
+ React: a779632422a918b26db4f1b57225a41c14d20525
+ React-bridging: 96055aa45f0417898d7833e251f4ae79d28acef7
+ React-callinvoker: 02df4d620df286381ff3f99180fb24feceaf01cc
+ React-Codegen: 06613a5e753c3af2dca0d6e7dd02944a3d77c3f6
+ React-Core: 638d54d64048aa635e7c583fb0d8425206f446b4
+ React-CoreModules: f706ec2a1939387517cadc6ce0d2ef0f20fccb53
+ React-cxxreact: ec183b7f6fec01e7167f38c1c64a03f68dca7fb2
+ React-jsi: ed7dc77f5193dca9c73cec90bfec409e7ddfe401
+ React-jsiexecutor: 1842ca163b160aeb224d2c65b2a60c393b273c67
+ React-jsinspector: bb2605f98aada5d81f3494690da3ef3b4ff3b716
+ React-logger: 23a50ef4c18bf9adbb51e2c979318e6b3a2e44a1
+ React-perflogger: 39d2ba8cbcac54d1bb1d9a980dab348e96aef467
+ React-RCTActionSheet: b1ad907a2c8f8e4d037148ca507b7f2d6ab1c66d
+ React-RCTAnimation: 914a9ba46fb6e7376f7709c7ce825d53b47ca2ee
+ React-RCTBlob: de62fd5edc5c36951f0b113bf252eb43b7131f79
+ React-RCTImage: aa0749a8d748b34942c7e71ac5d9f42be8b70cf3
+ React-RCTLinking: 595a9f8fbf4d6634bff28d1175b3523b61466612
+ React-RCTNetwork: 0559fd0fccb01f89c638baa43c8d185dc8008626
+ React-RCTSettings: 8e492a25a62f1ef6323f82ce652ae87fa59c82ca
+ React-RCTText: 17457cde6ef8832ba43c886baebb6627c5d7ed18
+ React-RCTVibration: dd8099eb46e9cee4692934bc8cbe5e9a4f5e8d31
+ React-runtimeexecutor: 607eb048e22a16388c908ee1f6644200e8d1e19b
+ ReactCommon: af7636436b382db7cde4583bbd642f0978e6e3ed
+ SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
+ Yoga: 44c64131616253fa83366295acdbce3d14926041
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: 311cf87a4a33d759b7ec994ec3735e03d4ededbf
+PODFILE CHECKSUM: d86e66c2874689cd5ab998282245ad4757a12721
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3
diff --git a/example/ios/_xcode.env b/example/ios/_xcode.env
new file mode 100644
index 0000000..3d5782c
--- /dev/null
+++ b/example/ios/_xcode.env
@@ -0,0 +1,11 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
index c28d66d..aeb7f7d 100644
--- a/example/ios/example.xcodeproj/project.pbxproj
+++ b/example/ios/example.xcodeproj/project.pbxproj
@@ -3,23 +3,17 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
00E356F31AD99517003FC87E /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
- 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+ 0C80B921A6F3F58F76C31292 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-example.a */; };
+ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 166A04BA6220347FC21E544F /* libPods-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1345F408D2B4CC473BDD31 /* libPods-example-tvOSTests.a */; };
- 299EB34004C7BB9816739ACD /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 590A896F64AEF5BE0BA82AE6 /* libPods-example-tvOS.a */; };
- 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
- 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
- 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
+ 7699B88040F8A987B510C191 /* libPods-example-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-example-exampleTests.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
- B43A9FCB297F5ADEBAE05610 /* libPods-example-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2A18E037E9C84A7BB27DC53 /* libPods-example-exampleTests.a */; };
- B797AA4AA11F6AA572464F4C /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E72E26DA430591188989969 /* libPods-example.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -30,43 +24,26 @@
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
remoteInfo = example;
};
- 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7;
- remoteInfo = "example-tvOS";
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
- 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; };
00E356EE1AD99517003FC87E /* exampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = exampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
00E356F21AD99517003FC87E /* exampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = exampleTests.m; sourceTree = ""; };
13B07F961A680F5B00A75B9A /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = example/AppDelegate.h; sourceTree = ""; };
- 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = example/AppDelegate.m; sourceTree = ""; };
+ 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = example/AppDelegate.mm; sourceTree = ""; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = example/Images.xcassets; sourceTree = ""; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example/Info.plist; sourceTree = ""; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = example/main.m; sourceTree = ""; };
- 2081385A299935CC32AA9B09 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = ""; };
- 20A584C7D03A552ACABD9285 /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = ""; };
- 2D02E47B1E0B4A5D006451C7 /* example-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
- 2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
- 2EC89C0F73C6544603C503FB /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = ""; };
- 3112D26F5BD29566FE2D3C34 /* Pods-example-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-example-exampleTests/Pods-example-exampleTests.debug.xcconfig"; sourceTree = ""; };
- 490CB7FA8A6961A60BA42F15 /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = "