From c1470736b028d21614d2a352a227f83a80e32215 Mon Sep 17 00:00:00 2001 From: Scott Rice Date: Wed, 31 Oct 2018 11:45:33 -0700 Subject: [PATCH] Use fb_native_wrapper for all targets Differential Revision: D12867696 fbshipit-source-id: bd52c1ead04065addece3a3104c4a1a9359ceb95 --- ReactAndroid/libs/BUCK | 10 +++-- ReactAndroid/src/main/jni/prebuilt/BUCK | 3 +- .../src/main/jni/third-party/glibc/BUCK | 10 +++-- .../src/test/java/com/facebook/powermock/BUCK | 25 ++++++------ .../libraries/fresco/fresco-react-native/BUCK | 21 +++++----- .../soloader/java/com/facebook/soloader/BUCK | 6 ++- .../android/support-annotations/BUCK | 6 ++- .../src/main/third-party/android/support/BUCK | 3 +- .../main/third-party/android/support/v4/BUCK | 40 ++++++++++--------- .../android/support/v7/appcompat-orig/BUCK | 9 +++-- .../src/main/third-party/java/asm/BUCK | 11 ++--- .../java/buck-android-support/BUCK | 3 +- .../src/main/third-party/java/fest/BUCK | 5 ++- .../third-party/java/infer-annotations/BUCK | 6 ++- .../src/main/third-party/java/javapoet/BUCK | 6 ++- .../src/main/third-party/java/jsr-305/BUCK | 6 ++- .../src/main/third-party/java/jsr-330/BUCK | 6 ++- .../src/main/third-party/java/junit/BUCK | 5 ++- .../src/main/third-party/java/mockito/BUCK | 5 ++- .../src/main/third-party/java/okhttp/BUCK | 10 +++-- .../src/main/third-party/java/okio/BUCK | 6 ++- .../java/robolectric3/robolectric/BUCK | 31 +++++++------- .../src/main/third-party/java/sqlite/BUCK | 3 +- .../third-party/java/testing-support-lib/BUCK | 10 +++-- keystores/BUCK | 4 +- 25 files changed, 144 insertions(+), 106 deletions(-) diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK index 9d188656453694..d647c5f79d8dfe 100644 --- a/ReactAndroid/libs/BUCK +++ b/ReactAndroid/libs/BUCK @@ -1,21 +1,23 @@ -android_prebuilt_aar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.android_prebuilt_aar( name = "appcompat", aar = ":appcompat-binary-aar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "appcompat-binary-aar", sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86", url = "mvn:com.android.support:appcompat-v7:aar:27.1.1", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "android-jsc", aar = ":android-jsc-aar", ) -remote_file( +fb_native.remote_file( name = "android-jsc-aar", sha1 = "880cedd93f43e0fc841f01f2fa185a63d9230f85", url = "mvn:org.webkit:android-jsc:aar:r174650", diff --git a/ReactAndroid/src/main/jni/prebuilt/BUCK b/ReactAndroid/src/main/jni/prebuilt/BUCK index 9be266bd8929b2..fcbe40c84a00c3 100644 --- a/ReactAndroid/src/main/jni/prebuilt/BUCK +++ b/ReactAndroid/src/main/jni/prebuilt/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library") # Temp workaround to get the build working e2e, Gradle builds them for us @@ -13,7 +14,7 @@ rn_android_prebuilt_aar( visibility = ["PUBLIC"], ) -remote_file( +fb_native.remote_file( name = "android-jsc-aar", sha1 = "880cedd93f43e0fc841f01f2fa185a63d9230f85", url = "mvn:org.webkit:android-jsc:aar:r174650", diff --git a/ReactAndroid/src/main/jni/third-party/glibc/BUCK b/ReactAndroid/src/main/jni/third-party/glibc/BUCK index 6668953843f0ad..e3a4f475489193 100644 --- a/ReactAndroid/src/main/jni/third-party/glibc/BUCK +++ b/ReactAndroid/src/main/jni/third-party/glibc/BUCK @@ -4,7 +4,9 @@ # libpthread is implicitly included in the android runtime so, when building # on an android platform, we don't do anything. -prebuilt_cxx_library( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_cxx_library( name = "pthread", exported_platform_linker_flags = [ ( @@ -26,7 +28,7 @@ prebuilt_cxx_library( ], ) -prebuilt_cxx_library( +fb_native.prebuilt_cxx_library( name = "dl", exported_linker_flags = [ "-ldl", @@ -37,7 +39,7 @@ prebuilt_cxx_library( ], ) -prebuilt_cxx_library( +fb_native.prebuilt_cxx_library( name = "m", exported_linker_flags = [ "-lm", @@ -48,7 +50,7 @@ prebuilt_cxx_library( ], ) -prebuilt_cxx_library( +fb_native.prebuilt_cxx_library( name = "rt", exported_platform_linker_flags = [ ( 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 833276c6d04cf2..1473f92d1099f4 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,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -25,7 +26,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-core.jar", sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c", url = "mvn:org.powermock:powermock-core:jar:1.6.2", @@ -37,7 +38,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-api-mockito.jar", sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c", url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2", @@ -49,7 +50,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-api-support.jar", sha1 = "93b21413b4ee99b7bc0dd34e1416fdca96866aaf", url = "mvn:org.powermock:powermock-api-support:jar:1.6.2", @@ -61,7 +62,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-module-junit4-rule.jar", sha1 = "4847638c5729b9f203e21144b0bdb5d34d888473", url = "mvn:org.powermock:powermock-module-junit4-rule:jar:1.6.2", @@ -73,7 +74,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-classloading-xstream.jar", sha1 = "3ced31cd7024fe365b9f3c8082d22c02434577da", url = "mvn:org.powermock:powermock-classloading-xstream:jar:1.6.2", @@ -85,7 +86,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-classloading-base.jar", sha1 = "c8bfc10731a02d3b241892cf2c334a754d473ca7", url = "mvn:org.powermock:powermock-classloading-base:jar:1.6.2", @@ -97,7 +98,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-xstream.jar", sha1 = "97e5013f391487cce4de6b0eebcde21549e91872", url = "mvn:com.thoughtworks.xstream:xstream:jar:1.4.2", @@ -109,7 +110,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-powermock-reflect.jar", sha1 = "1af1bbd1207c3ecdcf64973e6f9d57dcd17cc145", url = "mvn:org.powermock:powermock-reflect:jar:1.6.2", @@ -121,7 +122,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-javassist.jar", sha1 = "a9cbcdfb7e9f86fbc74d3afae65f2248bfbf82a0", url = "mvn:org.javassist:javassist:jar:3.20.0-GA", @@ -133,7 +134,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-mockito-all.jar", sha1 = "539df70269cc254a58cccc5d8e43286b4a73bf30", url = "mvn:org.mockito:mockito-all:jar:1.10.19", @@ -145,7 +146,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-xmlpull.jar", sha1 = "2b8e230d2ab644e4ecaa94db7cdedbc40c805dfa", url = "mvn:xmlpull:xmlpull:jar:1.1.3.1", @@ -157,7 +158,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-xpp3.jar", sha1 = "19d4e90b43059058f6e056f794f0ea4030d60b86", url = "mvn:xpp3:xpp3_min:jar:1.1.4c", diff --git a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK index 8e962c86b125c2..d2fef6923a63bf 100644 --- a/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK +++ b/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar") rn_android_prebuilt_aar( @@ -6,19 +7,19 @@ rn_android_prebuilt_aar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "fresco-binary-aar", sha1 = "076812472879be341f392c4aab469b8fdf8c6759", url = "mvn:com.facebook.fresco:fresco:aar:1.10.0", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "fresco-drawee", aar = ":drawee-binary-aar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "drawee-binary-aar", sha1 = "c1fef7cdc5f6e4fd7d7c58522075c6b66f46a52b", url = "mvn:com.facebook.fresco:drawee:aar:1.10.0", @@ -40,7 +41,7 @@ rn_android_prebuilt_aar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "imagepipeline-base-aar", sha1 = "56672fa5fa46bf4962adecc7c88a1544f5a20225", url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.10.0", @@ -52,7 +53,7 @@ rn_android_prebuilt_aar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "imagepipeline-aar", sha1 = "e317bdb7f18f0f4ac4f3ab5d3edb49fd09290a6f", url = "mvn:com.facebook.fresco:imagepipeline:aar:1.10.0", @@ -64,31 +65,31 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-bolts.jar", sha1 = "d85884acf6810a3bbbecb587f239005cbc846dc4", url = "mvn:com.parse.bolts:bolts-tasks:jar:1.4.0", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "fbcore", aar = ":fbcore-aar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "fbcore-aar", sha1 = "d79dbf5e47d6e528dd1f90170e0299c14d835ab8", url = "mvn:com.facebook.fresco:fbcore:aar:1.10.0", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "imagepipeline-okhttp3", aar = ":imagepipeline-okhttp3-binary-aar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "imagepipeline-okhttp3-binary-aar", sha1 = "3429ffb776d7511d0f911fbe9efda4c73179d416", url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.10.0", diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK index 5664b7dd7cf168..b17de3e804437d 100644 --- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK +++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK @@ -1,10 +1,12 @@ -android_prebuilt_aar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.android_prebuilt_aar( name = "soloader", aar = ":soloader-binary-aar", visibility = ["PUBLIC"], ) -remote_file( +fb_native.remote_file( name = "soloader-binary-aar", sha1 = "042357559a6c9313bdb9b1ba137a9df3b5365f35", url = "mvn:com.facebook.soloader:soloader:aar:0.5.1", diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index 80a5ef65b053f4..607d39477f0242 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "android-support-annotations", binary_jar = ":support-annotations-binary.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "support-annotations-binary.jar", sha1 = "39ded76b5e1ce1c5b2688e1d25cdc20ecee32007", url = "mvn:com.android.support:support-annotations:jar:27.1.1", diff --git a/ReactAndroid/src/main/third-party/android/support/BUCK b/ReactAndroid/src/main/third-party/android/support/BUCK index 13e8bff7c29c38..5636024b9632d3 100644 --- a/ReactAndroid/src/main/third-party/android/support/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar") rn_android_library( @@ -17,7 +18,7 @@ rn_android_library( ) # a fake genrule so that BUCK files in react native are preseable in fbsource -genrule( +fb_native.genrule( name = "appcompat-res-cmd", out = ".", bash = "ls", diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index 27aec407f2907b..584c121123238f 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -1,4 +1,6 @@ -android_library( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.android_library( name = "lib-support-v4", visibility = ["PUBLIC"], exported_deps = [ @@ -14,100 +16,100 @@ android_library( ], ) -prebuilt_jar( +fb_native.prebuilt_jar( name = "android-lifecycle-common", binary_jar = ":android-lifecycle-common.jar", ) -prebuilt_jar( +fb_native.prebuilt_jar( name = "android-lifecycle-core", binary_jar = ":android-lifecycle-core.jar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "android-lifecycle-runtime", aar = ":android-lifecycle-runtime-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "android-lifecycle-viewmodel", aar = ":android-lifecycle-viewmodel-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "lib-support-v4-support-compat", aar = ":lib-support-v4-support-compat-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "lib-support-v4-support-core-utils", aar = ":lib-support-v4-support-core-utils-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "lib-support-v4-support-core-ui", aar = ":lib-support-v4-support-core-ui-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "lib-support-v4-support-media-compat", aar = ":lib-support-v4-support-media-compat-aar", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "lib-support-v4-support-fragment", aar = ":lib-support-v4-support-fragment-aar", ) -remote_file( +fb_native.remote_file( name = "android-lifecycle-runtime-aar", sha1 = "95428e5f6bf6875a6a1125d2157c3836a1a837f5", url = "mvn:android.arch.lifecycle:runtime:aar:1.1.0", ) -remote_file( +fb_native.remote_file( name = "android-lifecycle-common.jar", sha1 = "0edf3f7bfb84a7521d0599efa3b0113a0ee90f85", url = "mvn:android.arch.lifecycle:common:jar:1.1.0", ) -remote_file( +fb_native.remote_file( name = "android-lifecycle-core.jar", sha1 = "8007981f7d7540d89cd18471b8e5dcd2b4f99167", url = "mvn:android.arch.core:common:jar:1.1.0", ) -remote_file( +fb_native.remote_file( name = "android-lifecycle-viewmodel-aar", sha1 = "74ee369b874da61b5b81bebd7b8df0c2577309c8", url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.0", ) -remote_file( +fb_native.remote_file( name = "lib-support-v4-support-compat-aar", sha1 = "a55ad550d0b84c7fec7ecca012690636062c0e64", url = "mvn:com.android.support:support-compat:aar:27.1.1", ) -remote_file( +fb_native.remote_file( name = "lib-support-v4-support-core-utils-aar", sha1 = "b3a7a4040fda0c5138dbc8c477103b6723b9dbe6", url = "mvn:com.android.support:support-core-utils:aar:27.1.1", ) -remote_file( +fb_native.remote_file( name = "lib-support-v4-support-core-ui-aar", sha1 = "f9acdb8a4c3a9fe883fd7fa5efd3f0426bb9dcda", url = "mvn:com.android.support:support-core-ui:aar:27.1.1", ) -remote_file( +fb_native.remote_file( name = "lib-support-v4-support-media-compat-aar", sha1 = "10e309e2cc22ff4cab30bd5f573e4bb30be707ad", url = "mvn:com.android.support:support-media-compat:aar:27.1.1", ) -remote_file( +fb_native.remote_file( name = "lib-support-v4-support-fragment-aar", sha1 = "eb8053ebf038b7561c29e5e8964664fac05f375e", url = "mvn:com.android.support:support-fragment:aar:27.1.1", diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index 1feeab85b5f7b3..a531a7096a40b9 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar") # This is a bit messy and hopefully a temporary thing @@ -37,25 +38,25 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -genrule( +fb_native.genrule( name = "classes-unpacker-cmd", out = "classes.jar", cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) classes.jar $OUT", ) -genrule( +fb_native.genrule( name = "res-unpacker-cmd", out = "res", cmd = "$(exe :aar-unpacker) $(location :appcompat-binary-aar) res/ $OUT", visibility = ["//ReactAndroid/..."], ) -python_binary( +fb_native.python_binary( name = "aar-unpacker", main = "aar-unpacker.py", ) -remote_file( +fb_native.remote_file( name = "appcompat-binary-aar", sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86", url = "mvn:com.android.support:appcompat-v7:aar:27.1.1", diff --git a/ReactAndroid/src/main/third-party/java/asm/BUCK b/ReactAndroid/src/main/third-party/java/asm/BUCK index 61ea0f616a2b47..c56db5422144ea 100644 --- a/ReactAndroid/src/main/third-party/java/asm/BUCK +++ b/ReactAndroid/src/main/third-party/java/asm/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -18,7 +19,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-asm.jar", sha1 = "2fd56467a018aafe6ec6a73ccba520be4a7e1565", url = "mvn:org.ow2.asm:asm:jar:5.0.1", @@ -30,7 +31,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-asm-commons.jar", sha1 = "7b7147a390a93a14d2edfdcf3f7b0e87a0939c3e", url = "mvn:org.ow2.asm:asm-commons:jar:5.0.1", @@ -42,7 +43,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-asm-tree.jar", sha1 = "1b1e6e9d869acd704056d0a4223071a511c619e6", url = "mvn:org.ow2.asm:asm-tree:jar:5.0.1", @@ -54,7 +55,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-asm-util.jar", sha1 = "7c8caddfbd0b2d7b844f8fcc75175b9cb9cf4724", url = "mvn:org.ow2.asm:asm-util:jar:5.0.1", @@ -66,7 +67,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-asm-analysis.jar", sha1 = "e286fbee48efacb4e7c175f7948d9d8b2ab52352", url = "mvn:org.ow2.asm:asm-analysis:jar:5.0.1", diff --git a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK index dea24f803e4a36..8fea3737cd28aa 100644 --- a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK +++ b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK @@ -1,7 +1,8 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "react_native_integration_tests_target") # this lib was compiled by buck version : 6cbf2709778ea352a169d1c84e3ef2894dfa39ec -prebuilt_jar( +fb_native.prebuilt_jar( name = "buck-android-support", binary_jar = "buck-android-support.jar", visibility = [ diff --git a/ReactAndroid/src/main/third-party/java/fest/BUCK b/ReactAndroid/src/main/third-party/java/fest/BUCK index 888d63a22161bd..10f995f166d306 100644 --- a/ReactAndroid/src/main/third-party/java/fest/BUCK +++ b/ReactAndroid/src/main/third-party/java/fest/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -15,7 +16,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "fest-binary.jar", sha1 = "cb7c91cf614901928ae405f19d9bcdedf82781db", url = "mvn:org.easytesting:fest-assert-core:jar:2.0M10", @@ -27,7 +28,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "fest-util-binary.jar", sha1 = "c4a8d7305b23b8d043be12c979813b096df11f44", url = "mvn:org.easytesting:fest-util:jar:1.2.5", diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK index 48d34008ce742f..481e44b8e07122 100644 --- a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "infer-annotations", binary_jar = ":infer-annotations.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "infer-annotations.jar", sha1 = "f514ff4ca022a579d9cf7524846988b646ae4491", url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.11.2", diff --git a/ReactAndroid/src/main/third-party/java/javapoet/BUCK b/ReactAndroid/src/main/third-party/java/javapoet/BUCK index 769b174f34e5d3..cf2a2c77fa7f70 100644 --- a/ReactAndroid/src/main/third-party/java/javapoet/BUCK +++ b/ReactAndroid/src/main/third-party/java/javapoet/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "javapoet", binary_jar = ":jsr305-binary.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "jsr305-binary.jar", sha1 = "ad3ba65c1788f4d814a4da056323e2b84412fb3c", url = "mvn:com.squareup:javapoet:jar:1.2.0", diff --git a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK index 494c6479d213c9..8833e61c52d2b0 100644 --- a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK +++ b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "jsr-305", binary_jar = ":jsr305-binary.jar", visibility = ["PUBLIC"], ) -remote_file( +fb_native.remote_file( name = "jsr305-binary.jar", sha1 = "25ea2e8b0c338a877313bd4672d3fe056ea78f0d", url = "mvn:com.google.code.findbugs:jsr305:jar:3.0.2", diff --git a/ReactAndroid/src/main/third-party/java/jsr-330/BUCK b/ReactAndroid/src/main/third-party/java/jsr-330/BUCK index def136484a7574..24ab990280a8b0 100644 --- a/ReactAndroid/src/main/third-party/java/jsr-330/BUCK +++ b/ReactAndroid/src/main/third-party/java/jsr-330/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "jsr-330", binary_jar = ":jsr330-binary.jar", visibility = ["PUBLIC"], ) -remote_file( +fb_native.remote_file( name = "jsr330-binary.jar", sha1 = "6975da39a7040257bd51d21a231b76c915872d38", url = "mvn:javax.inject:javax.inject:jar:1", diff --git a/ReactAndroid/src/main/third-party/java/junit/BUCK b/ReactAndroid/src/main/third-party/java/junit/BUCK index 39209726524b35..9f4cbec6221d28 100644 --- a/ReactAndroid/src/main/third-party/java/junit/BUCK +++ b/ReactAndroid/src/main/third-party/java/junit/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -15,7 +16,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-junit.jar", sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec", url = "mvn:junit:junit:jar:4.12", @@ -27,7 +28,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-hamcrest.jar", sha1 = "63a21ebc981131004ad02e0434e799fd7f3a8d5a", url = "mvn:org.hamcrest:hamcrest-all:jar:1.3", diff --git a/ReactAndroid/src/main/third-party/java/mockito/BUCK b/ReactAndroid/src/main/third-party/java/mockito/BUCK index 7eee994c6e5fa8..a7f91609227a4c 100644 --- a/ReactAndroid/src/main/third-party/java/mockito/BUCK +++ b/ReactAndroid/src/main/third-party/java/mockito/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -15,7 +16,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "mockito-binary.jar", sha1 = "c54c55cae0f4742ad6bf8a1987ada35363f2c4e2", url = "mvn:org.mockito:mockito-core:jar:2.19.1", @@ -27,7 +28,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "objenesis-binary.jar", sha1 = "87c0ea803b69252868d09308b4618f766f135a96", url = "mvn:org.objenesis:objenesis:jar:2.1", diff --git a/ReactAndroid/src/main/third-party/java/okhttp/BUCK b/ReactAndroid/src/main/third-party/java/okhttp/BUCK index db3a2a2affb310..de75ada168cc88 100644 --- a/ReactAndroid/src/main/third-party/java/okhttp/BUCK +++ b/ReactAndroid/src/main/third-party/java/okhttp/BUCK @@ -1,22 +1,24 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "okhttp3", binary_jar = ":okhttp3-binary.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "okhttp3-binary.jar", sha1 = "75966e05a49046ca2ae734e5626f28837a8d1e82", url = "mvn:com.squareup.okhttp3:okhttp:jar:3.11.0", ) -prebuilt_jar( +fb_native.prebuilt_jar( name = "okhttp3-urlconnection", binary_jar = ":okhttp3-urlconnection-binary.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "okhttp3-urlconnection-binary.jar", sha1 = "54ec442e9c0fac51265110cf0cb44dfe5ad1ea05", url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.11.0", diff --git a/ReactAndroid/src/main/third-party/java/okio/BUCK b/ReactAndroid/src/main/third-party/java/okio/BUCK index 1219ad4697cfe8..13a8e39757a4d9 100644 --- a/ReactAndroid/src/main/third-party/java/okio/BUCK +++ b/ReactAndroid/src/main/third-party/java/okio/BUCK @@ -1,10 +1,12 @@ -prebuilt_jar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( name = "okio", binary_jar = ":okio-binary.jar", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "okio-binary.jar", sha1 = "102d7be47241d781ef95f1581d414b0943053130", url = "mvn:com.squareup.okio:okio:jar:1.14.0", diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK index b29b1b7d316cb8..a24c0db48b21e3 100644 --- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK +++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -26,7 +27,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "robolectric-binary.jar", sha1 = "f888cea3bc1a24110e315eb9827ab593610ea62f", url = "mvn:org.robolectric:robolectric:jar:3.0", @@ -38,7 +39,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "robolectric-resources-binary.jar", sha1 = "1ab609054aab67cd13a434567467f4b4774f2465", url = "mvn:org.robolectric:robolectric-resources:jar:3.0", @@ -50,7 +51,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "robolectric-annotations-binary.jar", sha1 = "2a6cfc072d7680694c1ff893c5dc8fec33163110", url = "mvn:org.robolectric:robolectric-annotations:jar:3.0", @@ -62,7 +63,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "robolectric-utils-binary.jar", sha1 = "4bcecd8115fe7296088bb1636e6cbd7ae8927392", url = "mvn:org.robolectric:robolectric-utils:jar:3.0", @@ -74,7 +75,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "bouncycastle-binary.jar", sha1 = "ce091790943599535cbb4de8ede84535b0c1260c", url = "mvn:org.bouncycastle:bcprov-jdk16:jar:1.46", @@ -86,7 +87,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "vtd-xml-binary.jar", sha1 = "ee5bcf62c1acf76434ee9f1c67a840bafef72a6d", url = "mvn:com.ximpleware:vtd-xml:jar:2.11", @@ -98,7 +99,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "icu-binary.jar", sha1 = "786d9055d4ca8c1aab4a7d4ac8283f973fd7e41f", url = "mvn:com.ibm.icu:icu4j:jar:53.1", @@ -112,13 +113,13 @@ rn_prebuilt_jar( # This new rule will make the .jar file appear in the "right" location, # though that may change in the future -export_file( +fb_native.export_file( name = "robolectric-android-all-binary.jar", src = ":robolectric-android-all-binary-remote.jar", out = "../android-all-4.1.2_r1-robolectric-0.jar", # name defines filename used by robolectric in runtime ) -remote_file( +fb_native.remote_file( name = "robolectric-android-all-binary-remote.jar", sha1 = "aecc8ce5119a25fcea1cdf8285469c9d1261a352", url = "mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-0", @@ -130,13 +131,13 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -export_file( +fb_native.export_file( name = "json.jar", src = ":json-remote.jar", out = "../json-20080701.jar", # name defines filename used by robolectric in runtime ) -remote_file( +fb_native.remote_file( name = "json-remote.jar", sha1 = "d652f102185530c93b66158b1859f35d45687258", url = "mvn:org.json:json:jar:20080701", @@ -148,13 +149,13 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -export_file( +fb_native.export_file( name = "tagsoup.jar", src = ":tagsoup-remote.jar", out = "../tagsoup-1.2.jar", # name defines filename used by robolectric in runtime ) -remote_file( +fb_native.remote_file( name = "tagsoup-remote.jar", sha1 = "639fd364750d7363c85797dc944b4a80f78fa684", url = "mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2", @@ -166,13 +167,13 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -export_file( +fb_native.export_file( name = "robolectric-shadows-binary.jar", src = ":robolectric-shadows-binary-remote.jar", out = "../shadows-core-3.0-16.jar", # name defines filename used by robolectric in runtime ) -remote_file( +fb_native.remote_file( name = "robolectric-shadows-binary-remote.jar", sha1 = "39d7a856bf91640b1a6d044333336a2b3f3c198f", url = "https://repo1.maven.org/maven2/org/robolectric/shadows-core/3.0/shadows-core-3.0-16.jar", diff --git a/ReactAndroid/src/main/third-party/java/sqlite/BUCK b/ReactAndroid/src/main/third-party/java/sqlite/BUCK index ff5c72cd36bcf5..7fd47e8a19d975 100644 --- a/ReactAndroid/src/main/third-party/java/sqlite/BUCK +++ b/ReactAndroid/src/main/third-party/java/sqlite/BUCK @@ -1,3 +1,4 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") rn_android_library( @@ -14,7 +15,7 @@ rn_prebuilt_jar( visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "download-sqlite4java.jar", sha1 = "745a7e2f35fdbe6336922e0d492c979dbbfa74fb", url = "mvn:com.almworks.sqlite4java:sqlite4java:jar:0.282", diff --git a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK index 9b9ec7008d9b5a..9ef85775609c06 100644 --- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK +++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK @@ -1,22 +1,24 @@ -android_prebuilt_aar( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.android_prebuilt_aar( name = "runner", aar = ":testing-support-lib-runner-download", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "testing-support-lib-runner-download", sha1 = "a31e7e8db98ca19fb3fab23f120d19a6f4e3e8a9", url = "mvn:com.android.support.test:runner:aar:0.3", ) -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "exposed-instrumentation-api", aar = ":testing-support-instrumentation", visibility = ["//ReactAndroid/..."], ) -remote_file( +fb_native.remote_file( name = "testing-support-instrumentation", sha1 = "a7161eafdfbd02a39461f076c9dce0c8e5e7a149", url = "mvn:com.android.support.test:exposed-instrumentation-api-publish:aar:0.3", diff --git a/keystores/BUCK b/keystores/BUCK index 88e4c31b28d497..a1cea0ff55c4f6 100644 --- a/keystores/BUCK +++ b/keystores/BUCK @@ -1,4 +1,6 @@ -keystore( +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.keystore( name = "debug", properties = "debug.keystore.properties", store = "debug.keystore",