Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add kotlin stdlib as a dependency for Java targets depending on Kotlin (#33535)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/33535

Hack to support Kotlin functions in Buck compilation: adds Kotlin stdlib as a dependency to make sure upstream targets include Kotlin jvm internal classes.

Changelog: [Internal]

Reviewed By: cortinico

Differential Revision: D35284430

fbshipit-source-id: 0d29ad30386514c8df5376d0a6809d3105f0cd0f
This commit is contained in:
Andrei Shikov
2022-04-01 09:33:31 -07:00
committed by Facebook GitHub Bot
parent 8650220cf9
commit 651c4c1b55
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK
+1 -1
View File
@@ -27,9 +27,9 @@ rn_android_library(
react_native_dep("third-party/android/androidx:annotation"),
react_native_dep("third-party/java/infer-annotations:infer-annotations"),
react_native_target("java/com/facebook/react/common:common"),
react_native_dep("third-party/java/jsr-305:jsr-305"),
# dependencies used for systraces
react_native_dep("java/com/facebook/systrace:systrace"),
react_native_target("java/com/facebook/react/bridge:bridge"),
],
exported_deps = [],
)
ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+5 -4
View File
@@ -1,4 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_android_toplevel_dep", "react_native_dep", "react_native_target", "rn_android_library")
# TODO(T115916830): Remove when Kotlin files are used in this module
KOTLIN_STDLIB_DEPS = [react_native_android_toplevel_dep("third-party/kotlin:kotlin-stdlib")] if IS_OSS_BUILD else []
rn_android_library(
name = "fabric",
@@ -47,7 +50,5 @@ rn_android_library(
react_native_target("java/com/facebook/react/views/view:view"),
react_native_target("java/com/facebook/react/views/text:text"),
react_native_target("java/com/facebook/react/touch:touch"),
],
exported_deps = [
],
] + KOTLIN_STDLIB_DEPS,
)
ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
+5 -2
View File
@@ -1,4 +1,7 @@
load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_android_toplevel_dep", "react_native_dep", "react_native_target", "rn_android_library")
# TODO(T115916830): Remove when Kotlin files are used in this module
KOTLIN_STDLIB_DEPS = [react_native_android_toplevel_dep("third-party/kotlin:kotlin-stdlib")] if IS_OSS_BUILD else []
rn_android_library(
name = "text",
@@ -35,5 +38,5 @@ rn_android_library(
react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
react_native_target("java/com/facebook/react/views/view:view"),
react_native_target("res:uimanager"),
],
] + KOTLIN_STDLIB_DEPS,
)