Migrate support library v28 class references to androidx

Summary: With this BUCK will be building on sl28 compat mode while gradle building on androidx Differential Revision: D14125504 fbshipit-source-id: 66fab12f7de350d82711bed0e0040bc16348c77f
facebook · Mar 1, 2019 · de3097b · de3097b
1 parent a7615bc
commit de3097b
Show file tree

Hide file tree

Showing 284 changed files with 928 additions and 857 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -12,4 +12,4 @@
 
 [android]
   target = android-28
-  build_tools_version = 27.0.3
+  build_tools_version = 28.0.3
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,8 @@ subprojects {
         google()
         jcenter()
         mavenCentral()
+        //T41117446 Remove this once Flipper/Fresco releases their AndroidX versions
+        maven { url 'https://jitpack.io' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     afterEvaluate {
@@ -49,23 +51,25 @@ ext.isSnapshot = { VERSION_NAME.endsWith('-SNAPSHOT') }
 
 ext.deps = [
         // Android support
-        supportAnnotations : 'com.android.support:support-annotations:28.0.0',
-        supportAppCompat   : 'com.android.support:appcompat-v7:28.0.0',
-        supportCoreUi      : 'com.android.support:support-core-ui:28.0.0',
-        supportRecyclerView: 'com.android.support:recyclerview-v7:28.0.0',
-        supportEspresso    : 'com.android.support.test.espresso:espresso-core:3.0.2',
-        supportEspressoIntents : 'com.android.support.test.espresso:espresso-intents:3.0.2',
-        supportTestRunner  : 'com.android.support.test:runner:1.0.2',
-        supportTestRules   : 'com.android.support.test:rules:1.0.2',
-        supportMultidex    : 'com.android.support:multidex:1.0.1',
+        supportAnnotations : 'androidx.annotation:annotation:1.0.0',
+        supportAppCompat   : 'androidx.appcompat:appcompat:1.0.0',
+        supportCore        : 'androidx.core:core:1.0.0',
+        supportCustomView  : 'androidx.customview:customview:1.0.0',
+        supportRecyclerView: 'androidx.recyclerview:recyclerview:1.0.0',
+        supportEspresso    : 'androidx.test.espresso:espresso-core:3.1.0',
+        supportEspressoIntents : 'androidx.test.espresso:espresso-intents:3.1.0',
+        supportTestRunner  : 'androidx.test:runner:1.1.0',
+        supportTestRules   : 'androidx.test:rules:1.1.0',
+        supportMultidex    : 'androidx.multidex:multidex:2.0.0',
+        supportViewPager   : 'androidx.viewpager:viewpager:1.0.0',
         // Arch
-        archLifecycle      : 'android.arch.lifecycle:extensions:1.1.1',
+        archLifecycle      : 'androidx.lifecycle:lifecycle-extensions:2.0.0-rc01',
         // First-party
         fresco             : 'com.facebook.fresco:fresco:1.10.0',
         soloader           : 'com.facebook.soloader:soloader:0.6.0',
-        textlayoutbuilder  : 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.4.0',
+        textlayoutbuilder  : 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.5.0',
         screenshot         : 'com.facebook.testing.screenshot:core:0.5.0',
-        flipper            : 'com.facebook.flipper:flipper:0.12.0',
+        flipper            : 'com.facebook.flipper:flipper:0.16.3-SNAPSHOT',
         // Annotations
         jsr305             : 'com.google.code.findbugs:jsr305:3.0.1',
         inferAnnotations   : 'com.facebook.infer.annotation:infer-annotation:0.11.2',

diff --git a/gradle.properties b/gradle.properties
@@ -39,3 +39,8 @@ ANDROID_MAVEN_GRADLE_PLUGIN_VERSION=2.1
 # Gradle internals
 org.gradle.internal.repository.max.retries=10
 org.gradle.internal.repository.initial.backoff=1250
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
+
+# AndroidX
+android.useAndroidX = true
+android.enableJetifier = true
diff --git a/litho-annotations/src/main/java/com/facebook/litho/annotations/BUCK b/litho-annotations/src/main/java/com/facebook/litho/annotations/BUCK
@@ -7,6 +7,7 @@ load("//tools/build_defs/oss:litho_defs.bzl", "LITHO_ANDROIDSUPPORT_TARGET", "fb
 fb_java_library(
     name = "annotations",
     srcs = glob(["*.java"]),
+    is_androidx = True,
     provided_deps = [
         LITHO_ANDROIDSUPPORT_TARGET,
     ],

diff --git a/litho-annotations/src/main/java/com/facebook/litho/annotations/Comparable.java b/litho-annotations/src/main/java/com/facebook/litho/annotations/Comparable.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho.annotations;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

diff --git a/...o-annotations/src/main/java/com/facebook/litho/annotations/ImportantForAccessibility.java b/...o-annotations/src/main/java/com/facebook/litho/annotations/ImportantForAccessibility.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho.annotations;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

diff --git a/litho-core/build.gradle b/litho-core/build.gradle
@@ -65,8 +65,9 @@ dependencies {
 
     // Android Support Library
     compileOnly deps.supportAnnotations
-    implementation deps.supportCoreUi
-    implementation deps.supportRecyclerView
+    implementation deps.supportCore
+    implementation deps.supportCustomView
+    implementation deps.supportViewPager
 
     // First-party dependencies
     if (project.isRelease()) {

diff --git a/litho-core/src/main/java/com/facebook/litho/AccessibilityRole.java b/litho-core/src/main/java/com/facebook/litho/AccessibilityRole.java
@@ -15,7 +15,7 @@
  */
 package com.facebook.litho;
 
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -77,7 +77,7 @@ private AccessibilityRole() {}
   public static final String IMAGE = "android.widget.ImageView";
   public static final String IMAGE_BUTTON = "android.widget.ImageView";
   public static final String LIST = "android.widget.AbsListView";
-  public static final String PAGER = "android.support.v4.view.ViewPager";
+  public static final String PAGER = "androidx.viewpager.widget.ViewPager";
   public static final String RADIO_BUTTON = "android.widget.RadioButton";
   public static final String SEEK_CONTROL = "android.widget.SeekBar";
   public static final String SWITCH = "android.widget.Switch";
@@ -88,7 +88,7 @@ private AccessibilityRole() {}
   public static final String CHECKED_TEXT_VIEW = "android.widget.CheckedTextView";
   public static final String PROGRESS_BAR = "android.widget.ProgressBar";
   public static final String ACTION_BAR_TAB = "android.app.ActionBar$Tab";
-  public static final String DRAWER_LAYOUT = "android.support.v4.widget.DrawerLayout";
+  public static final String DRAWER_LAYOUT = "androidx.drawerlayout.widget.DrawerLayout";
   public static final String SLIDING_DRAWER = "android.widget.SlidingDrawer";
   public static final String ICON_MENU = "com.android.internal.view.menu.IconMenuView";
   public static final String TOAST = "android.widget.Toast$TN";

diff --git a/litho-core/src/main/java/com/facebook/litho/AccessibilityUtils.java b/litho-core/src/main/java/com/facebook/litho/AccessibilityUtils.java
@@ -20,9 +20,9 @@
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.Context;
-import android.support.v4.accessibilityservice.AccessibilityServiceInfoCompat;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import androidx.core.accessibilityservice.AccessibilityServiceInfoCompat;
 import java.util.List;
 
 public class AccessibilityUtils {

diff --git a/litho-core/src/main/java/com/facebook/litho/ArrayBatchAllocator.java b/litho-core/src/main/java/com/facebook/litho/ArrayBatchAllocator.java
@@ -15,8 +15,7 @@
  */
 package com.facebook.litho;
 
-import android.support.annotation.Nullable;
-import com.facebook.litho.config.ComponentsConfiguration;
+import androidx.annotation.Nullable;
 
 public class ArrayBatchAllocator {
 

diff --git a/litho-core/src/main/java/com/facebook/litho/BUCK b/litho-core/src/main/java/com/facebook/litho/BUCK
@@ -17,6 +17,7 @@ litho_android_library(
         "debug/*.java",
         "drawable/*.java",
     ]),
+    is_androidx = True,
     provided_deps = [
         LITHO_ANDROIDSUPPORT_TARGET,
         LITHO_DISPLAYLISTSTUBS_TARGET,

diff --git a/litho-core/src/main/java/com/facebook/litho/BaseComponentsLogger.java b/litho-core/src/main/java/com/facebook/litho/BaseComponentsLogger.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;

diff --git a/litho-core/src/main/java/com/facebook/litho/Border.java b/litho-core/src/main/java/com/facebook/litho/Border.java
@@ -16,22 +16,22 @@
 
 package com.facebook.litho;
 
-import static android.support.annotation.Dimension.DP;
+import static androidx.annotation.Dimension.DP;
 
 import android.graphics.ComposePathEffect;
 import android.graphics.DashPathEffect;
 import android.graphics.DiscretePathEffect;
 import android.graphics.Path;
 import android.graphics.PathDashPathEffect;
 import android.graphics.PathEffect;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.Dimension;
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.Dimension;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import com.facebook.yoga.YogaEdge;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/litho-core/src/main/java/com/facebook/litho/Column.java b/litho-core/src/main/java/com/facebook/litho/Column.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho;
 
-import android.support.v4.util.Pools;
+import androidx.core.util.Pools;
 import com.facebook.litho.annotations.Prop;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.yoga.YogaAlign;

diff --git a/litho-core/src/main/java/com/facebook/litho/CommonProps.java b/litho-core/src/main/java/com/facebook/litho/CommonProps.java
@@ -17,13 +17,13 @@
 
 import android.animation.StateListAnimator;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import android.support.annotation.StyleRes;
 import android.util.SparseArray;
 import android.view.ViewOutlineProvider;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.annotation.StyleRes;
 import com.facebook.litho.drawable.ComparableDrawable;
 import com.facebook.litho.reference.Reference;
 import com.facebook.yoga.YogaAlign;

diff --git a/litho-core/src/main/java/com/facebook/litho/CommonPropsHolder.java b/litho-core/src/main/java/com/facebook/litho/CommonPropsHolder.java
@@ -18,13 +18,13 @@
 
 import android.animation.StateListAnimator;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import android.support.annotation.StyleRes;
 import android.util.SparseArray;
 import android.view.ViewOutlineProvider;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.annotation.StyleRes;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.litho.drawable.ComparableDrawable;
 import com.facebook.litho.reference.Reference;

diff --git a/litho-core/src/main/java/com/facebook/litho/CommonUtils.java b/litho-core/src/main/java/com/facebook/litho/CommonUtils.java
@@ -15,7 +15,7 @@
  */
 package com.facebook.litho;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class CommonUtils {
 

diff --git a/litho-core/src/main/java/com/facebook/litho/Component.java b/litho-core/src/main/java/com/facebook/litho/Component.java
@@ -16,26 +16,26 @@
 
 package com.facebook.litho;
 
-import static android.support.annotation.Dimension.DP;
+import static androidx.annotation.Dimension.DP;
 import static com.facebook.litho.ComponentKeyUtils.getKeyForChildPosition;
 
 import android.animation.AnimatorInflater;
 import android.animation.StateListAnimator;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DimenRes;
-import android.support.annotation.Dimension;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.GuardedBy;
-import android.support.annotation.Px;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.view.ViewOutlineProvider;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DimenRes;
+import androidx.annotation.Dimension;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.Px;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.annotation.VisibleForTesting;
 import com.facebook.infer.annotation.ReturnsOwnership;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentAccessibilityDelegate.java b/litho-core/src/main/java/com/facebook/litho/ComponentAccessibilityDelegate.java
@@ -19,15 +19,15 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-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.AccessibilityNodeProviderCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import java.util.List;
 import javax.annotation.Nullable;
 

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentContext.java b/litho-core/src/main/java/com/facebook/litho/ComponentContext.java
@@ -20,12 +20,12 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Looper;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.annotation.StyleRes;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.annotation.VisibleForTesting;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.yoga.YogaNode;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentHost.java b/litho-core/src/main/java/com/facebook/litho/ComponentHost.java
@@ -28,11 +28,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.util.SparseArrayCompat;
-import android.support.v4.view.ViewCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseArray;
@@ -41,6 +36,11 @@
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityNodeInfo;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.collection.SparseArrayCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.ViewCompat;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.proguard.annotations.DoNotStrip;
 import java.util.ArrayList;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentHostUtils.java b/litho-core/src/main/java/com/facebook/litho/ComponentHostUtils.java
@@ -18,8 +18,8 @@
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.util.SparseArrayCompat;
 import android.view.View;
+import androidx.collection.SparseArrayCompat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentLayout.java b/litho-core/src/main/java/com/facebook/litho/ComponentLayout.java
@@ -17,7 +17,7 @@
 package com.facebook.litho;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Px;
+import androidx.annotation.Px;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.litho.reference.Reference;
 import com.facebook.yoga.YogaDirection;

diff --git a/litho-core/src/main/java/com/facebook/litho/ComponentLifecycle.java b/litho-core/src/main/java/com/facebook/litho/ComponentLifecycle.java
@@ -19,12 +19,12 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
 import android.view.View;
+import androidx.annotation.AttrRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import com.facebook.infer.annotation.ThreadSafe;
 import com.facebook.litho.annotations.LayoutSpec;
 import com.facebook.litho.annotations.OnCreateTreeProp;