diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK index bc7d7c40a3b..6af3bb0e5ec 100644 --- a/RNTester/android/app/BUCK +++ b/RNTester/android/app/BUCK @@ -12,6 +12,7 @@ rn_android_binary( rn_android_library( name = "rntester-lib", srcs = glob(["src/main/java/**/*.java"]), + is_androidx = True, deps = [ ":res", react_native_dep("third-party/android/support/v4:lib-support-v4"), diff --git a/RNTester/android/app/gradle.properties b/RNTester/android/app/gradle.properties index 4dc41ef3f9c..4f009ba4543 100644 --- a/RNTester/android/app/gradle.properties +++ b/RNTester/android/app/gradle.properties @@ -4,3 +4,6 @@ MYAPP_RELEASE_STORE_FILE=my-release-key.keystore MYAPP_RELEASE_KEY_ALIAS=androiddebugkey MYAPP_RELEASE_STORE_PASSWORD=android MYAPP_RELEASE_KEY_PASSWORD=android + +android.useAndroidX=true +android.enableJetifier=true diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 4300a842306..977b812206a 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -287,7 +287,7 @@ android { buildConfigField("boolean", "IS_INTERNAL_BUILD", "false") buildConfigField("int", "EXOPACKAGE_FLAGS", "0") testApplicationId("com.facebook.react.tests.gradle") - testInstrumentationRunner("android.support.test.runner.AndroidJUnitRunner") + testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner") } sourceSets.main { @@ -337,8 +337,9 @@ dependencies { testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}") androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"])) - androidTestImplementation("com.android.support.test:runner:${ANDROID_SUPPORT_TEST_VERSION}") - androidTestImplementation("com.android.support.test:rules:${ANDROID_SUPPORT_TEST_VERSION}") + //TODO: Refactor to extract versions of androidx dependencies + androidTestImplementation("androidx.test:runner:1.1.0") + androidTestImplementation("androidx.test:rules:1.1.0") androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}") } diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index a2cd67ca398..c7d08bf4cd5 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -21,3 +21,6 @@ DOUBLE_CONVERSION_VERSION=1.1.6 FOLLY_VERSION=2018.10.22.00 GLOG_VERSION=0.3.5 JSC_VERSION=236355.1.1 + +android.useAndroidX=true +android.enableJetifier=true diff --git a/ReactAndroid/src/androidTest/buck-runner/AndroidManifest.xml b/ReactAndroid/src/androidTest/buck-runner/AndroidManifest.xml index 7672ea05ee6..49b4a1fc433 100644 --- a/ReactAndroid/src/androidTest/buck-runner/AndroidManifest.xml +++ b/ReactAndroid/src/androidTest/buck-runner/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK index a88b8ccb4e0..8776a33aa39 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/BUCK @@ -9,6 +9,7 @@ rn_android_library( "network/**/*.java", ], ), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java index 8f8a40ffb0b..85c8ab0ff22 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java @@ -11,7 +11,7 @@ import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.View; import android.view.ViewTreeObserver; import android.widget.FrameLayout; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java index 6c0828a6aa3..af5f72a0098 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java @@ -15,7 +15,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import android.app.Application; -import android.support.test.InstrumentationRegistry; import android.test.AndroidTestCase; import android.view.View; import android.view.ViewGroup; @@ -164,7 +163,9 @@ public abstract class ReactIntegrationTestCase extends AndroidTestCase { } public void waitForIdleSync() { - InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + return; + // TODO: re-enable after cleanup of android-x migration + //InstrumentationRegistry.getInstrumentation().waitForIdleSync(); } public void waitForBridgeAndUIIdle() { diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java index a11a6a3499a..360d10b7bc7 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java @@ -15,7 +15,6 @@ import javax.annotation.Nullable; import android.app.Instrumentation; import android.content.Context; -import android.support.test.InstrumentationRegistry; import android.view.View; import android.view.ViewGroup; @@ -120,12 +119,13 @@ public class ReactTestHelper { } public static ReactTestFactory getReactTestFactory() { - Instrumentation inst = InstrumentationRegistry.getInstrumentation(); - if (!(inst instanceof ReactTestFactory)) { +// TODO: re-enable after cleanup of android-x migration +// Instrumentation inst = InstrumentationRegistry.getInstrumentation(); +// if (!(inst instanceof ReactTestFactory)) { return new DefaultReactTestFactory(); - } - - return (ReactTestFactory) inst; +// } +// +// return (ReactTestFactory) inst; } public static ReactTestFactory.ReactInstanceEasyBuilder catalystInstanceBuilder( @@ -151,13 +151,14 @@ public class ReactTestHelper { final CatalystInstance instance = builder.build(); testCase.initializeWithInstance(instance); instance.runJSBundle(); - InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() { - @Override - public void run() { +// TODO: re-enable after cleanup of android-x migration +// InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() { +// @Override +// public void run() { ReactChoreographer.initialize(); instance.initialize(); - } - }); +// } +// }); testCase.waitForBridgeAndUIIdle(); return instance; } diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK index 61925bb545b..80a28b690ef 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "idledetection", srcs = glob(["**/*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java index c749cfef94a..4410d808a2f 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java @@ -7,17 +7,7 @@ package com.facebook.react.testing.idledetection; -import android.view.Choreographer; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import android.app.Instrumentation; -import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; - import com.facebook.react.bridge.ReactContext; -import com.facebook.react.bridge.UiThreadUtil; -import com.facebook.react.modules.core.ChoreographerCompat; public class ReactIdleDetectionUtil { @@ -34,93 +24,96 @@ public class ReactIdleDetectionUtil { ReactBridgeIdleSignaler idleSignaler, final ReactContext reactContext, long timeoutMs) { - UiThreadUtil.assertNotOnUiThread(); - long startTime = SystemClock.uptimeMillis(); - waitInner(idleSignaler, timeoutMs); - - long timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); - waitForChoreographer(timeToWait); - waitForJSIdle(reactContext); - - timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); - waitInner(idleSignaler, timeToWait); - timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); - waitForChoreographer(timeToWait); + return ; + // TODO: re-enable after cleanup of android-x migration +// UiThreadUtil.assertNotOnUiThread(); +// +// long startTime = SystemClock.uptimeMillis(); +// waitInner(idleSignaler, timeoutMs); +// +// long timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); +// waitForChoreographer(timeToWait); +// waitForJSIdle(reactContext); +// +// timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); +// waitInner(idleSignaler, timeToWait); +// timeToWait = Math.max(1, timeoutMs - (SystemClock.uptimeMillis() - startTime)); +// waitForChoreographer(timeToWait); } - private static void waitForChoreographer(long timeToWait) { - final int waitFrameCount = 2; - final CountDownLatch latch = new CountDownLatch(1); - UiThreadUtil.runOnUiThread( - new Runnable() { - @Override - public void run() { - final ChoreographerCompat choreographerCompat = ChoreographerCompat.getInstance(); - choreographerCompat.postFrameCallback( - new ChoreographerCompat.FrameCallback() { - - private int frameCount = 0; - - @Override - public void doFrame(long frameTimeNanos) { - frameCount++; - if (frameCount == waitFrameCount) { - latch.countDown(); - } else { - choreographerCompat.postFrameCallback(this); - } - } - }); - } - }); - try { - if (!latch.await(timeToWait, TimeUnit.MILLISECONDS)) { - throw new RuntimeException("Timed out waiting for Choreographer"); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private static void waitForJSIdle(ReactContext reactContext) { - if (!reactContext.hasActiveCatalystInstance()) { - return; - } - final CountDownLatch latch = new CountDownLatch(1); - - reactContext.runOnJSQueueThread( - new Runnable() { - @Override - public void run() { - latch.countDown(); - } - }); - - try { - if (!latch.await(5000, TimeUnit.MILLISECONDS)) { - throw new RuntimeException("Timed out waiting for JS thread"); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private static void waitInner(ReactBridgeIdleSignaler idleSignaler, long timeToWait) { - // TODO gets broken in gradle, do we need it? - Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); - long startTime = SystemClock.uptimeMillis(); - boolean bridgeWasIdle = false; - while (SystemClock.uptimeMillis() - startTime < timeToWait) { - boolean bridgeIsIdle = idleSignaler.isBridgeIdle(); - if (bridgeIsIdle && bridgeWasIdle) { - return; - } - bridgeWasIdle = bridgeIsIdle; - long newTimeToWait = Math.max(1, timeToWait - (SystemClock.uptimeMillis() - startTime)); - idleSignaler.waitForIdle(newTimeToWait); - instrumentation.waitForIdleSync(); - } - throw new RuntimeException("Timed out waiting for bridge and UI idle!"); - } +// private static void waitForChoreographer(long timeToWait) { +// final int waitFrameCount = 2; +// final CountDownLatch latch = new CountDownLatch(1); +// UiThreadUtil.runOnUiThread( +// new Runnable() { +// @Override +// public void run() { +// final ChoreographerCompat choreographerCompat = ChoreographerCompat.getInstance(); +// choreographerCompat.postFrameCallback( +// new ChoreographerCompat.FrameCallback() { +// +// private int frameCount = 0; +// +// @Override +// public void doFrame(long frameTimeNanos) { +// frameCount++; +// if (frameCount == waitFrameCount) { +// latch.countDown(); +// } else { +// choreographerCompat.postFrameCallback(this); +// } +// } +// }); +// } +// }); +// try { +// if (!latch.await(timeToWait, TimeUnit.MILLISECONDS)) { +// throw new RuntimeException("Timed out waiting for Choreographer"); +// } +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// +// private static void waitForJSIdle(ReactContext reactContext) { +// if (!reactContext.hasActiveCatalystInstance()) { +// return; +// } +// final CountDownLatch latch = new CountDownLatch(1); +// +// reactContext.runOnJSQueueThread( +// new Runnable() { +// @Override +// public void run() { +// latch.countDown(); +// } +// }); +// +// try { +// if (!latch.await(5000, TimeUnit.MILLISECONDS)) { +// throw new RuntimeException("Timed out waiting for JS thread"); +// } +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } +// +// private static void waitInner(ReactBridgeIdleSignaler idleSignaler, long timeToWait) { +// // TODO gets broken in gradle, do we need it? +// Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); +// long startTime = SystemClock.uptimeMillis(); +// boolean bridgeWasIdle = false; +// while (SystemClock.uptimeMillis() - startTime < timeToWait) { +// boolean bridgeIsIdle = idleSignaler.isBridgeIdle(); +// if (bridgeIsIdle && bridgeWasIdle) { +// return; +// } +// bridgeWasIdle = bridgeIsIdle; +// long newTimeToWait = Math.max(1, timeToWait - (SystemClock.uptimeMillis() - startTime)); +// idleSignaler.waitForIdle(newTimeToWait); +// instrumentation.waitForIdleSync(); +// } +// throw new RuntimeException("Timed out waiting for bridge and UI idle!"); +// } } diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK index e1c7eed2913..833d7246599 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK @@ -11,6 +11,7 @@ load( rn_android_library( name = "rule", srcs = glob(["*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java index ab16e8d0984..c4bf721717e 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/ReactNativeTestRule.java @@ -7,7 +7,7 @@ package com.facebook.react.testing.rule; import android.app.Activity; import android.os.Build; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactPackage; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK index 7266b1d2c52..e7e4481dd7a 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_int rn_android_library( name = "tests", srcs = glob(["*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java index b131f813c97..cb8d22f6e21 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java @@ -13,8 +13,8 @@ import java.util.List; import android.app.DatePickerDialog; import android.content.DialogInterface; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.widget.DatePicker; import com.facebook.react.bridge.BaseJavaModule; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java index 83dae93deec..83d382d112c 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java @@ -17,7 +17,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentFilter.MalformedMimeTypeException; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import com.facebook.react.bridge.BaseJavaModule; import com.facebook.react.testing.ReactInstanceSpecForTest; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java index a15ecbcae42..a899098dbd6 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java @@ -12,7 +12,7 @@ import java.util.List; import android.app.TimePickerDialog; import android.content.DialogInterface; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import com.facebook.react.bridge.BaseJavaModule; import com.facebook.react.testing.ReactInstanceSpecForTest; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK index e6d69615549..5d3380b6f8b 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK @@ -11,6 +11,7 @@ load( rn_android_library( name = "core", srcs = glob(["*.java"]), + is_androidx = True, deps = ([ react_native_dep("third-party/java/espresso:espresso"), react_native_dep("third-party/java/fest:fest"), diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java index e03721be842..afb2540ddcb 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java @@ -6,10 +6,10 @@ package com.facebook.react.tests.core; import android.app.Activity; -import android.support.test.InstrumentationRegistry; -import android.support.test.annotation.UiThreadTest; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.annotation.UiThreadTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactRootView; import com.facebook.react.common.LifecycleState; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java index 5123f04fd66..acc108fb3c3 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactRootViewTest.java @@ -8,8 +8,8 @@ package com.facebook.react.tests.core; import static org.fest.assertions.api.Assertions.assertThat; import android.app.Instrumentation; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/WritableNativeMapTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/WritableNativeMapTest.java index bb2ad2c9bab..8e0943916a0 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/WritableNativeMapTest.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/WritableNativeMapTest.java @@ -2,7 +2,7 @@ package com.facebook.react.tests.core; import static org.fest.assertions.api.Assertions.assertThat; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.facebook.react.bridge.UnexpectedNativeTypeException; import com.facebook.react.bridge.WritableNativeArray; import com.facebook.react.bridge.WritableNativeMap; diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK index 311580f08e4..f869e109cf7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "react", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), react_native_dep("third-party/android/support/v4:lib-support-v4"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java index 91394befee2..8c649f407f2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java @@ -8,7 +8,7 @@ package com.facebook.react; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.facebook.react.bridge.ModuleHolder; import com.facebook.react.bridge.ModuleSpec; import com.facebook.react.bridge.NativeModule; diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java index 62283794e41..080fb54e083 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java @@ -11,7 +11,7 @@ import javax.annotation.Nullable; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.KeyEvent; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index e8ff4ab6d9e..69c42c75fb3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -38,7 +38,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.os.Process; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.Log; import android.view.View; import com.facebook.common.logging.FLog; diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java index 5ce5b825959..105f13ff883 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.java @@ -7,7 +7,7 @@ package com.facebook.react; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.ModuleHolder; import com.facebook.react.bridge.NativeModule; diff --git a/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java index bd2b019eb7c..dfe86a3572f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.java @@ -7,7 +7,7 @@ package com.facebook.react; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.facebook.react.bridge.ModuleHolder; import com.facebook.react.bridge.ModuleSpec; import com.facebook.react.bridge.NativeModule; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK index e331468d59a..19eea44b5f2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK @@ -19,6 +19,7 @@ rn_android_library( ["**/*.java"], exclude = INTERFACES, ), + is_androidx = True, proguard_config = "reactnative.pro", provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), @@ -54,6 +55,7 @@ rn_android_library( rn_android_library( name = "interfaces", srcs = glob(INTERFACES), + is_androidx = True, proguard_config = "reactnative.pro", provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java index 77a1bc9a428..d05a80d295c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java @@ -9,7 +9,7 @@ package com.facebook.react.bridge; import javax.annotation.Nullable; -import android.support.v4.util.Pools; +import androidx.core.util.Pools; /** * Implementation of Dynamic wrapping a ReadableArray. diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java index 0d9f9a3a2a5..2d0ef04cf4b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java @@ -9,7 +9,7 @@ package com.facebook.react.bridge; import javax.annotation.Nullable; -import android.support.v4.util.Pools.SimplePool; +import androidx.core.util.Pools.SimplePool; /** * Implementation of Dynamic wrapping a ReadableMap. diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java index cba28dea602..ec632940b47 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java @@ -7,7 +7,7 @@ package com.facebook.react.bridge; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.facebook.jni.HybridData; import com.facebook.infer.annotation.Assertions; diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK index 6a6a5452b35..2ee45fdccf2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK @@ -10,6 +10,7 @@ rn_android_library( ["**/*.java"], exclude = SUB_PROJECTS, ), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java b/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java index 2b296f71400..51c26e3c23b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java +++ b/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.java @@ -5,10 +5,10 @@ package com.facebook.react.common; -import android.support.v4.util.Pools; +import androidx.core.util.Pools; /** - * Like {@link android.support.v4.util.Pools.SynchronizedPool} with the option to clear the pool + * Like {@link androidx.core.util.Pools.SynchronizedPool} with the option to clear the pool * (e.g. on memory pressure). */ public class ClearableSynchronizedPool implements Pools.Pool { diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK index c55a87ca018..5a3af152f7c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "devsupport", srcs = glob(["*.java"]), + is_androidx = True, manifest = "AndroidManifest.xml", provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), @@ -36,6 +37,7 @@ rn_android_library( rn_android_library( name = "interfaces", srcs = glob(["interfaces/*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index 729cf96bec4..2d58c949ff3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -20,7 +20,7 @@ import android.content.pm.PackageManager; import android.hardware.SensorManager; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Pair; import android.widget.Toast; import com.facebook.common.logging.FLog; diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java index 625c59f18e5..3df7aa399a2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java @@ -8,7 +8,7 @@ package com.facebook.react.devsupport; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.SpannedString; import com.facebook.react.devsupport.interfaces.StackFrame; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK index a3079312b40..89c3b49f3b9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK @@ -7,6 +7,7 @@ rn_android_library( "jsi/*.java", "mounting/**/*.java", ]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 828cb2c6478..59cc67ce8d8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -15,9 +15,9 @@ import static com.facebook.react.uimanager.common.UIManagerType.FABRIC; import android.annotation.SuppressLint; import android.os.SystemClock; -import android.support.annotation.GuardedBy; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.GuardedBy; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.view.View; import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.ThreadConfined; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java index 11c78aec487..4d5e621ffc1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/EventEmitterWrapper.java @@ -7,7 +7,7 @@ package com.facebook.react.fabric.jsi; import android.annotation.SuppressLint; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeMap; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ContextBasedViewPool.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ContextBasedViewPool.java index c92476535d0..d0cd0fafeb5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ContextBasedViewPool.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ContextBasedViewPool.java @@ -6,7 +6,7 @@ */ package com.facebook.react.fabric.mounting; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import android.view.View; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.uimanager.ThemedReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index c79c7b2d0f6..d589e7ab5dd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -7,9 +7,9 @@ package com.facebook.react.fabric.mounting; import android.content.Context; -import android.support.annotation.AnyThread; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.AnyThread; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ViewPool.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ViewPool.java index 5cf657691f2..e253a98d2df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ViewPool.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/ViewPool.java @@ -6,7 +6,7 @@ */ package com.facebook.react.fabric.mounting; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import android.view.View; import com.facebook.react.common.ClearableSynchronizedPool; import com.facebook.react.uimanager.ThemedReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java index 8ab88839619..a081d0813f6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchCommandMountItem.java @@ -6,7 +6,7 @@ */ package com.facebook.react.fabric.mounting.mountitems; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.react.fabric.mounting.MountingManager; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.UiThreadUtil; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java index 7cf7d2576cf..2206a77fc79 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItem.java @@ -6,7 +6,7 @@ */ package com.facebook.react.fabric.mounting.mountitems; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import com.facebook.react.fabric.mounting.MountingManager; public interface MountItem { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK index fd63d62e0f3..b4d97de45e5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "blob", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java index 9c64c966256..830180c6ffc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java @@ -12,7 +12,7 @@ import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.webkit.MimeTypeMap; import com.facebook.react.bridge.Arguments; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java index 0f124314130..c6766aec761 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java @@ -12,7 +12,7 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.ParcelFileDescriptor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.react.ReactApplication; import com.facebook.react.ReactNativeHost; import com.facebook.react.bridge.ReactContext; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK index edb587a8d9b..57fede4bc38 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "datepicker", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java index 5ddeae7b983..fdaa97fe3b7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java @@ -21,7 +21,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.widget.DatePicker; @SuppressLint("ValidFragment") diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java index 8b8162af194..0ac30469346 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java @@ -12,9 +12,9 @@ import android.app.DatePickerDialog.OnDateSetListener; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.widget.DatePicker; import com.facebook.react.bridge.*; import com.facebook.react.common.annotations.VisibleForTesting; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK index 6736b020638..58a81de76df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "dialog", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java index 64e5c398780..eb05b067a71 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java @@ -12,7 +12,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnDismissListener; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.LifecycleEventListener; @@ -74,7 +74,7 @@ public class DialogModule extends ReactContextBaseJavaModule implements Lifecycl // Exactly one of the two is null private final @Nullable android.app.FragmentManager mFragmentManager; - private final @Nullable android.support.v4.app.FragmentManager mSupportFragmentManager; + private final @Nullable androidx.fragment.app.FragmentManager mSupportFragmentManager; private @Nullable Object mFragmentToShow; @@ -82,7 +82,7 @@ public class DialogModule extends ReactContextBaseJavaModule implements Lifecycl return mSupportFragmentManager != null; } - public FragmentManagerHelper(android.support.v4.app.FragmentManager supportFragmentManager) { + public FragmentManagerHelper(androidx.fragment.app.FragmentManager supportFragmentManager) { mFragmentManager = null; mSupportFragmentManager = supportFragmentManager; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java index 5892a850226..9c3f7211ee4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java @@ -14,7 +14,7 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; /** * {@link AlertFragment} for apps that use the Support FragmentActivity and FragmentManager 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 c3073b6db6d..34c1ca31fce 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "fresco", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java index 9ef9690cb40..4481cd42a4c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java @@ -10,7 +10,7 @@ package com.facebook.react.modules.fresco; import java.util.HashSet; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; import com.facebook.drawee.backends.pipeline.Fresco; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK index b2ed1d5f321..8945f73c890 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "i18nmanager", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java index bd5b4c6b8d9..2d0bce0bb6d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java @@ -9,8 +9,8 @@ package com.facebook.react.modules.i18nmanager; import android.content.Context; import android.content.SharedPreferences; -import android.support.v4.text.TextUtilsCompat; -import android.support.v4.view.ViewCompat; +import androidx.core.text.TextUtilsCompat; +import androidx.core.view.ViewCompat; import java.util.Locale; public class I18nUtil { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK index 8ba313dee7a..f2c28f62e7b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "location", srcs = glob(["**/*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java index 520eb2947a1..46df8e28c29 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java @@ -17,7 +17,7 @@ import android.location.LocationProvider; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Callback; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK index c17147a4ec8..8690aa226ca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "netinfo", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java index ac67030f7d7..56a953d06c4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java @@ -14,7 +14,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.v4.net.ConnectivityManagerCompat; +import androidx.core.net.ConnectivityManagerCompat; import android.telephony.TelephonyManager; import com.facebook.react.bridge.LifecycleEventListener; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK index 998fcbf3ff1..01a06bc8154 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "statusbar", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java index 3c0da261d07..8d7de95bd03 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java @@ -13,7 +13,7 @@ import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; import android.os.Build; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import android.view.WindowInsets; import android.view.WindowManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK index 51685f7d9de..b494c4d7893 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "timepicker", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java index 749e1002e64..c2f359b49fc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java @@ -14,7 +14,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.text.format.DateFormat; import java.util.Calendar; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java index 79013b4f211..7b346881297 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java @@ -11,9 +11,9 @@ import android.app.TimePickerDialog.OnTimeSetListener; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.widget.TimePicker; import com.facebook.react.bridge.NativeModule; diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK index 841944ec0e7..c136b1beb84 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "shell", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java index aeffe238a91..a2631a3edbc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityDelegateUtil.java @@ -6,12 +6,16 @@ package com.facebook.react.uimanager; import android.content.Context; -import android.support.v4.view.AccessibilityDelegateCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat; import android.text.SpannableString; import android.text.style.URLSpan; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat; import android.view.View; import com.facebook.react.R; import java.util.Locale; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK index f707ac49c32..63f3e09cd5a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK @@ -13,6 +13,7 @@ rn_android_library( "DisplayMetricsHolder.java", ], ), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], @@ -53,6 +54,7 @@ rn_android_library( srcs = [ "DisplayMetricsHolder.java", ], + is_androidx = True, required_for_source_only_abi = True, visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index 88fcf056601..3e6354f0410 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -7,7 +7,7 @@ package com.facebook.react.uimanager; import android.graphics.Color; import android.os.Build; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import android.view.ViewParent; import com.facebook.react.R; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java index 8ea4aec8b1d..45ea0700ea3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java @@ -7,7 +7,7 @@ package com.facebook.react.uimanager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.facebook.react.bridge.JSApplicationCausedNativeException; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java index e3d2b3f6851..459d3407b44 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java @@ -7,7 +7,7 @@ package com.facebook.react.uimanager; -import android.support.v4.util.Pools; +import androidx.core.util.Pools; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.WritableMap; diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK index 3ae6eb53a25..8775085d510 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra rn_android_library( name = "common", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], @@ -11,6 +12,7 @@ rn_android_library( "PUBLIC", ], deps = [ + # react_native_dep("third-party/android/androidx:appcompat"), react_native_dep("third-party/java/jsr-305:jsr-305"), ], ) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java index 65bed816ad9..9d8f920b84f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/UIManagerType.java @@ -11,7 +11,7 @@ import static com.facebook.react.uimanager.common.UIManagerType.DEFAULT; import static java.lang.annotation.RetentionPolicy.SOURCE; import java.lang.annotation.Retention; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; @Retention(SOURCE) @IntDef({DEFAULT, FABRIC}) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java index 617b9bc9839..59418f77035 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java @@ -9,7 +9,7 @@ package com.facebook.react.uimanager.events; import javax.annotation.Nullable; -import android.support.v4.util.Pools; +import androidx.core.util.Pools; import android.view.MotionEvent; import com.facebook.infer.annotation.Assertions; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK index 1973543c07d..68cb8eb4e7d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "checkbox", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java index 136512b31a0..594cd74ccff 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java @@ -7,7 +7,7 @@ package com.facebook.react.views.checkbox; import android.content.Context; -import android.support.v7.widget.AppCompatCheckBox; +import androidx.appcompat.widget.AppCompatCheckBox; /** CheckBox that has its value controlled by JS. */ /*package*/ class ReactCheckBox extends AppCompatCheckBox { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java index ac55c91b7c4..0839fb723fe 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java @@ -8,8 +8,8 @@ package com.facebook.react.views.checkbox; import android.content.Context; import android.content.res.ColorStateList; -import android.support.v4.widget.CompoundButtonCompat; -import android.support.v7.widget.TintContextWrapper; +import androidx.core.widget.CompoundButtonCompat; +import androidx.appcompat.widget.TintContextWrapper; import android.util.TypedValue; import android.widget.CompoundButton; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK index 3fb17b77642..4151ffca7b7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "drawer", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java index 0de81361043..52391c82d63 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java @@ -7,7 +7,7 @@ package com.facebook.react.views.drawer; -import android.support.v4.widget.DrawerLayout; +import androidx.drawerlayout.widget.DrawerLayout; import android.view.Gravity; import android.util.Log; import android.view.MotionEvent; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java index 55ab481d130..88f9f3ee18f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java @@ -8,7 +8,7 @@ package com.facebook.react.views.drawer; import android.os.Build; -import android.support.v4.widget.DrawerLayout; +import androidx.drawerlayout.widget.DrawerLayout; import android.view.Gravity; import android.view.View; import com.facebook.common.logging.FLog; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK index 5654d4dd9bd..2e870070eea 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK @@ -7,6 +7,7 @@ IMAGE_EVENT_FILES = [ rn_android_library( name = "imageevents", srcs = IMAGE_EVENT_FILES, + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], @@ -25,6 +26,7 @@ rn_android_library( ["*.java"], exclude = IMAGE_EVENT_FILES, ), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java index 43d4c152c48..00b85a2aed5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java @@ -7,7 +7,7 @@ package com.facebook.react.views.image; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.WritableMap; import com.facebook.react.uimanager.events.Event; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK index 15edc7a1a50..8b35c9144e2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/BUCK @@ -3,13 +3,14 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "picker", srcs = glob(["**/*.java"]), - visibility = [ - "PUBLIC", - ], + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), ], + visibility = [ + "PUBLIC", + ], deps = [ react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java index 5bb2330ede4..09498f3175d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java @@ -8,7 +8,7 @@ package com.facebook.react.views.picker; import android.content.Context; -import android.support.v7.widget.AppCompatSpinner; +import androidx.appcompat.widget.AppCompatSpinner; import android.util.AttributeSet; import android.view.View; import android.widget.AdapterView; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK index 2a72452d058..63f67b851ba 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "scroll", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java index 0459b0688fd..5ff0da06ca8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerView.java @@ -6,7 +6,7 @@ package com.facebook.react.views.scroll; import android.content.Context; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.ViewGroup; import android.widget.HorizontalScrollView; import com.facebook.react.modules.i18nmanager.I18nUtil; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index 566b6018b02..db8e726a29c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -15,8 +15,8 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.graphics.Rect; import android.hardware.SensorManager; -import android.support.v4.view.ViewCompat; -import android.support.v4.text.TextUtilsCompat; +import androidx.core.view.ViewCompat; +import androidx.core.text.TextUtilsCompat; import android.util.Log; import android.view.MotionEvent; import android.view.View; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java index 6c7ff1a2179..1b84dee6b84 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java @@ -8,7 +8,7 @@ package com.facebook.react.views.scroll; import android.graphics.Color; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.DisplayMetrics; import com.facebook.react.bridge.ReadableArray; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index d99d878de4c..e6ef83137fb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -12,7 +12,7 @@ import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.Log; import android.view.MotionEvent; import android.view.View; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java index f669c607d3d..afe0725e43c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java @@ -8,7 +8,7 @@ package com.facebook.react.views.scroll; import android.graphics.Color; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.DisplayMetrics; import com.facebook.react.bridge.ReadableArray; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java index cdc129a8ff2..b05d1458127 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java @@ -11,7 +11,7 @@ import javax.annotation.Nullable; import java.lang.Override; -import android.support.v4.util.Pools; +import androidx.core.util.Pools; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.Arguments; 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 aad483852b0..ed8109be801 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "slider", srcs = glob(["*.java"]), + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java index aefbeacf252..b1e1db94631 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java @@ -8,7 +8,7 @@ package com.facebook.react.views.slider; import android.content.Context; import android.os.Build; -import android.support.v7.widget.AppCompatSeekBar; +import androidx.appcompat.widget.AppCompatSeekBar; import android.util.AttributeSet; import javax.annotation.Nullable; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK index 6bc4c1ae773..91f8fe21068 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "swiperefresh", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java index adc43971cce..0d717df1464 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java @@ -7,7 +7,7 @@ package com.facebook.react.views.swiperefresh; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.MotionEvent; import android.view.ViewConfiguration; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java index d808433135f..54bda8db223 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java @@ -10,8 +10,8 @@ package com.facebook.react.views.swiperefresh; import static com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager.REACT_CLASS; import android.graphics.Color; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; import com.facebook.react.module.annotations.ReactModule; 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 cb5257ca5fe..3535a85c992 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK @@ -3,7 +3,9 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "switchview", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ + react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), ], visibility = [ diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java index acaaf1b96fe..fc716387770 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java @@ -10,7 +10,7 @@ package com.facebook.react.views.switchview; import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import javax.annotation.Nullable; /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK index 2008eda3ce1..6c23775eae7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "text", srcs = glob(["*.java"]), + is_androidx = True, required_for_source_only_abi = True, visibility = [ "PUBLIC", diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java index a804a46a94a..e3575c54714 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java @@ -10,7 +10,7 @@ package com.facebook.react.views.text; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.v7.widget.AppCompatTextView; +import androidx.appcompat.widget.AppCompatTextView; import android.text.Layout; import android.text.Spannable; import android.text.Spanned; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK index 3c29c2262fc..dae8c212ad0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "textinput", srcs = glob(["*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index d4614c10dc9..4cf2d27bf2c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -11,7 +11,7 @@ import android.graphics.PorterDuff; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.Editable; import android.text.InputFilter; import android.text.InputType; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java index f40a05dde07..3189164288e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java @@ -9,7 +9,7 @@ package com.facebook.react.views.textinput; import android.annotation.TargetApi; import android.os.Build; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.text.Layout; import android.util.TypedValue; import android.view.ViewGroup; 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 76dd4b1d4b2..ac2b9fd7fec 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "toolbar", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java index ca8c8ebe12a..aca9653bb67 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java @@ -11,7 +11,7 @@ import android.content.Context; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java index 8467c957237..422d77d18c1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java @@ -11,7 +11,7 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Color; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.LayoutDirection; import android.view.MenuItem; import android.view.View; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK index 3043e4d3629..28218fd3460 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK @@ -3,12 +3,13 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r rn_android_library( name = "view", srcs = glob(["*.java"]), - visibility = [ - "PUBLIC", - ], + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], + visibility = [ + "PUBLIC", + ], deps = [ YOGA_TARGET, react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java index 7249c0933fd..e8041d8fbc1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java @@ -8,7 +8,7 @@ package com.facebook.react.views.view; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import javax.annotation.Nullable; diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK index 3d8e50a2f2f..34cfe9277c2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK @@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_tar rn_android_library( name = "viewpager", srcs = glob(["**/*.java"]), + is_androidx = True, provided_deps = [ react_native_dep("third-party/android/support/v4:lib-support-v4"), ], diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java index 48f52bce071..73ff7edc9af 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java @@ -7,8 +7,8 @@ package com.facebook.react.views.viewpager; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; diff --git a/ReactAndroid/src/main/third-party/android/androidx/BUCK b/ReactAndroid/src/main/third-party/android/androidx/BUCK new file mode 100644 index 00000000000..e484cf386f0 --- /dev/null +++ b/ReactAndroid/src/main/third-party/android/androidx/BUCK @@ -0,0 +1,653 @@ +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") + +fb_native.prebuilt_jar( + name = "annotation", + binary_jar = ":annotation.jar", + visibility = ["PUBLIC"], +) + +fb_native.android_library( + name = "appcompat", + visibility = ["PUBLIC"], + exported_deps = [ + ":appcompat-binary", + ":annotation", + ":collection", + ":core", + ":cursoradapter", + ":fragment", + ":legacy-support-core-utils", + ":vectordrawable", + ":vectordrawable-animated", + ] +) + +fb_native.android_library( + name = "asynclayoutinflater", + visibility = ["PUBLIC"], + exported_deps = [ + ":asynclayoutinflater-binary", + ":annotation", + ":core", + ] +) + +fb_native.android_library( + name = "collection", + visibility = ["PUBLIC"], + exported_deps = [ + ":collection-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "coordinatorlayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":coordinatorlayout-binary", + ":annotation", + ":core", + ":customview", + ] +) + +fb_native.android_library( + name = "core", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-binary", + ":annotation", + ":collection", + ":lifecycle-runtime", + ":versionedparcelable", + ] +) + +fb_native.android_library( + name = "core-common", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-common-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "core-runtime", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-runtime-binary", + ":core-common", + ] +) + +fb_native.android_library( + name = "cursoradapter", + visibility = ["PUBLIC"], + exported_deps = [ + ":cursoradapter-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "customview", + visibility = ["PUBLIC"], + exported_deps = [ + ":customview-binary", + ":annotation", + ":core", + ] +) + +fb_native.android_library( + name = "documentfile", + visibility = ["PUBLIC"], + exported_deps = [ + ":documentfile-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "drawerlayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":drawerlayout-binary", + ":annotation", + ":core", + ":customview", + ] +) + +fb_native.android_library( + name = "fragment", + visibility = ["PUBLIC"], + exported_deps = [ + ":fragment-binary", + ":annotation", + ":core", + ":legacy-support-core-ui", + ":legacy-support-core-utils", + ":lifecycle-viewmodel", + ":loader", + ] +) + +fb_native.android_library( + name = "interpolator", + visibility = ["PUBLIC"], + exported_deps = [ + ":interpolator-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "legacy-support-core-ui", + visibility = ["PUBLIC"], + exported_deps = [ + ":legacy-support-core-ui-binary", + ":annotation", + ":asynclayoutinflater", + ":coordinatorlayout", + ":core", + ":cursoradapter", + ":customview", + ":drawerlayout", + ":interpolator", + ":legacy-support-core-utils", + ":slidingpanelayout", + ":swiperefreshlayout", + ":viewpager", + ] +) + + +fb_native.android_library( + name = "legacy-support-core-utils", + visibility = ["PUBLIC"], + exported_deps = [ + ":legacy-support-core-utils-binary", + ":annotation", + ":core", + ":documentfile", + ":loader", + ":localbroadcastmanager", + ":print", + ] +) + +fb_native.android_library( + name = "lifecycle-common", + visibility = ["PUBLIC"], + exported_deps = [ + ":lifecycle-common-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "lifecycle-livedata", + visibility = ["PUBLIC"], + exported_deps = [ + ":lifecycle-livedata-binary", + ":core-common", + ":core-runtime", + ":lifecycle-livedata-core", + ] +) + +fb_native.android_library( + name = "lifecycle-livedata-core", + visibility = ["PUBLIC"], + exported_deps = [ + ":lifecycle-livedata-core-binary", + ":core-common", + ":core-runtime", + ":lifecycle-common", + ] +) + +fb_native.android_library( + name = "lifecycle-runtime", + visibility = ["PUBLIC"], + exported_deps = [ + ":lifecycle-runtime-binary", + ":annotation", + ":core-common", + ":lifecycle-common", + ] +) + +fb_native.android_library( + name = "lifecycle-viewmodel", + visibility = ["PUBLIC"], + exported_deps = [ + ":lifecycle-viewmodel-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "localbroadcastmanager", + visibility = ["PUBLIC"], + exported_deps = [ + ":localbroadcastmanager-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "loader", + visibility = ["PUBLIC"], + exported_deps = [ + ":loader-binary", + ":annotation", + ":core", + ":lifecycle-livedata", + ":lifecycle-viewmodel", + ] +) + +fb_native.android_library( + name = "print", + visibility = ["PUBLIC"], + exported_deps = [ + ":print-binary", + ":annotation", + ] +) + +fb_native.android_library( + name = "slidingpanelayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":slidingpanelayout-binary", + ":annotation", + ":core", + ":customview", + ] +) + +fb_native.android_library( + name = "swiperefreshlayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":swiperefreshlayout-binary", + ":annotation", + ":core", + ":interpolator", + ] +) + +fb_native.android_library( + name = "vectordrawable", + visibility = ["PUBLIC"], + exported_deps = [ + ":vectordrawable-binary", + ":annotation", + ":core", + ] +) + +fb_native.android_library( + name = "vectordrawable-animated", + visibility = ["PUBLIC"], + exported_deps = [ + ":vectordrawable-animated-binary", + ":legacy-support-core-ui", + ":vectordrawable", + ] +) + +fb_native.android_library( + name = "versionedparcelable", + visibility = ["PUBLIC"], + exported_deps = [ + ":versionedparcelable-binary", + ":annotation", + ":collection", + ] +) + +fb_native.android_library( + name = "viewpager", + visibility = ["PUBLIC"], + exported_deps = [ + ":viewpager-binary", + ":annotation", + ":core", + ":customview", + ] +) + +# Internal targets +fb_native.android_prebuilt_aar( + name = "appcompat-binary", + aar = ":appcompat-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "asynclayoutinflater-binary", + aar = ":asynclayoutinflater-binary-aar", +) + +fb_native.prebuilt_jar( + name = "collection-binary", + binary_jar = ":collection-binary.jar", +) + +fb_native.android_prebuilt_aar( + name = "coordinatorlayout-binary", + aar = ":coordinatorlayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "core-binary", + aar = ":core-binary-aar", +) + +fb_native.prebuilt_jar( + name = "core-common-binary", + binary_jar = ":core-common-binary.jar", +) + +fb_native.android_prebuilt_aar( + name = "core-runtime-binary", + aar = ":core-runtime-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "cursoradapter-binary", + aar = ":cursoradapter-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "customview-binary", + aar = ":customview-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "documentfile-binary", + aar = ":documentfile-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "drawerlayout-binary", + aar = ":drawerlayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "fragment-binary", + aar = ":fragment-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "interpolator-binary", + aar = ":interpolator-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "legacy-support-core-ui-binary", + aar = ":legacy-support-core-ui-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "legacy-support-core-utils-binary", + aar = ":legacy-support-core-utils-binary-aar", +) + +fb_native.prebuilt_jar( + name = "lifecycle-common-binary", + binary_jar = ":lifecycle-common-binary.jar", +) + +fb_native.android_prebuilt_aar( + name = "lifecycle-livedata-binary", + aar = ":lifecycle-livedata-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "lifecycle-livedata-core-binary", + aar = ":lifecycle-livedata-core-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "lifecycle-runtime-binary", + aar = ":lifecycle-runtime-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "lifecycle-viewmodel-binary", + aar = ":lifecycle-viewmodel-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "loader-binary", + aar = ":loader-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "localbroadcastmanager-binary", + aar = ":localbroadcastmanager-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "print-binary", + aar = ":print-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "slidingpanelayout-binary", + aar = ":slidingpanelayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "swiperefreshlayout-binary", + aar = ":swiperefreshlayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "vectordrawable-binary", + aar = ":vectordrawable-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "vectordrawable-animated-binary", + aar = ":vectordrawable-animated-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "versionedparcelable-binary", + aar = ":versionedparcelable-binary-aar", +) + + +fb_native.android_prebuilt_aar( + name = "viewpager-binary", + aar = ":viewpager-binary-aar", +) + +# Remote files +fb_native.remote_file( + name = "annotation.jar", + sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f", + url = "mvn:androidx.annotation:annotation:jar:1.0.1", +) + +fb_native.remote_file( + name = "appcompat-binary-aar", + sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae", + url = "mvn:androidx.appcompat:appcompat:aar:1.0.2", +) + +fb_native.remote_file( + name = "asynclayoutinflater-binary-aar", + sha1 = "5ffa788d19a6863799f25cb50d4fdfb0ec649037", + url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0", +) + + +fb_native.remote_file( + name = "collection-binary.jar", + sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a", + url = "mvn:androidx.collection:collection:jar:1.0.0", +) + +fb_native.remote_file( + name = "core-binary-aar", + sha1 = "263deba7f9c24bd0cefb93c0aaaf402cc50828ee", + url = "mvn:androidx.core:core:aar:1.0.1", +) + +fb_native.remote_file( + name = "core-common-binary.jar", + sha1 = "bb21b9a11761451b51624ac428d1f1bb5deeac38", + url = "mvn:androidx.arch.core:core-common:jar:2.0.0", +) + +fb_native.remote_file( + name = "core-runtime-binary-aar", + sha1 = "c5be9edf9ca9135a465d23939f6e7d0e1cf90b41", + url = "mvn:androidx.arch.core:core-runtime:aar:2.0.0", +) + +fb_native.remote_file( + name = "coordinatorlayout-binary-aar", + sha1 = "7664385a7e39112b780baf8819ee880dcd3c4094", + url = "mvn:androidx.coordinatorlayout:coordinatorlayout:aar:1.0.0", +) + +fb_native.remote_file( + name = "cursoradapter-binary-aar", + sha1 = "74014983a86b83cbce534dec4e7aa9312f5f5d82", + url = "mvn:androidx.cursoradapter:cursoradapter:aar:1.0.0", +) + +fb_native.remote_file( + name = "customview-binary-aar", + sha1 = "30f5ff6075d112f8076e733b24410e68159735b6", + url = "mvn:androidx.customview:customview:aar:1.0.0", +) + +fb_native.remote_file( + name = "documentfile-binary-aar", + sha1 = "66104345c90cd8c2fd5ad2d3aad692b280e10c32", + url = "mvn:androidx.documentfile:documentfile:aar:1.0.0", +) + +fb_native.remote_file( + name = "drawerlayout-binary-aar", + sha1 = "dd02c7e207136e1272b33815cc61e57676ed13a2", + url = "mvn:androidx.drawerlayout:drawerlayout:aar:1.0.0", +) + +fb_native.remote_file( + name = "fragment-binary-aar", + sha1 = "0b40f6a2ae814f72d1e71a5df6dc1283c00cd52f", + url = "mvn:androidx.fragment:fragment:aar:1.0.0", +) + +fb_native.remote_file( + name = "interpolator-binary-aar", + sha1 = "8a01fa254a23b9388571eb6334b03707c7d122d7", + url = "mvn:androidx.interpolator:interpolator:aar:1.0.0", +) + +fb_native.remote_file( + name = "legacy-support-core-ui-binary-aar", + sha1 = "61a264f996046e059f889914050fae1e75d3b702", + url = "mvn:androidx.legacy:legacy-support-core-ui:aar:1.0.0", +) + +fb_native.remote_file( + name = "legacy-support-core-utils-binary-aar", + sha1 = "9b9570042115da8629519090dfeb71df75da59fc", + url = "mvn:androidx.legacy:legacy-support-core-utils:aar:1.0.0", +) + +fb_native.remote_file( + name = "lifecycle-common-binary.jar", + sha1 = "e070ffae07452331bc5684734fce6831d531785c", + url = "mvn:androidx.lifecycle:lifecycle-common:jar:2.0.0", +) + +fb_native.remote_file( + name = "lifecycle-livedata-binary-aar", + sha1 = "c17007cd0b21d6401910b0becdd16c438c68a9af", + url = "mvn:androidx.lifecycle:lifecycle-livedata:aar:2.0.0", +) + +fb_native.remote_file( + name = "lifecycle-livedata-core-binary-aar", + sha1 = "1a7cee84b43fa935231b016f0665cd56a72fa9db", + url = "mvn:androidx.lifecycle:lifecycle-livedata-core:aar:2.0.0", +) + +fb_native.remote_file( + name = "lifecycle-runtime-binary-aar", + sha1 = "ea27e9e79e9a0fbedfa4dbbef5ddccf0e1d9d73f", + url = "mvn:androidx.lifecycle:lifecycle-runtime:aar:2.0.0", +) + +fb_native.remote_file( + name = "lifecycle-viewmodel-binary-aar", + sha1 = "6417c576c458137456d996914c50591e7f4acc24", + url = "mvn:androidx.lifecycle:lifecycle-viewmodel:aar:2.0.0", +) + +fb_native.remote_file( + name = "loader-binary-aar", + sha1 = "8af8b6cec0da85c207d03e15840e0722cbc71e70", + url = "mvn:androidx.loader:loader:aar:1.0.0", +) + +fb_native.remote_file( + name = "localbroadcastmanager-binary-aar", + sha1 = "2734f31c8321e83ce6b60570d14777fc33cc2ece", + url = "mvn:androidx.localbroadcastmanager:localbroadcastmanager:aar:1.0.0", +) + +fb_native.remote_file( + name = "print-binary-aar", + sha1 = "7722094652c48ebe27acc94d74a55e759e4635ff", + url = "mvn:androidx.print:print:aar:1.0.0", +) + +fb_native.remote_file( + name = "slidingpanelayout-binary-aar", + sha1 = "37eba9ccbf09b75cc4aa78a5e182d5b8ba79ad6a", + url = "mvn:androidx.slidingpanelayout:slidingpanelayout:aar:1.0.0", +) + +fb_native.remote_file( + name = "swiperefreshlayout-binary-aar", + sha1 = "4fd265b80a2b0fbeb062ab2bc4b1487521507762", + url = "mvn:androidx.swiperefreshlayout:swiperefreshlayout:aar:1.0.0", +) + +fb_native.remote_file( + name = "vectordrawable-binary-aar", + sha1 = "33d1eb71849dffbad12add134a25eb63cad4a1eb", + url = "mvn:androidx.vectordrawable:vectordrawable:aar:1.0.1", +) + +fb_native.remote_file( + name = "vectordrawable-animated-binary-aar", + sha1 = "0a41681ac4e1747f87237e489699089ad46b7a5e", + url = "mvn:androidx.vectordrawable:vectordrawable-animated:aar:1.0.0", +) + +fb_native.remote_file( + name = "versionedparcelable-binary-aar", + sha1 = "52718baf7e51ccba173b468a1034caba8140752e", + url = "mvn:androidx.versionedparcelable:versionedparcelable:aar:1.0.0", +) + +fb_native.remote_file( + name = "viewpager-binary-aar", + sha1 = "1f90e13820f96c2fb868f9674079a551678d68b2", + url = "mvn:androidx.viewpager:viewpager:aar:1.0.0", +) 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 988c3eed998..00000000000 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ /dev/null @@ -1,14 +0,0 @@ -load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") -load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar") - -rn_prebuilt_jar( - name = "android-support-annotations", - binary_jar = ":support-annotations-binary.jar", - visibility = ["//ReactAndroid/..."], -) - -fb_native.remote_file( - name = "support-annotations-binary.jar", - sha1 = "ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8", - url = "mvn:com.android.support:support-annotations:jar:28.0.0", -) diff --git a/ReactAndroid/src/main/third-party/android/support/BUCK b/ReactAndroid/src/main/third-party/android/support/BUCK deleted file mode 100644 index 2c67956ac8e..00000000000 --- a/ReactAndroid/src/main/third-party/android/support/BUCK +++ /dev/null @@ -1,26 +0,0 @@ -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_library( - name = "support-v4", - visibility = ["PUBLIC"], - exported_deps = [ - react_native_dep("third-party/android/support:support-v4"), - ], -) - -rn_android_library( - name = "appcompat-v7", - visibility = ["PUBLIC"], - exported_deps = [ - react_native_dep("third-party/android/support:support-v4"), - ], -) - -# a fake genrule so that BUCK files in react native are preseable in fbsource -fb_native.genrule( - name = "appcompat-res-cmd", - out = ".", - bash = "ls", - visibility = ["PUBLIC"], -) diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index 214f0facbff..25a3662a1c4 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -4,367 +4,682 @@ fb_native.android_library( name = "lib-support-v4", visibility = ["PUBLIC"], exported_deps = [ - ":animated-vector-drawable", - ":arch-common", - ":arch-runtime", + ":appcompat", ":asynclayoutinflater", - ":collections", + ":collection", ":coordinatorlayout", + ":core", + ":core-common", + ":core-runtime", ":cursoradapter", ":customview", ":documentfile", ":drawerlayout", + ":fragment", ":interpolator", - ":support-annotations", - ":support-compat", - ":support-core-ui", - ":support-core-utils", - ":support-vector-drawable", - ":support-fragment", - ":lib-support-v4-support-media-compat", + ":legacy-support-core-ui", + ":legacy-support-core-utils", ":lifecycle-common", + ":lifecycle-livedata", + ":lifecycle-livedata-core", ":lifecycle-runtime", ":lifecycle-viewmodel", - ":livedata-core", - ":livedata", ":loader", ":localbroadcastmanager", ":print", ":slidingpanelayout", ":swiperefreshlayout", + ":vectordrawable", + ":vectordrawable-animated", ":versionedparcelable", ":viewpager", ], ) -fb_native.android_prebuilt_aar( - name = "animated-vector-drawable", - aar = ":animated-vector-drawable-aar", +fb_native.prebuilt_jar( + name = "annotation", + binary_jar = ":annotation.jar", + visibility = ["PUBLIC"], ) -fb_native.android_prebuilt_aar( +fb_native.android_library( + name = "appcompat", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":collection", + ":core", + ":cursoradapter", + ":fragment", + ":legacy-support-core-utils", + ":vectordrawable", + ":vectordrawable-animated", + ], +) + +fb_native.android_library( name = "asynclayoutinflater", - aar = ":asynclayoutinflater-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":asynclayoutinflater-binary", + ":core", + ], ) -fb_native.prebuilt_jar( - name = "lifecycle-common", - binary_jar = ":lifecycle-common.jar", +fb_native.android_library( + name = "collection", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":collection-binary", + ], ) -fb_native.prebuilt_jar( - name = "arch-common", - binary_jar = ":arch-common.jar", -) - -fb_native.android_prebuilt_aar( - name = "arch-runtime", - aar = ":arch-runtime-aar", -) - -fb_native.android_prebuilt_aar( - name = "lifecycle-runtime", - aar = ":lifecycle-runtime-aar", -) - -fb_native.android_prebuilt_aar( - name = "lifecycle-viewmodel", - aar = ":lifecycle-viewmodel-aar", -) - -fb_native.prebuilt_jar( - name = "collections", - binary_jar = ":collections.jar", -) - -fb_native.android_prebuilt_aar( +fb_native.android_library( name = "coordinatorlayout", - aar = ":coordinatorlayout-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":coordinatorlayout-binary", + ":core", + ":customview", + ], ) -fb_native.android_prebuilt_aar( +fb_native.android_library( + name = "core", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":collection", + ":core-binary", + ":lifecycle-runtime", + ":versionedparcelable", + ], +) + +fb_native.android_library( + name = "core-common", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core-common-binary", + ], +) + +fb_native.android_library( + name = "core-runtime", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-common", + ":core-runtime-binary", + ], +) + +fb_native.android_library( name = "cursoradapter", - aar = ":cursoradapter-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":cursoradapter-binary", + ], ) -fb_native.android_prebuilt_aar( +fb_native.android_library( name = "customview", - aar = ":customview-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":customview-binary", + ], ) -fb_native.android_prebuilt_aar( +fb_native.android_library( name = "documentfile", - aar = ":documentfile-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":documentfile-binary", + ], ) -fb_native.android_prebuilt_aar( +fb_native.android_library( name = "drawerlayout", - aar = ":drawerlayout-aar", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":customview", + ":drawerlayout-binary", + ], +) + +fb_native.android_library( + name = "fragment", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":fragment-binary", + ":legacy-support-core-ui", + ":legacy-support-core-utils", + ":lifecycle-viewmodel", + ":loader", + ], +) + +fb_native.android_library( + name = "interpolator", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":interpolator-binary", + ], +) + +fb_native.android_library( + name = "legacy-support-core-ui", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":asynclayoutinflater", + ":coordinatorlayout", + ":core", + ":cursoradapter", + ":customview", + ":drawerlayout", + ":interpolator", + ":legacy-support-core-ui-binary", + ":legacy-support-core-utils", + ":slidingpanelayout", + ":swiperefreshlayout", + ":viewpager", + ], +) + +fb_native.android_library( + name = "legacy-support-core-utils", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":documentfile", + ":legacy-support-core-utils-binary", + ":loader", + ":localbroadcastmanager", + ":print", + ], +) + +fb_native.android_library( + name = "lifecycle-common", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":lifecycle-common-binary", + ], +) + +fb_native.android_library( + name = "lifecycle-livedata", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-common", + ":core-runtime", + ":lifecycle-livedata-binary", + ":lifecycle-livedata-core", + ], +) + +fb_native.android_library( + name = "lifecycle-livedata-core", + visibility = ["PUBLIC"], + exported_deps = [ + ":core-common", + ":core-runtime", + ":lifecycle-common", + ":lifecycle-livedata-core-binary", + ], +) + +fb_native.android_library( + name = "lifecycle-runtime", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core-common", + ":lifecycle-common", + ":lifecycle-runtime-binary", + ], +) + +fb_native.android_library( + name = "lifecycle-viewmodel", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":lifecycle-viewmodel-binary", + ], +) + +fb_native.android_library( + name = "localbroadcastmanager", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":localbroadcastmanager-binary", + ], +) + +fb_native.android_library( + name = "loader", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":lifecycle-livedata", + ":lifecycle-viewmodel", + ":loader-binary", + ], +) + +fb_native.android_library( + name = "print", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":print-binary", + ], +) + +fb_native.android_library( + name = "slidingpanelayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":customview", + ":slidingpanelayout-binary", + ], +) + +fb_native.android_library( + name = "swiperefreshlayout", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":interpolator", + ":swiperefreshlayout-binary", + ], +) + +fb_native.android_library( + name = "vectordrawable", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":vectordrawable-binary", + ], +) + +fb_native.android_library( + name = "vectordrawable-animated", + visibility = ["PUBLIC"], + exported_deps = [ + ":legacy-support-core-ui", + ":vectordrawable", + ":vectordrawable-animated-binary", + ], +) + +fb_native.android_library( + name = "versionedparcelable", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":collection", + ":versionedparcelable-binary", + ], +) + +fb_native.android_library( + name = "viewpager", + visibility = ["PUBLIC"], + exported_deps = [ + ":annotation", + ":core", + ":customview", + ":viewpager-binary", + ], +) + +# Internal targets +fb_native.android_prebuilt_aar( + name = "appcompat-binary", + aar = ":appcompat-binary-aar", ) fb_native.android_prebuilt_aar( - name = "interpolator", - aar = ":interpolator-aar", + name = "asynclayoutinflater-binary", + aar = ":asynclayoutinflater-binary-aar", ) fb_native.prebuilt_jar( - name = "support-annotations", - binary_jar = ":support-annotations.jar", + name = "collection-binary", + binary_jar = ":collection-binary.jar", ) fb_native.android_prebuilt_aar( - name = "support-compat", - aar = ":support-compat-aar", + name = "coordinatorlayout-binary", + aar = ":coordinatorlayout-binary-aar", ) fb_native.android_prebuilt_aar( - name = "support-core-utils", - aar = ":support-core-utils-aar", + name = "core-binary", + aar = ":core-binary-aar", +) + +fb_native.prebuilt_jar( + name = "core-common-binary", + binary_jar = ":core-common-binary.jar", ) fb_native.android_prebuilt_aar( - name = "support-core-ui", - aar = ":support-core-ui-aar", + name = "core-runtime-binary", + aar = ":core-runtime-binary-aar", ) fb_native.android_prebuilt_aar( - name = "support-vector-drawable", - aar = ":support-vector-drawable-aar", + name = "cursoradapter-binary", + aar = ":cursoradapter-binary-aar", ) fb_native.android_prebuilt_aar( - name = "lib-support-v4-support-media-compat", - aar = ":lib-support-v4-support-media-compat-aar", + name = "customview-binary", + aar = ":customview-binary-aar", ) fb_native.android_prebuilt_aar( - name = "support-fragment", - aar = ":support-fragment-aar", + name = "documentfile-binary", + aar = ":documentfile-binary-aar", ) fb_native.android_prebuilt_aar( - name = "livedata-core", - aar = ":livedata-core-aar", + name = "drawerlayout-binary", + aar = ":drawerlayout-binary-aar", ) fb_native.android_prebuilt_aar( - name = "livedata", - aar = ":livedata-aar", + name = "fragment-binary", + aar = ":fragment-binary-aar", ) fb_native.android_prebuilt_aar( - name = "loader", - aar = ":loader-aar", + name = "interpolator-binary", + aar = ":interpolator-binary-aar", ) fb_native.android_prebuilt_aar( - name = "localbroadcastmanager", - aar = ":localbroadcastmanager-aar", + name = "legacy-support-core-ui-binary", + aar = ":legacy-support-core-ui-binary-aar", ) fb_native.android_prebuilt_aar( - name = "print", - aar = ":print-aar", + name = "legacy-support-core-utils-binary", + aar = ":legacy-support-core-utils-binary-aar", +) + +fb_native.prebuilt_jar( + name = "lifecycle-common-binary", + binary_jar = ":lifecycle-common-binary.jar", ) fb_native.android_prebuilt_aar( - name = "slidingpanelayout", - aar = ":slidingpanelayout-aar", + name = "lifecycle-livedata-binary", + aar = ":lifecycle-livedata-binary-aar", ) fb_native.android_prebuilt_aar( - name = "swiperefreshlayout", - aar = ":swiperefreshlayout-aar", + name = "lifecycle-livedata-core-binary", + aar = ":lifecycle-livedata-core-binary-aar", ) fb_native.android_prebuilt_aar( - name = "versionedparcelable", - aar = ":versionedparcelable-aar", + name = "lifecycle-runtime-binary", + aar = ":lifecycle-runtime-binary-aar", ) fb_native.android_prebuilt_aar( - name = "viewpager", - aar = ":viewpager-aar", + name = "lifecycle-viewmodel-binary", + aar = ":lifecycle-viewmodel-binary-aar", ) -# remote files +fb_native.android_prebuilt_aar( + name = "loader-binary", + aar = ":loader-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "localbroadcastmanager-binary", + aar = ":localbroadcastmanager-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "print-binary", + aar = ":print-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "slidingpanelayout-binary", + aar = ":slidingpanelayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "swiperefreshlayout-binary", + aar = ":swiperefreshlayout-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "vectordrawable-binary", + aar = ":vectordrawable-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "vectordrawable-animated-binary", + aar = ":vectordrawable-animated-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "versionedparcelable-binary", + aar = ":versionedparcelable-binary-aar", +) + +fb_native.android_prebuilt_aar( + name = "viewpager-binary", + aar = ":viewpager-binary-aar", +) + +# Remote files fb_native.remote_file( - name = "asynclayoutinflater-aar", - sha1 = "3ae7643d120e6da3adbe2d698de923f48c904d1f", - url = "mvn:com.android.support:asynclayoutinflater:aar:28.0.0", + name = "annotation.jar", + sha1 = "2dfd8f6b2a8fc466a1ae4e329fb79cd580f6393f", + url = "mvn:androidx.annotation:annotation:jar:1.0.1", ) fb_native.remote_file( - name = "lifecycle-runtime-aar", - sha1 = "4286e1ae9364b485cb2ff7a370e355b7c570015b", - url = "mvn:android.arch.lifecycle:runtime:aar:1.1.1", + name = "appcompat-binary-aar", + sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae", + url = "mvn:androidx.appcompat:appcompat:aar:1.0.2", ) fb_native.remote_file( - name = "lifecycle-common.jar", - sha1 = "207a6efae6a3555e326de41f76bdadd9a239cbce", - url = "mvn:android.arch.lifecycle:common:jar:1.1.1", + name = "asynclayoutinflater-binary-aar", + sha1 = "5ffa788d19a6863799f25cb50d4fdfb0ec649037", + url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0", ) fb_native.remote_file( - name = "arch-common.jar", - sha1 = "e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95", - url = "mvn:android.arch.core:common:jar:1.1.1", + name = "collection-binary.jar", + sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a", + url = "mvn:androidx.collection:collection:jar:1.0.0", ) fb_native.remote_file( - name = "arch-runtime-aar", - sha1 = "a7e27caf787e14c0d8417be907f4a31f0306acb2", - url = "mvn:android.arch.core:runtime:aar:1.1.1", -) - - -fb_native.remote_file( - name = "lifecycle-viewmodel-aar", - sha1 = "897b6e22c8357b23ab0c7600c961549c098f5ccf", - url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.1", + name = "core-binary-aar", + sha1 = "263deba7f9c24bd0cefb93c0aaaf402cc50828ee", + url = "mvn:androidx.core:core:aar:1.0.1", ) fb_native.remote_file( - name = "collections.jar", - sha1 = "c1bcdade4d3cc2836130424a3f3e4182c666a745", - url = "mvn:com.android.support:collections:jar:28.0.0", + name = "core-common-binary.jar", + sha1 = "bb21b9a11761451b51624ac428d1f1bb5deeac38", + url = "mvn:androidx.arch.core:core-common:jar:2.0.0", ) fb_native.remote_file( - name = "coordinatorlayout-aar", - sha1 = "7a708aac3443762e58e84368040a6a23b2c63545", - url = "mvn:com.android.support:coordinatorlayout:aar:28.0.0", + name = "core-runtime-binary-aar", + sha1 = "c5be9edf9ca9135a465d23939f6e7d0e1cf90b41", + url = "mvn:androidx.arch.core:core-runtime:aar:2.0.0", ) fb_native.remote_file( - name = "cursoradapter-aar", - sha1 = "d803f573799e6cd2db8839e2a70fe6ad67e86b79", - url = "mvn:com.android.support:cursoradapter:aar:28.0.0", + name = "coordinatorlayout-binary-aar", + sha1 = "7664385a7e39112b780baf8819ee880dcd3c4094", + url = "mvn:androidx.coordinatorlayout:coordinatorlayout:aar:1.0.0", ) fb_native.remote_file( - name = "customview-aar", - sha1 = "423fe0f417f2f8d9c718c2cf73f9253da43f1f11", - url = "mvn:com.android.support:customview:aar:28.0.0", + name = "cursoradapter-binary-aar", + sha1 = "74014983a86b83cbce534dec4e7aa9312f5f5d82", + url = "mvn:androidx.cursoradapter:cursoradapter:aar:1.0.0", ) fb_native.remote_file( - name = "documentfile-aar", - sha1 = "1187e4a23ff6250b096249c734bdabf5403c6ba9", - url = "mvn:com.android.support:documentfile:aar:28.0.0", + name = "customview-binary-aar", + sha1 = "30f5ff6075d112f8076e733b24410e68159735b6", + url = "mvn:androidx.customview:customview:aar:1.0.0", ) fb_native.remote_file( - name = "drawerlayout-aar", - sha1 = "4de65d42b8e1b7f0ba40b5f35e5d4bafcd70019f", - url = "mvn:com.android.support:drawerlayout:aar:28.0.0", + name = "documentfile-binary-aar", + sha1 = "66104345c90cd8c2fd5ad2d3aad692b280e10c32", + url = "mvn:androidx.documentfile:documentfile:aar:1.0.0", ) fb_native.remote_file( - name = "interpolator-aar", - sha1 = "5d501569c8f7b667c47333a0b873aa529e0a0b9c", - url = "mvn:com.android.support:interpolator:aar:28.0.0", + name = "drawerlayout-binary-aar", + sha1 = "dd02c7e207136e1272b33815cc61e57676ed13a2", + url = "mvn:androidx.drawerlayout:drawerlayout:aar:1.0.0", ) fb_native.remote_file( - name = "support-annotations.jar", - sha1 = "ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8", - url = "mvn:com.android.support:support-annotations:jar:28.0.0", + name = "fragment-binary-aar", + sha1 = "0b40f6a2ae814f72d1e71a5df6dc1283c00cd52f", + url = "mvn:androidx.fragment:fragment:aar:1.0.0", ) fb_native.remote_file( - name = "support-compat-aar", - sha1 = "d252b640ed832cf8addc35ef0a9f9186dc7738a5", - url = "mvn:com.android.support:support-compat:aar:28.0.0", + name = "interpolator-binary-aar", + sha1 = "8a01fa254a23b9388571eb6334b03707c7d122d7", + url = "mvn:androidx.interpolator:interpolator:aar:1.0.0", ) fb_native.remote_file( - name = "support-core-utils-aar", - sha1 = "29b1bb783f1a86eba7f1618bad58842bde72892a", - url = "mvn:com.android.support:support-core-utils:aar:28.0.0", + name = "legacy-support-core-ui-binary-aar", + sha1 = "61a264f996046e059f889914050fae1e75d3b702", + url = "mvn:androidx.legacy:legacy-support-core-ui:aar:1.0.0", ) fb_native.remote_file( - name = "support-core-ui-aar", - sha1 = "96035b1030d7c3a81903966c2fa52117d36aa5b7", - url = "mvn:com.android.support:support-core-ui:aar:28.0.0", + name = "legacy-support-core-utils-binary-aar", + sha1 = "9b9570042115da8629519090dfeb71df75da59fc", + url = "mvn:androidx.legacy:legacy-support-core-utils:aar:1.0.0", ) fb_native.remote_file( - name = "lib-support-v4-support-media-compat-aar", - sha1 = "b7ab2145c7f70e303cfe2e44667d61441b5b558c", - url = "mvn:com.android.support:support-media-compat:aar:28.0.0", + name = "lifecycle-common-binary.jar", + sha1 = "e070ffae07452331bc5684734fce6831d531785c", + url = "mvn:androidx.lifecycle:lifecycle-common:jar:2.0.0", ) fb_native.remote_file( - name = "support-fragment-aar", - sha1 = "f21c8a8700b30dc57cb6277ae3c4c168a94a4e81", - url = "mvn:com.android.support:support-fragment:aar:28.0.0", + name = "lifecycle-livedata-binary-aar", + sha1 = "c17007cd0b21d6401910b0becdd16c438c68a9af", + url = "mvn:androidx.lifecycle:lifecycle-livedata:aar:2.0.0", ) fb_native.remote_file( - name = "livedata-core-aar", - sha1 = "30ede25cb577323f039c2e3d72b3b56526a2b2e6", - url = "mvn:android.arch.lifecycle:livedata-core:aar:1.1.1", + name = "lifecycle-livedata-core-binary-aar", + sha1 = "1a7cee84b43fa935231b016f0665cd56a72fa9db", + url = "mvn:androidx.lifecycle:lifecycle-livedata-core:aar:2.0.0", ) fb_native.remote_file( - name = "livedata-aar", - sha1 = "82e0b1bf2dc8ce23898cf433cc150df7b3dba952", - url = "mvn:android.arch.lifecycle:livedata:aar:1.1.1", + name = "lifecycle-runtime-binary-aar", + sha1 = "ea27e9e79e9a0fbedfa4dbbef5ddccf0e1d9d73f", + url = "mvn:androidx.lifecycle:lifecycle-runtime:aar:2.0.0", ) fb_native.remote_file( - name = "loader-aar", - sha1 = "49a297a4635e01ed55f31b5d4a718ba3416fde3d", - url = "mvn:com.android.support:loader:aar:28.0.0", + name = "lifecycle-viewmodel-binary-aar", + sha1 = "6417c576c458137456d996914c50591e7f4acc24", + url = "mvn:androidx.lifecycle:lifecycle-viewmodel:aar:2.0.0", ) fb_native.remote_file( - name = "localbroadcastmanager-aar", - sha1 = "5c498cb7e2fa5910d6c50e28531c55b77d6bf0f6", - url = "mvn:com.android.support:localbroadcastmanager:aar:28.0.0", + name = "loader-binary-aar", + sha1 = "8af8b6cec0da85c207d03e15840e0722cbc71e70", + url = "mvn:androidx.loader:loader:aar:1.0.0", ) fb_native.remote_file( - name = "print-aar", - sha1 = "d2c60bfbbdc2eadd4ff7c8f65743fab830339743", - url = "mvn:com.android.support:print:aar:28.0.0", + name = "localbroadcastmanager-binary-aar", + sha1 = "2734f31c8321e83ce6b60570d14777fc33cc2ece", + url = "mvn:androidx.localbroadcastmanager:localbroadcastmanager:aar:1.0.0", ) fb_native.remote_file( - name = "slidingpanelayout-aar", - sha1 = "20468e3ec8f36dc84846ddd99ff30516f4ffd05a", - url = "mvn:com.android.support:slidingpanelayout:aar:28.0.0", + name = "print-binary-aar", + sha1 = "7722094652c48ebe27acc94d74a55e759e4635ff", + url = "mvn:androidx.print:print:aar:1.0.0", ) fb_native.remote_file( - name = "swiperefreshlayout-aar", - sha1 = "bfa669303f0ac8a83d9c878fafadc2936625f781", - url = "mvn:com.android.support:swiperefreshlayout:aar:28.0.0", + name = "slidingpanelayout-binary-aar", + sha1 = "37eba9ccbf09b75cc4aa78a5e182d5b8ba79ad6a", + url = "mvn:androidx.slidingpanelayout:slidingpanelayout:aar:1.0.0", ) fb_native.remote_file( - name = "versionedparcelable-aar", - sha1 = "90432a1e322e0e0bad2116dff0e64c708514808f", - url = "mvn:com.android.support:versionedparcelable:aar:28.0.0", + name = "swiperefreshlayout-binary-aar", + sha1 = "4fd265b80a2b0fbeb062ab2bc4b1487521507762", + url = "mvn:androidx.swiperefreshlayout:swiperefreshlayout:aar:1.0.0", ) fb_native.remote_file( - name = "support-vector-drawable-aar", - sha1 = "80387886ef55af284d8253e52d321f93b3f923dd", - url = "mvn:com.android.support:support-vector-drawable:aar:28.0.0", + name = "vectordrawable-binary-aar", + sha1 = "33d1eb71849dffbad12add134a25eb63cad4a1eb", + url = "mvn:androidx.vectordrawable:vectordrawable:aar:1.0.1", ) fb_native.remote_file( - name = "viewpager-aar", - sha1 = "f513ecf69dfea8b60987bd3e869970300ba7c0eb", - url = "mvn:com.android.support:viewpager:aar:28.0.0", + name = "vectordrawable-animated-binary-aar", + sha1 = "0a41681ac4e1747f87237e489699089ad46b7a5e", + url = "mvn:androidx.vectordrawable:vectordrawable-animated:aar:1.0.0", ) fb_native.remote_file( - name = "animated-vector-drawable-aar", - sha1 = "e2d41c2a032145313f42ab38a2d9757c5d1ebc19", - url = "mvn:com.android.support:animated-vector-drawable:aar:28.0.0", + name = "versionedparcelable-binary-aar", + sha1 = "52718baf7e51ccba173b468a1034caba8140752e", + url = "mvn:androidx.versionedparcelable:versionedparcelable:aar:1.0.0", +) + +fb_native.remote_file( + name = "viewpager-binary-aar", + sha1 = "1f90e13820f96c2fb868f9674079a551678d68b2", + url = "mvn:androidx.viewpager:viewpager:aar:1.0.0", ) 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 53a57204220..d2521c4d03a 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,9 +1,9 @@ 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_genrule", "rn_prebuilt_jar") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_resource", "rn_genrule", "rn_prebuilt_jar") # This is a bit messy and hopefully a temporary thing # The problem is that Gradle extracts appcompat resources into app namespace, com.facebook.react -# While BUCK behaves properly and extracts them into android.support.v7.appcompat package. +# While BUCK behaves properly and extracts them into androidx.appcompat package. # We want to support both Gradle and BUCK builds so we hack a bit how BUCK extracts resources. # Besides that we still need JAVA classes from appcompat-v7.aar, that is why rn_android_library # extracts classes.jar but the trick is that we can't take full appcompat.aar because resources @@ -19,14 +19,14 @@ rn_android_library( ":res-for-appcompat", ], exported_deps = [ - ":classes-for-react-native" + ":classes-for-react-native", ], ) # still used by appcompat library internally, so we need both during the build rn_android_resource( name = "res-for-appcompat", - package = "android.support.v7.appcompat", + package = "androidx.appcompat", res = ":res-unpacker-cmd", visibility = ["//ReactAndroid/..."], ) @@ -57,6 +57,6 @@ fb_native.python_binary( fb_native.remote_file( name = "appcompat-binary-aar", - sha1 = "132586ec59604a86703796851a063a0ac61f697b", - url = "mvn:com.android.support:appcompat-v7:aar:28.0.0", + sha1 = "002533a36c928bb27a3cc6843a25f83754b3c3ae", + url = "mvn:androidx.appcompat:appcompat:aar:1.0.2", ) 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 302ae40243a..b611db811de 100644 --- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK +++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK @@ -9,8 +9,8 @@ rn_android_prebuilt_aar( fb_native.remote_file( name = "testing-support-lib-runner-download", - sha1 = "a31e7e8db98ca19fb3fab23f120d19a6f4e3e8a9", - url = "mvn:com.android.support.test:runner:aar:0.3", + sha1 = "810a7aacb5106d92cdf648b2497694c4ebf73500", + url = "mvn:androidx.test:runner:aar:1.1.1", ) rn_android_prebuilt_aar( diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK index 917eef734d1..8d49aa5e259 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BUCK @@ -11,6 +11,7 @@ rn_robolectric_test( ], # Please change the contact to the oncall of your team contacts = ["oncall+fbandroid_sheriff@xmail.facebook.com"], + is_androidx = True, visibility = [ "PUBLIC", ], diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java index 33bd58fef80..f0a19d071c8 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java @@ -10,7 +10,7 @@ package com.facebook.react.uimanager; import static org.mockito.Mockito.mock; import android.content.Context; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import com.facebook.react.uimanager.AccessibilityDelegateUtil.AccessibilityRole; import com.facebook.react.views.view.ReactViewGroup; import com.facebook.react.views.view.ReactViewManager; diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh old mode 100644 new mode 100755 diff --git a/scripts/run-instrumentation-tests-via-adb-shell.sh b/scripts/run-instrumentation-tests-via-adb-shell.sh index 7b0e0e5de0d..fa40a00d36c 100755 --- a/scripts/run-instrumentation-tests-via-adb-shell.sh +++ b/scripts/run-instrumentation-tests-via-adb-shell.sh @@ -42,10 +42,10 @@ t.start() def run(): sp.Popen(['adb', 'wait-for-device']).communicate() if (test_class != None): - p = sp.Popen('adb shell am instrument -w -e class %s %s/android.support.test.runner.AndroidJUnitRunner' + p = sp.Popen('adb shell am instrument -w -e class %s %s/androidx.test.runner.AndroidJUnitRunner' % (test_class, test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE) else : - p = sp.Popen('adb shell am instrument -w %s/android.support.test.runner.AndroidJUnitRunner' + p = sp.Popen('adb shell am instrument -w %s/androidx.test.runner.AndroidJUnitRunner' % (test_app), shell=True, stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE) return p.communicate() diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl index d2cf1fc45b7..b78a1b603f8 100644 --- a/tools/build_defs/oss/rn_defs.bzl +++ b/tools/build_defs/oss/rn_defs.bzl @@ -119,7 +119,30 @@ def rn_android_library(name, deps = [], plugins = [], *args, **kwargs): plugins = list(set(plugins + react_module_plugins)) - native.android_library(name = name, deps = deps, plugins = plugins, *args, **kwargs) + is_androidx = kwargs.pop("is_androidx", False) + provided_deps = kwargs.pop("provided_deps", []) + appcompat = react_native_dep("third-party/android/support/v7/appcompat-orig:appcompat") + support_v4 = react_native_dep("third-party/android/support/v4:lib-support-v4") + + if is_androidx and (appcompat in deps or appcompat in provided_deps): + # add androidx target to provided_deps + pass + # provided_deps.append( + # react_native_dep( + # "" + # ) + # ) + + if is_androidx and (support_v4 in deps or support_v4 in provided_deps): + # add androidx target to provided_deps + pass + # provided_deps.append( + # react_native_dep( + # "" + # ) + # ) + + native.android_library(name = name, deps = deps, plugins = plugins, provided_deps = provided_deps, *args, **kwargs) def rn_android_binary(*args, **kwargs): native.android_binary(*args, **kwargs) @@ -151,6 +174,8 @@ def rn_genrule(*args, **kwargs): def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs): vm_args = vm_args or [] + is_androidx = kwargs.pop("is_androidx", False) + extra_vm_args = [ "-XX:+UseConcMarkSweepGC", # required by -XX:+CMSClassUnloadingEnabled "-XX:+CMSClassUnloadingEnabled",