clean up buck dep order

Reviewed By: adamjernst

Differential Revision: D4404770

fbshipit-source-id: d5801cc2b529f513e1531840310b884af951d702
This commit is contained in:
Michael Lee 2017-01-11 14:39:26 -08:00 committed by Facebook Github Bot
parent f839b58c20
commit 55f0294b7d
21 changed files with 55 additions and 66 deletions

View File

@ -15,9 +15,9 @@ android_library(
deps = [
':res',
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/modules/core:core'),
react_native_target('java/com/facebook/react/shell:shell'),
react_native_target('java/com/facebook/react:react'),
react_native_target('jni/prebuilt:android-jsc'),
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
react_native_target('jni/prebuilt:reactnative-libs'),

View File

@ -15,9 +15,9 @@ android_library(
deps = [
':res',
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/modules/core:core'),
react_native_target('java/com/facebook/react/shell:shell'),
react_native_target('java/com/facebook/react:react'),
react_native_target('jni/prebuilt:android-jsc'),
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
react_native_target('jni/prebuilt:reactnative-libs'),

View File

@ -16,9 +16,9 @@ android_library(
':res',
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/modules/core:core'),
react_native_target('java/com/facebook/react/shell:shell'),
react_native_target('java/com/facebook/react:react'),
react_native_target('jni/prebuilt:android-jsc'),
# .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck`
react_native_target('jni/prebuilt:reactnative-libs'),

View File

@ -12,6 +12,7 @@ android_library(
react_native_dep('third-party/java/junit:junit'),
react_native_dep('third-party/java/mockito:mockito'),
react_native_dep('third-party/java/testing-support-lib:runner'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/cxxbridge:bridge'),
@ -21,10 +22,8 @@ android_library(
react_native_target('java/com/facebook/react/modules/debug:debug'),
react_native_target('java/com/facebook/react/shell:shell'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react:react'),
],
visibility = [
'PUBLIC',
],
)

View File

@ -10,6 +10,7 @@ deps = [
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_dep('third-party/java/junit:junit'),
react_native_integration_tests_target('java/com/facebook/react/testing:testing'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/modules/core:core'),
@ -18,8 +19,8 @@ deps = [
react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
react_native_target('java/com/facebook/react/modules/timepicker:timepicker'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/picker:picker'),
react_native_target('java/com/facebook/react/views/progressbar:progressbar'),
react_native_target('java/com/facebook/react/views/recyclerview:recyclerview'),
@ -29,7 +30,6 @@ deps = [
react_native_target('java/com/facebook/react/views/text:text'),
react_native_target('java/com/facebook/react/views/textinput:textinput'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('java/com/facebook/react:react'),
]
android_library(
@ -49,4 +49,3 @@ android_library(
'PUBLIC',
],
)

View File

@ -14,11 +14,10 @@ android_library(
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/modules/core:core'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
)

View File

@ -12,8 +12,8 @@ android_library(
react_native_dep('third-party/java/okhttp:okhttp3-ws'),
react_native_dep('third-party/java/okio:okio'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/modules/debug:debug'),
react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
@ -23,4 +23,3 @@ android_library(
'PUBLIC',
],
)

View File

@ -12,8 +12,8 @@ android_library(
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline'),
react_native_dep('libraries/fresco/fresco-react-native:imagepipeline-okhttp3'),
react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
react_native_dep('third-party/android/support-annotations:android-support-annotations'),
react_native_dep('third-party/android/support/v4:lib-support-v4'),
react_native_dep('third-party/android/support-annotations:android-support-annotations'),
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_dep('third-party/java/okhttp:okhttp3'),
react_native_target('java/com/facebook/react/bridge:bridge'),
@ -26,4 +26,3 @@ android_library(
'PUBLIC',
],
)

View File

@ -12,8 +12,8 @@ android_library(
react_native_dep('third-party/java/okhttp:okhttp3-urlconnection'),
react_native_dep('third-party/java/okio:okio'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/module/annotations:annotations'),
react_native_target('java/com/facebook/react/modules/core:core'),
],
@ -21,4 +21,3 @@ android_library(
'PUBLIC',
],
)

View File

@ -10,11 +10,10 @@ android_library(
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
)

View File

@ -9,11 +9,10 @@ android_library(
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
)

View File

@ -14,11 +14,10 @@ android_library(
react_native_dep('third-party/java/jsr-305:jsr-305'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
],
visibility = [
'PUBLIC',
],
)

View File

@ -1,18 +1,18 @@
android_library(
name = 'powermock',
exported_deps = [
':powermock-api-mockito',
':mockito-all',
':powermock-api-support',
':powermock-module-junit4-rule',
':powermock-classloading-base',
':powermock-classloading-xstream',
':xstream',
':powermock-core',
':powermock-reflect',
':javassist',
':xmlpull',
':xpp3'
':javassist',
':mockito-all',
':powermock-api-mockito',
':powermock-api-support',
':powermock-classloading-base',
':powermock-classloading-xstream',
':powermock-core',
':powermock-module-junit4-rule',
':powermock-reflect',
':xmlpull',
':xpp3',
':xstream',
],
visibility = ['//ReactAndroid/...',],
)

View File

@ -25,9 +25,9 @@ remote_file(
android_library(
name = 'imagepipeline',
exported_deps = [
':imagepipeline-base',
':imagepipeline-core',
':bolts',
':bolts',
':imagepipeline-base',
':imagepipeline-core',
],
visibility = ['//ReactAndroid/...',],
)

View File

@ -1,11 +1,11 @@
android_library(
name = 'asm',
exported_deps = [
':asm-core',
':asm-commons',
':asm-util',
':asm-analysis',
':asm-tree',
':asm-analysis',
':asm-commons',
':asm-core',
':asm-tree',
':asm-util',
],
visibility = ['//ReactAndroid/...',],
)

View File

@ -3,8 +3,8 @@ include_defs('//ReactAndroid/DEFS')
android_library(
name = 'junit',
exported_deps = [
':junit-core',
':hamcrest',
':junit-core',
],
visibility = ['//ReactAndroid/...',],
)

View File

@ -3,19 +3,19 @@ include_defs('//ReactAndroid/DEFS')
android_library(
name = 'robolectric',
exported_deps = [
':robolectric-core',
':robolectric-resources',
':robolectric-annotations',
':robolectric-utils',
':bouncycastle',
':vtd-xml',
':icu',
':android-all-4.1.2_r1-robolectric-0',
':json-20080701',
':tagsoup-1.2',
':shadows-core-3.0-16',
react_native_dep('third-party/java/asm:asm'),
react_native_dep('third-party/java/sqlite:sqlite'),
':android-all-4.1.2_r1-robolectric-0',
':bouncycastle',
':icu',
':json-20080701',
':robolectric-annotations',
':robolectric-core',
':robolectric-resources',
':robolectric-utils',
':shadows-core-3.0-16',
':tagsoup-1.2',
':vtd-xml',
react_native_dep('third-party/java/asm:asm'),
react_native_dep('third-party/java/sqlite:sqlite'),
],
visibility = ['//ReactAndroid/...',],
)

View File

@ -15,6 +15,7 @@ rn_robolectric_test(
react_native_dep('third-party/java/okhttp:okhttp3'),
react_native_dep('third-party/java/okio:okio'),
react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/animation:animation'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
@ -22,8 +23,6 @@ rn_robolectric_test(
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/views/text:text'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('java/com/facebook/react:react'),
react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
],
)

View File

@ -15,10 +15,11 @@ rn_robolectric_test(
react_native_dep('third-party/java/okhttp:okhttp3'),
react_native_dep('third-party/java/okio:okio'),
react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/animation:animation'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/common/network:network'),
react_native_target('java/com/facebook/react/devsupport:devsupport'),
react_native_target('java/com/facebook/react/jstasks:jstasks'),
react_native_target('java/com/facebook/react/modules/clipboard:clipboard'),
@ -32,11 +33,9 @@ rn_robolectric_test(
react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react:react'),
react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
],
visibility = [
'PUBLIC'
],
)

View File

@ -5,7 +5,7 @@ rn_robolectric_test(
# Please change the contact to the oncall of your team
contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
# TODO Disabled temporarily until Yoga linking is fixed t14964130
# srcs = glob(['**/*.java']),
# srcs = glob(['**/*.java']),
srcs = ['SimpleViewPropertyTest.java'],
deps = [
YOGA_TARGET,
@ -17,15 +17,15 @@ rn_robolectric_test(
react_native_dep('third-party/java/okhttp:okhttp3'),
react_native_dep('third-party/java/okio:okio'),
react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/animation:animation'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/text:text'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('java/com/facebook/react:react'),
react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
],
visibility = [

View File

@ -20,17 +20,17 @@ rn_robolectric_test(
react_native_dep('third-party/java/okhttp:okhttp3'),
react_native_dep('third-party/java/okio:okio'),
react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
react_native_target('java/com/facebook/react:react'),
react_native_target('java/com/facebook/react/bridge:bridge'),
react_native_target('java/com/facebook/react/common:common'),
react_native_target('java/com/facebook/react/touch:touch'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/uimanager:uimanager'),
react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
react_native_target('java/com/facebook/react/views/image:image'),
react_native_target('java/com/facebook/react/views/slider:slider'),
react_native_target('java/com/facebook/react/views/text:text'),
react_native_target('java/com/facebook/react/views/textinput:textinput'),
react_native_target('java/com/facebook/react/views/view:view'),
react_native_target('java/com/facebook/react:react'),
react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
],
)