-
-
Notifications
You must be signed in to change notification settings - Fork 980
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Example app dependencies and React Native (#1989)
- upgrade React Native to 0.68.0 - upgrade Reanimated to 2.6.0 - upgrade Screens to 3.13.1
- Loading branch information
1 parent
68f02ac
commit 82e613c
Showing
29 changed files
with
1,746 additions
and
779 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,5 +59,6 @@ buck-out/ | |
| # Bundle artifact | ||
| *.jsbundle | ||
|
|
||
| # CocoaPods | ||
| # Ruby / CocoaPods | ||
| /ios/Pods/ | ||
| /vendor/bundle/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
example/android/app/src/main/java/com/example/MainApplicationReactNativeHost.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package com.example; | ||
|
|
||
| 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.EmptyReactNativeConfig; | ||
| import com.facebook.react.fabric.FabricJSIModuleProvider; | ||
| import com.facebook.react.uimanager.ViewManagerRegistry; | ||
| import com.example.BuildConfig; | ||
| 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. | ||
| * | ||
| * <p>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<ReactPackage> getPackages() { | ||
| List<ReactPackage> 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<JSIModuleSpec> getJSIModules( | ||
| final ReactApplicationContext reactApplicationContext, | ||
| final JavaScriptContextHolder jsContext) { | ||
| final List<JSIModuleSpec> 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<UIManager> 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, | ||
| new EmptyReactNativeConfig(), | ||
| viewManagerRegistry); | ||
| } | ||
| }); | ||
| return specs; | ||
| } | ||
| }; | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
example/android/app/src/main/java/com/example/MainApplicationTurboModuleManagerDelegate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package com.example; | ||
|
|
||
| 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). | ||
| * | ||
| * <p>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<ReactPackage> 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<ReactPackage> 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("rndiffapp_appmodules"); | ||
| sIsSoLibraryLoaded = true; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.