From 7ff9352a885ce450cfa0d2ce65d0b55e9774bd67 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 22 Aug 2018 13:32:24 -0700 Subject: [PATCH] Remove TextLayoutBuilder from ReactAndroid dependency (#20600) Summary: This PR removes TextLayoutBuilder, which is not used anywhere. Pull Request resolved: https://github.com/facebook/react-native/pull/20600 Reviewed By: achen1 Differential Revision: D9367345 Pulled By: hramos fbshipit-source-id: 407a6a80f5c69650fcc7167b28214f7315beed2f --- ReactAndroid/build.gradle | 1 - ReactAndroid/proguard-rules.pro | 4 --- .../src/main/libraries/textlayoutbuilder/BUCK | 34 ------------------- 3 files changed, 39 deletions(-) delete mode 100644 ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 7e92d969d3..d14674d231 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -296,7 +296,6 @@ dependencies { compile 'com.facebook.infer.annotation:infer-annotation:0.11.2' compile 'javax.inject:javax.inject:1' compile 'com.android.support:appcompat-v7:27.1.1' - compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' compile "com.facebook.fresco:fresco:${FRESCO_VERSION}" compile "com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}" compile 'com.facebook.soloader:soloader:0.5.1' diff --git a/ReactAndroid/proguard-rules.pro b/ReactAndroid/proguard-rules.pro index 668d5bd472..aa586132f2 100644 --- a/ReactAndroid/proguard-rules.pro +++ b/ReactAndroid/proguard-rules.pro @@ -51,10 +51,6 @@ -dontwarn com.facebook.react.** -keep,includedescriptorclasses class com.facebook.react.bridge.** { *; } -# TextLayoutBuilder uses a non-public Android constructor within StaticLayout. -# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details. --dontwarn android.text.StaticLayout - # okhttp -keepattributes Signature diff --git a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK b/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK deleted file mode 100644 index 60baf8edc4..0000000000 --- a/ReactAndroid/src/main/libraries/textlayoutbuilder/BUCK +++ /dev/null @@ -1,34 +0,0 @@ -load("//ReactNative:DEFS.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar") - -rn_android_library( - name = "textlayoutbuilder", - visibility = ["//ReactAndroid/..."], - exported_deps = [ - ":staticlayoutproxy", - ":textlayoutbuilder-base", - ], -) - -rn_android_prebuilt_aar( - name = "textlayoutbuilder-base", - aar = ":textlayoutbuilder-base-aar", - visibility = ["//ReactAndroid/..."], -) - -remote_file( - name = "textlayoutbuilder-base-aar", - sha1 = "29bc8e5a1e2b33944b88277652ee83092ae1dbc0", - url = "mvn:com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:aar:1.0.0", -) - -rn_prebuilt_jar( - name = "staticlayoutproxy", - binary_jar = ":staticlayoutproxy.jar", - visibility = ["//ReactAndroid/..."], -) - -remote_file( - name = "staticlayoutproxy.jar", - sha1 = "f162442a19fff13995fbd51ba414d9ee05579080", - url = "mvn:com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:jar:1.0", -)