fix(android): bridgeless mode broken on react-native 0.74 (#1068)

react-native-async-storage · Feb 28, 2024 · 253126d · 253126d
1 parent 5556af6
commit 253126d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/packages/default-storage/android/build.gradle b/packages/default-storage/android/build.gradle
@@ -62,6 +62,7 @@ android {
         buildConfigField "Long", "AsyncStorage_db_size", "${project.ext.AsyncStorageConfig.databaseSizeMB}L"
         buildConfigField "boolean", "AsyncStorage_useDedicatedExecutor", "${project.ext.AsyncStorageConfig.useDedicatedExecutor}"
         buildConfigField "boolean", "AsyncStorage_useNextStorage", "${useNextStorage}"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "${isNewArchitectureEnabled}"
     }
     lintOptions {
         abortOnError false

diff --git a/...droid/src/javaPackage/java/com/reactnativecommunity/asyncstorage/AsyncStoragePackage.java b/...droid/src/javaPackage/java/com/reactnativecommunity/asyncstorage/AsyncStoragePackage.java
@@ -8,7 +8,6 @@
 package com.reactnativecommunity.asyncstorage;
 
 import com.facebook.react.TurboReactPackage;
-import com.facebook.react.ViewManagerOnDemandReactPackage;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
@@ -17,15 +16,13 @@
 import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 @ReactModuleList(
         nativeModules = {
@@ -62,6 +59,7 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
                 @Override
                 public Map<String, ReactModuleInfo> getReactModuleInfos() {
                     final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
+                    boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
 
                     Class<? extends NativeModule>[] moduleList =
                             new Class[] {
@@ -80,7 +78,7 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
                                         reactModule.needsEagerInit(),
                                         reactModule.hasConstants(),
                                         reactModule.isCxxModule(),
-                                        TurboModule.class.isAssignableFrom(moduleClass)));
+                                        isTurboModule));
                     }
 
                     return reactModuleInfoMap;
@@ -92,11 +90,6 @@ public Map<String, ReactModuleInfo> getReactModuleInfos() {
         }
     }
 
-    // Deprecated in RN 0.47 
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     @SuppressWarnings("rawtypes")
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {

diff --git a/...droid/src/kotlinPackage/java/com/reactnativecommunity/asyncstorage/AsyncStoragePackage.kt b/...droid/src/kotlinPackage/java/com/reactnativecommunity/asyncstorage/AsyncStoragePackage.kt
@@ -1,17 +1,13 @@
 package com.reactnativecommunity.asyncstorage
 
 import com.facebook.react.TurboReactPackage
-import com.facebook.react.ViewManagerOnDemandReactPackage
 import com.facebook.react.bridge.ModuleSpec
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.module.annotations.ReactModuleList
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
-import com.facebook.react.turbomodule.core.interfaces.TurboModule
-import com.facebook.react.uimanager.ReactShadowNode
-import com.facebook.react.uimanager.ViewManager
 import com.reactnativecommunity.asyncstorage.next.StorageModule
 
 @ReactModuleList(
@@ -32,18 +28,19 @@ class AsyncStoragePackage : TurboReactPackage() {
             return reactModuleInfoProviderClass.newInstance() as ReactModuleInfoProvider
         } catch (e: ClassNotFoundException) {
             return ReactModuleInfoProvider {
+                val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
                 val reactModule: ReactModule = StorageModule::class.java.getAnnotation(
                     ReactModule::class.java)!!
 
-                mutableMapOf(
+                mapOf(
                     StorageModule.NAME to ReactModuleInfo(
                         reactModule.name,
                         StorageModule::class.java.name,
                         reactModule.canOverrideExistingModule,
                         reactModule.needsEagerInit,
                         reactModule.hasConstants,
                         reactModule.isCxxModule,
-                        TurboModule::class.java.isAssignableFrom(StorageModule::class.java)
+                        isTurboModule
                     )
                 )
             }