Skip to content

Commit b7191cd

Browse files
mdvaccafacebook-github-bot
authored andcommitted
Move TurboModule from com.facebook.react.turbomodule -> com.facebook.react.internal.turbomodule (#39682)
Summary: Pull Request resolved: #39682 Move TurboModule from com.facebook.react.turbomodule -> com.facebook.react.internal.turbomodule bypass-github-export-checks changelog: [internal] internal Reviewed By: RSNara Differential Revision: D49523696 fbshipit-source-id: fee155f4fb7acf0f28f900c79f7aa38074bec0e6
1 parent 9295b9c commit b7191cd

File tree

41 files changed

+67
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+67
-67
lines changed

packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ module.exports = {
467467
'com.facebook.react.bridge.ReactApplicationContext',
468468
'com.facebook.react.bridge.ReactContextBaseJavaModule',
469469
'com.facebook.react.bridge.ReactMethod',
470-
'com.facebook.react.turbomodule.core.interfaces.TurboModule',
470+
'com.facebook.react.internal.turbomodule.core.interfaces.TurboModule',
471471
'com.facebook.proguard.annotations.DoNotStrip',
472472
'javax.annotation.Nonnull',
473473
]);

packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
2020
import com.facebook.react.bridge.ReactApplicationContext;
2121
import com.facebook.react.bridge.ReactContextBaseJavaModule;
2222
import com.facebook.react.bridge.ReactMethod;
23-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
23+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
2424
import javax.annotation.Nonnull;
2525
2626
public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -66,7 +66,7 @@ import com.facebook.react.bridge.ReadableArray;
6666
import com.facebook.react.bridge.ReadableMap;
6767
import com.facebook.react.bridge.WritableArray;
6868
import com.facebook.react.bridge.WritableMap;
69-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
69+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
7070
import javax.annotation.Nonnull;
7171
import javax.annotation.Nullable;
7272
@@ -136,7 +136,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
136136
import com.facebook.react.bridge.ReactApplicationContext;
137137
import com.facebook.react.bridge.ReactContextBaseJavaModule;
138138
import com.facebook.react.bridge.ReactMethod;
139-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
139+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
140140
import javax.annotation.Nonnull;
141141
142142
public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -178,7 +178,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
178178
import com.facebook.react.bridge.ReactContextBaseJavaModule;
179179
import com.facebook.react.bridge.ReactMethod;
180180
import com.facebook.react.bridge.ReadableMap;
181-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
181+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
182182
import javax.annotation.Nonnull;
183183
184184
public abstract class AliasTurboModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -224,7 +224,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
224224
import com.facebook.react.bridge.ReactMethod;
225225
import com.facebook.react.bridge.ReadableArray;
226226
import com.facebook.react.bridge.ReadableMap;
227-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
227+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
228228
import javax.annotation.Nonnull;
229229
230230
public abstract class NativeCameraRollManagerSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -272,7 +272,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
272272
import com.facebook.react.bridge.ReactMethod;
273273
import com.facebook.react.bridge.ReadableArray;
274274
import com.facebook.react.bridge.ReadableMap;
275-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
275+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
276276
import javax.annotation.Nonnull;
277277
278278
public abstract class NativeExceptionsManagerSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -338,7 +338,7 @@ import com.facebook.react.bridge.ReadableMap;
338338
import com.facebook.react.bridge.WritableArray;
339339
import com.facebook.react.bridge.WritableMap;
340340
import com.facebook.react.common.build.ReactBuildConfig;
341-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
341+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
342342
import java.util.Arrays;
343343
import java.util.HashSet;
344344
import java.util.Map;
@@ -462,7 +462,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
462462
import com.facebook.react.bridge.ReactApplicationContext;
463463
import com.facebook.react.bridge.ReactContextBaseJavaModule;
464464
import com.facebook.react.bridge.ReactMethod;
465-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
465+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
466466
import javax.annotation.Nonnull;
467467
468468
public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
@@ -500,7 +500,7 @@ import com.facebook.proguard.annotations.DoNotStrip;
500500
import com.facebook.react.bridge.ReactApplicationContext;
501501
import com.facebook.react.bridge.ReactContextBaseJavaModule;
502502
import com.facebook.react.bridge.ReactMethod;
503-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
503+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
504504
import javax.annotation.Nonnull;
505505
506506
public abstract class NativeSampleTurboModule2Spec extends ReactContextBaseJavaModule implements TurboModule {

packages/react-native/ReactAndroid/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
-dontwarn com.facebook.react.**
5050
-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
51-
-keep,includedescriptorclasses class com.facebook.react.turbomodule.core.** { *; }
51+
-keep,includedescriptorclasses class com.facebook.react.internal.turbomodule.core.** { *; }
5252

5353
# hermes
5454
-keep class com.facebook.jni.** { *; }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackageTurboModuleManagerDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.facebook.jni.HybridData;
1212
import com.facebook.proguard.annotations.DoNotStrip;
1313
import com.facebook.react.bridge.ReactApplicationContext;
14-
import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
14+
import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
1515
import java.util.ArrayList;
1616
import java.util.Collections;
1717
import java.util.List;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.facebook.react.bridge.ReactApplicationContext;
1818
import com.facebook.react.bridge.ReactMarker;
1919
import com.facebook.react.devsupport.LogBoxModule;
20+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
2021
import com.facebook.react.module.annotations.ReactModule;
2122
import com.facebook.react.module.annotations.ReactModuleList;
2223
import com.facebook.react.module.model.ReactModuleInfo;
@@ -30,7 +31,6 @@
3031
import com.facebook.react.modules.debug.SourceCodeModule;
3132
import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
3233
import com.facebook.react.modules.systeminfo.AndroidInfoModule;
33-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
3434
import com.facebook.react.uimanager.UIManagerModule;
3535
import com.facebook.react.uimanager.ViewManager;
3636
import com.facebook.react.uimanager.ViewManagerResolver;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import com.facebook.react.bridge.NativeModule;
1313
import com.facebook.react.bridge.ReactApplicationContext;
1414
import com.facebook.react.devsupport.JSCHeapCapture;
15+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
1516
import com.facebook.react.module.annotations.ReactModule;
1617
import com.facebook.react.module.annotations.ReactModuleList;
1718
import com.facebook.react.module.model.ReactModuleInfo;
1819
import com.facebook.react.module.model.ReactModuleInfoProvider;
19-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
2020
import com.facebook.react.uimanager.UIManagerModule;
2121
import com.facebook.react.uimanager.ViewManager;
2222
import com.facebook.react.views.traceupdateoverlay.TraceUpdateOverlayManager;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyTurboModuleManagerDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.facebook.react.bridge.NativeModule;
1212
import com.facebook.react.bridge.ReactApplicationContext;
1313
import com.facebook.react.common.annotations.UnstableReactNativeAPI;
14-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
14+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
1515
import java.util.HashMap;
1616
import java.util.List;
1717
import java.util.Map;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
import com.facebook.react.devsupport.interfaces.DevSupportManager;
8787
import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
8888
import com.facebook.react.devsupport.interfaces.RedBoxHandler;
89+
import com.facebook.react.internal.turbomodule.core.TurboModuleManager;
90+
import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
91+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry;
8992
import com.facebook.react.modules.appearance.AppearanceModule;
9093
import com.facebook.react.modules.appregistry.AppRegistry;
9194
import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -94,9 +97,6 @@
9497
import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
9598
import com.facebook.react.packagerconnection.RequestHandler;
9699
import com.facebook.react.surface.ReactStage;
97-
import com.facebook.react.turbomodule.core.TurboModuleManager;
98-
import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
99-
import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
100100
import com.facebook.react.uimanager.DisplayMetricsHolder;
101101
import com.facebook.react.uimanager.ReactRoot;
102102
import com.facebook.react.uimanager.UIManagerHelper;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import com.facebook.react.bridge.NativeModule;
1515
import com.facebook.react.bridge.ReactApplicationContext;
1616
import com.facebook.react.config.ReactFeatureFlags;
17+
import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
18+
import com.facebook.react.internal.turbomodule.core.interfaces.TurboModule;
1719
import com.facebook.react.module.annotations.ReactModule;
1820
import com.facebook.react.module.model.ReactModuleInfo;
19-
import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
20-
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
2121
import java.util.ArrayList;
2222
import java.util.HashMap;
2323
import java.util.List;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import com.facebook.proguard.annotations.DoNotStrip;
1212
import com.facebook.react.bridge.queue.ReactQueueConfiguration;
1313
import com.facebook.react.common.annotations.VisibleForTesting;
14-
import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
15-
import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder;
14+
import com.facebook.react.internal.turbomodule.core.interfaces.CallInvokerHolder;
15+
import com.facebook.react.internal.turbomodule.core.interfaces.NativeMethodCallInvokerHolder;
1616
import java.util.Collection;
1717
import java.util.List;
1818

0 commit comments

Comments
 (0)