Skip to content

Commit fb34fba

Browse files
RSNarafacebook-github-bot
authored andcommittedDec 24, 2020
Use native_module_spec_name to name codegen targets
Summary: ## Description Suppose this was the codegen declaration before: ``` rn_library( name = "FooModule", native_module_spec_name = "FBReactNativeSpec", codegen_modules = True, # ... ) ``` Previously, this would generate the following BUCK targets: - generated_objcpp_modules-FooModuleApple - generated_java_modules-FooModuleAndroid - generated_java_modules-FooModule-jniAndroid ## Changes We will now generate: - FBReactNativeSpecApple - FBReactNativeSpecAndroid - FBReactNativeSpec-jniAndroid This matches the naming scheme of the old codegen. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D25680224 fbshipit-source-id: 617ac18fd915f3277f6bd98072d147f20fb193e5
1 parent a684152 commit fb34fba

File tree

28 files changed

+32
-32
lines changed

28 files changed

+32
-32
lines changed
 

‎React/CoreModules/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ rn_apple_library(
131131
"//xplat/js:RCTLinkingApple",
132132
"//xplat/js:RCTPushNotificationApple",
133133
"//xplat/js/react-native-github:ReactInternalApple",
134-
"//xplat/js/react-native-github/Libraries:generated_objcpp_modules-FBReactNativeSpecApple",
134+
"//xplat/js/react-native-github/Libraries:FBReactNativeSpecApple",
135135
],
136136
)

‎ReactAndroid/src/main/java/com/facebook/react/animated/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ rn_android_library(
2929
react_native_target("java/com/facebook/react/uimanager:uimanager"),
3030
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
3131
],
32-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
32+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
3333
)

‎ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rn_android_library(
4040
react_native_target("res:devsupport"),
4141
],
4242
exported_deps = [
43-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
43+
react_native_root_target("Libraries:FBReactNativeSpec"),
4444
],
4545
)
4646

‎ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ rn_android_library(
1919
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2020
react_native_target("java/com/facebook/react/modules/core:core"),
2121
],
22-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
22+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2323
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rn_android_library(
1717
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1818
react_native_target("java/com/facebook/react/modules/core:core"),
1919
],
20-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
20+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2121
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rn_android_library(
1717
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1818
react_native_target("java/com/facebook/react/modules/core:core"),
1919
],
20-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
20+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2121
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ rn_android_library(
3232
react_native_target("java/com/facebook/react/modules/websocket:websocket"),
3333
],
3434
exported_deps = [
35-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
35+
react_native_root_target("Libraries:FBReactNativeSpec"),
3636
],
3737
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ rn_android_library(
1818
react_native_target("java/com/facebook/react/devsupport:interfaces"),
1919
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2020
],
21-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
21+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2222
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ rn_android_library(
1919
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2020
],
2121
exported_deps = [
22-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
22+
react_native_root_target("Libraries:FBReactNativeSpec"),
2323
],
2424
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ rn_android_library(
2222
react_native_target("java/com/facebook/react/util:util"),
2323
],
2424
exported_deps = [
25-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
25+
react_native_root_target("Libraries:FBReactNativeSpec"),
2626
],
2727
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ rn_android_library(
2323
react_native_target("java/com/facebook/react/common:common"),
2424
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2525
],
26-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
26+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2727
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rn_android_library(
2424
react_native_target("java/com/facebook/react/uimanager:uimanager"),
2525
],
2626
exported_deps = [
27-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
27+
react_native_root_target("Libraries:FBReactNativeSpec"),
2828
],
2929
)
3030

‎ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ rn_android_library(
2020
react_native_target("java/com/facebook/react/uimanager:uimanager"),
2121
],
2222
exported_deps = [
23-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
23+
react_native_root_target("Libraries:FBReactNativeSpec"),
2424
],
2525
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ rn_android_library(
2424
react_native_target("java/com/facebook/react/common:common"),
2525
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2626
],
27-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
27+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2828
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ rn_android_library(
2525
react_native_target("java/com/facebook/react/views/image:image"),
2626
],
2727
exported_deps = [
28-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
28+
react_native_root_target("Libraries:FBReactNativeSpec"),
2929
],
3030
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rn_android_library(
1717
react_native_target("java/com/facebook/react/common:common"),
1818
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1919
],
20-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
20+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2121
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ rn_android_library(
2929
react_native_target("java/com/facebook/react/module/annotations:annotations"),
3030
react_native_target("java/com/facebook/react/modules/core:core"),
3131
],
32-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
32+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
3333
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ rn_android_library(
1616
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1717
react_native_target("java/com/facebook/react/modules/core:core"),
1818
],
19-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
19+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2020
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ rn_android_library(
1616
react_native_target("java/com/facebook/react/common:common"),
1717
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1818
],
19-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
19+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2020
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ rn_android_library(
2020
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2121
react_native_target("java/com/facebook/react/uimanager:uimanager"),
2222
],
23-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
23+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2424
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ rn_android_library(
2525
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2626
react_native_target("java/com/facebook/react/uimanager:uimanager"),
2727
],
28-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
28+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2929
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ rn_android_library(
1919
react_native_target("java/com/facebook/react/module/annotations:annotations"),
2020
react_native_target("java/com/facebook/react/modules/common:common"),
2121
],
22-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
22+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2323
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rn_android_library(
2222
react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
2323
],
2424
exported_deps = [
25-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
25+
react_native_root_target("Libraries:FBReactNativeSpec"),
2626
":systeminfo-moduleless",
2727
],
2828
)
@@ -45,5 +45,5 @@ rn_android_library(
4545
react_native_dep("third-party/java/jsr-305:jsr-305"),
4646
react_native_target("res:systeminfo"),
4747
],
48-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
48+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
4949
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ rn_android_library(
1515
react_native_target("java/com/facebook/react/common:common"),
1616
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1717
],
18-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
18+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
1919
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rn_android_library(
1717
react_native_target("java/com/facebook/react/module/annotations:annotations"),
1818
react_native_target("java/com/facebook/react/modules/core:core"),
1919
],
20-
exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
20+
exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
2121
)

‎ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ rn_android_library(
2323
react_native_target("java/com/facebook/react/modules/network:network"),
2424
],
2525
exported_deps = [
26-
react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
26+
react_native_root_target("Libraries:FBReactNativeSpec"),
2727
],
2828
)

‎packages/react-native-codegen/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ rn_xplat_cxx_library(
9494
"PUBLIC",
9595
],
9696
deps = [
97+
":FBReactNativeTestSpec",
9798
":generated_components-codegen_tests",
98-
":generated_objcpp_modules-codegen_tests",
9999
],
100100
)
101101

‎packages/react-native-codegen/DEFS.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ def rn_codegen_cli():
103103
)
104104

105105
def rn_codegen_modules(
106+
name,
106107
native_module_spec_name,
107-
name = "",
108108
library_labels = [],
109109
schema_target = ""):
110110
generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
@@ -157,7 +157,7 @@ def rn_codegen_modules(
157157
)
158158

159159
rn_android_library(
160-
name = "generated_java_modules-{}".format(name),
160+
name = "{}".format(native_module_spec_name),
161161
srcs = [
162162
":{}".format(generate_module_java_zip_name),
163163
],
@@ -176,7 +176,7 @@ def rn_codegen_modules(
176176
)
177177

178178
rn_xplat_cxx_library(
179-
name = "generated_java_modules-{}-jni".format(name),
179+
name = "{}-jni".format(native_module_spec_name),
180180
srcs = [
181181
":{}".format(generate_module_jni_cpp_name),
182182
],
@@ -229,7 +229,7 @@ def rn_codegen_modules(
229229
)
230230

231231
rn_apple_library(
232-
name = "generated_objcpp_modules-{}Apple".format(name),
232+
name = "{}Apple".format(native_module_spec_name),
233233
extension_api_only = True,
234234
header_namespace = "",
235235
sdks = (IOS),

0 commit comments

Comments
 (0)
Please sign in to comment.