diff --git a/Examples/Movies/android/app/BUCK b/Examples/Movies/android/app/BUCK index 0d7740439..5a2657b3b 100644 --- a/Examples/Movies/android/app/BUCK +++ b/Examples/Movies/android/app/BUCK @@ -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'), diff --git a/Examples/TicTacToe/android/app/BUCK b/Examples/TicTacToe/android/app/BUCK index 5c7c9b833..76c03184e 100644 --- a/Examples/TicTacToe/android/app/BUCK +++ b/Examples/TicTacToe/android/app/BUCK @@ -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'), diff --git a/Examples/UIExplorer/android/app/BUCK b/Examples/UIExplorer/android/app/BUCK index 0c864a078..20b7ef8fc 100644 --- a/Examples/UIExplorer/android/app/BUCK +++ b/Examples/UIExplorer/android/app/BUCK @@ -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'), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK index 96cedfbbb..f6c2f002b 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK index c6c8a992a..eb5fcd502 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK index ac827a56e..f500606cf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK index b73f7e7d4..33f55fc05 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK index 7a10615b2..7e8adb3a0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK index 417c9b43a..ea5b582b5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK index c50985f30..536f568e0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK index 90f0c912a..e76fd9864 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK index 2bb1e7181..542b2256f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK @@ -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', ], ) - diff --git a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK index c5d9b9f49..0c60036fd 100644 --- a/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK +++ b/ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK @@ -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/...',], ) diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK index 728e05c59..5f9042831 100644 --- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK +++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK @@ -25,9 +25,9 @@ remote_file( android_library( name = 'imagepipeline', exported_deps = [ - ':imagepipeline-base', - ':imagepipeline-core', - ':bolts', + ':bolts', + ':imagepipeline-base', + ':imagepipeline-core', ], visibility = ['//ReactAndroid/...',], ) diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK index 08b3194c4..31697a8a5 100644 --- a/ReactAndroid/src/main/third-party/java/asm/BUCK +++ b/ReactAndroid/src/main/third-party/java/asm/BUCK @@ -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/...',], ) diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK index 327e10078..cb19dc0ec 100644 --- a/ReactAndroid/src/main/third-party/java/junit/BUCK +++ b/ReactAndroid/src/main/third-party/java/junit/BUCK @@ -3,8 +3,8 @@ include_defs('//ReactAndroid/DEFS') android_library( name = 'junit', exported_deps = [ - ':junit-core', ':hamcrest', + ':junit-core', ], visibility = ['//ReactAndroid/...',], ) diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index e172113aa..4cf02f4c5 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -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/...',], ) diff --git a/ReactAndroid/src/test/java/com/facebook/react/BUCK b/ReactAndroid/src/test/java/com/facebook/react/BUCK index d03606418..ff7d9069e 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/BUCK @@ -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'), ], ) - diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK index 07a2e22bc..4f2644b3a 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK @@ -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' ], ) - diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK index 35d97ee63..1c740311f 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK @@ -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 = [ diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK index d7f96cba6..5b3e30baf 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/views/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/views/BUCK @@ -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'), ], )