From 2d1bdfa5ff71b88d1670f3f93c18a90d4c783a1a Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 09:36:07 +0800 Subject: [PATCH 1/6] fix surface BUCK, and CI --- ReactAndroid/src/main/java/com/facebook/react/surface/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK index 7682d522000943..45138289026558 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK @@ -1,4 +1,4 @@ -load("@fbsource//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", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library") rn_android_library( name = "surface", From b59b2d46e48e1b615cd3e23fe273233274e3c02b Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 09:44:13 +0800 Subject: [PATCH 2/6] fix support:annotation target --- ReactAndroid/src/main/java/com/facebook/react/surface/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK index 45138289026558..c19dcb79cc0eb6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK @@ -10,7 +10,7 @@ rn_android_library( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), - react_native_dep("third-party/android/support-annotations:android-support-annotations"), + react_native_dep("third-party/android/support/v4:annotation"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), From d63974a646e57db11ebff479e28457d40ec7f7c2 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 16:52:51 +0800 Subject: [PATCH 3/6] annotations target --- .../src/main/java/com/facebook/react/surface/BUCK | 2 +- .../third-party/android/support-annotations/BUCK | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ReactAndroid/src/main/third-party/android/support-annotations/BUCK diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK index c19dcb79cc0eb6..45138289026558 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK @@ -10,7 +10,7 @@ rn_android_library( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), - react_native_dep("third-party/android/support/v4:annotation"), + react_native_dep("third-party/android/support-annotations:android-support-annotations"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK new file mode 100644 index 00000000000000..68c3ac6d729653 --- /dev/null +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -0,0 +1,13 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( + name = "android-support-annotations", + binary_jar = ":annotation.jar", + visibility = ["PUBLIC"], +) + +fb_native.remote_file( + name = "annotation.jar", + sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f", + url = "mvn:androidx.annotation:annotation:jar:1.0.1", +) \ No newline at end of file From b44e9ca305a18f4fd42567b1846da8a2f0056da6 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 17:09:01 +0800 Subject: [PATCH 4/6] trigger ci --- .../src/main/third-party/android/support-annotations/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index 68c3ac6d729653..14445f42814ec1 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -10,4 +10,4 @@ fb_native.remote_file( name = "annotation.jar", sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f", url = "mvn:androidx.annotation:annotation:jar:1.0.1", -) \ No newline at end of file +) From 7047cd0487a5f38fd49ea5dad8db337a2c6dde0d Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 17:22:21 +0800 Subject: [PATCH 5/6] use support-v4 as whole --- ReactAndroid/src/main/java/com/facebook/react/surface/BUCK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK index 45138289026558..41001012cc4401 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK @@ -10,7 +10,7 @@ rn_android_library( deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), - 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/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/react/bridge:bridge"), From cb00db6c861d59fd39a73dd9ba0d5c695a9a5cc4 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Thu, 11 Apr 2019 17:39:13 +0800 Subject: [PATCH 6/6] remove unused BUCK --- .../third-party/android/support-annotations/BUCK | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 ReactAndroid/src/main/third-party/android/support-annotations/BUCK diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK deleted file mode 100644 index 14445f42814ec1..00000000000000 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ /dev/null @@ -1,13 +0,0 @@ -load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") - -fb_native.prebuilt_jar( - name = "android-support-annotations", - binary_jar = ":annotation.jar", - visibility = ["PUBLIC"], -) - -fb_native.remote_file( - name = "annotation.jar", - sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f", - url = "mvn:androidx.annotation:annotation:jar:1.0.1", -)