jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move android module's support lib references to AndroidX

Browse Source 
Summary: SupportLib v28 -> AndroidX v1

Reviewed By: passy

Differential Revision: D14150032

fbshipit-source-id: f9c0d15a4f281fea78500e78275eb260e484e674
This commit is contained in:
Aziz Murtazaev
2019-02-21 09:20:00 -08:00
committed by Facebook Github Bot
parent 01ee57c601
commit 0279fc919f
26 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
View File

@@ -8,7 +8,7 @@ package com.facebook.flipper.sample;
import android.app.Application;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;

2
android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java
View File

@@ -8,7 +8,7 @@
package com.facebook.flipper.sample;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.plugins.example.ExampleFlipperPlugin;

2
android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
View File

@@ -11,8 +11,8 @@ import android.content.pm.PackageManager;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import androidx.core.content.ContextCompat;
import com.facebook.flipper.core.FlipperClient;
public final class AndroidFlipperClient {

4
android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
View File

@@ -8,8 +8,8 @@
package com.facebook.flipper.android.diagnostics;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
public class FlipperDiagnosticActivity extends FragmentActivity {

6
android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticFragment.java
View File

@@ -11,9 +11,6 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -21,6 +18,9 @@ import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.FlipperStateUpdateListener;

2
android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
View File

@@ -7,7 +7,7 @@
*/
package com.facebook.flipper.plugins.console.iface;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperReceiver;

2
android/src/main/java/com/facebook/flipper/plugins/crashreporter/CrashReporterPlugin.java
View File

@@ -7,7 +7,7 @@
package com.facebook.flipper.plugins.crashreporter;
import android.app.Activity;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperPlugin;

2
android/src/main/java/com/facebook/flipper/plugins/example/ExampleFlipperPlugin.java
View File

@@ -8,8 +8,8 @@
package com.facebook.flipper.plugins.example;
import android.app.Activity;
import android.support.annotation.Nullable;
import android.widget.Toast;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperPlugin;

4
android/src/main/java/com/facebook/flipper/plugins/inspector/DescriptorMapping.java
View File

@@ -55,10 +55,10 @@ public class DescriptorMapping {
mapping.register(Drawable.class, new DrawableDescriptor());
mapping.register(Dialog.class, new DialogDescriptor());
mapping.register(android.app.Fragment.class, new FragmentDescriptor());
mapping.register(android.support.v4.app.Fragment.class, new SupportFragmentDescriptor());
mapping.register(androidx.fragment.app.Fragment.class, new SupportFragmentDescriptor());
mapping.register(android.app.DialogFragment.class, new DialogFragmentDescriptor());
mapping.register(
android.support.v4.app.DialogFragment.class, new SupportDialogFragmentDescriptor());
androidx.fragment.app.DialogFragment.class, new SupportDialogFragmentDescriptor());
return mapping;
}

2
android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java
View File

@@ -8,7 +8,7 @@
package com.facebook.flipper.plugins.inspector;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperConnection;

2
android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java
View File

@@ -8,7 +8,7 @@
package com.facebook.flipper.plugins.inspector;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperObject;
import java.util.List;

2
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
View File

@@ -9,10 +9,10 @@
package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Activity;
import android.support.v4.view.ViewCompat;
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import androidx.core.view.ViewCompat;
import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;

4
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
View File

@@ -9,8 +9,8 @@
package com.facebook.flipper.plugins.inspector.descriptors;
import android.app.Dialog;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named;

2
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportFragmentDescriptor.java
View File

@@ -9,8 +9,8 @@
package com.facebook.flipper.plugins.inspector.descriptors;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.View;
import androidx.fragment.app.Fragment;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.Named;

6
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
View File

@@ -14,9 +14,6 @@ import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.v4.view.MarginLayoutParamsCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.util.SparseArray;
import android.view.Gravity;
import android.view.View;
@@ -27,6 +24,9 @@ import android.view.ViewGroup.MarginLayoutParams;
import android.view.ViewParent;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import androidx.core.view.MarginLayoutParamsCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java
View File

@@ -8,8 +8,8 @@
package com.facebook.flipper.plugins.inspector.descriptors;
import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_CLIP_BOUNDS;
import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_OPTICAL_BOUNDS;
import static androidx.core.view.ViewGroupCompat.LAYOUT_MODE_CLIP_BOUNDS;
import static androidx.core.view.ViewGroupCompat.LAYOUT_MODE_OPTICAL_BOUNDS;
import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Boolean;
import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
@@ -322,8 +322,8 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
boolean added = false;
if (fragment instanceof android.app.Fragment) {
added = ((android.app.Fragment) fragment).isAdded();
} else if (fragment instanceof android.support.v4.app.Fragment) {
added = ((android.support.v4.app.Fragment) fragment).isAdded();
} else if (fragment instanceof androidx.fragment.app.Fragment) {
added = ((androidx.fragment.app.Fragment) fragment).isAdded();
}
return added ? fragment : null;

4
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
View File

@@ -8,12 +8,12 @@
package com.facebook.flipper.plugins.inspector.descriptors.utils;
import android.graphics.Rect;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil.AccessibilityRole;
import java.util.List;
import javax.annotation.Nullable;

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
View File

@@ -6,10 +6,10 @@
*/
package com.facebook.flipper.plugins.inspector.descriptors.utils;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import javax.annotation.Nullable;
/**
@@ -41,7 +41,7 @@ public class AccessibilityRoleUtil {
IMAGE("android.widget.ImageView", "Image"),
IMAGE_BUTTON("android.widget.ImageView", "Button"),
LIST("android.widget.AbsListView", "List"),
PAGER("android.support.v4.view.ViewPager", "Multi-page view"),
PAGER("androidx.viewpager.widget.ViewPager", "Multi-page view"),
RADIO_BUTTON("android.widget.RadioButton", "Radio button"),
SEEK_CONTROL("android.widget.SeekBar", "Seek control"),
SWITCH("android.widget.Switch", "Switch"),
@@ -52,7 +52,7 @@ public class AccessibilityRoleUtil {
CHECKED_TEXT_VIEW("android.widget.CheckedTextView", ""),
PROGRESS_BAR("android.widget.ProgressBar", "Progress bar"),
ACTION_BAR_TAB("android.app.ActionBar$Tab", ""),
DRAWER_LAYOUT("android.support.v4.widget.DrawerLayout", ""),
DRAWER_LAYOUT("androidx.drawerlayout.widget.DrawerLayout", ""),
SLIDING_DRAWER("android.widget.SlidingDrawer", ""),
ICON_MENU("com.android.internal.view.menu.IconMenuView", ""),
TOAST("android.widget.Toast$TN", ""),

4
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
View File

@@ -11,14 +11,14 @@ import static android.content.Context.ACCESSIBILITY_SERVICE;
import android.content.Context;
import android.graphics.Rect;
import android.os.Build;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.accessibility.AccessibilityManager;
import android.widget.EditText;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.InspectorValue;

2
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/EnumMapping.java
View File

@@ -10,7 +10,7 @@ package com.facebook.flipper.plugins.inspector.descriptors.utils;
import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
import android.support.v4.util.SimpleArrayMap;
import androidx.collection.SimpleArrayMap;
import com.facebook.flipper.plugins.inspector.InspectorValue;
public class EnumMapping {

4
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
View File

@@ -8,9 +8,9 @@
package com.facebook.flipper.plugins.inspector.descriptors.utils;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.view.View;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import javax.annotation.Nullable;
/** Class that helps with accessibility by providing useful methods. */

2
android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
View File

@@ -14,8 +14,8 @@ import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Number;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.support.v4.util.Pair;
import android.view.View;
import androidx.core.util.Pair;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay;

4
android/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java
View File

@@ -7,10 +7,10 @@
package com.facebook.flipper.plugins.litho;
import android.graphics.Rect;
import android.support.v4.view.MarginLayoutParamsCompat;
import android.support.v4.view.ViewCompat;
import android.view.View;
import android.view.ViewGroup;
import androidx.core.view.MarginLayoutParamsCompat;
import androidx.core.view.ViewCompat;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay;

2
android/src/main/java/com/facebook/flipper/plugins/react/ReactFlipperPlugin.java
View File

@@ -7,7 +7,7 @@
*/
package com.facebook.flipper.plugins.react;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperPlugin;

18
build.gradle
View File

@@ -44,15 +44,15 @@ ext {
ext.deps = [
// Android support
supportAnnotations : "com.android.support:support-annotations:$ANDROID_SUPPORT_VERSION",
supportAppCompat : "com.android.support:appcompat-v7:$ANDROID_SUPPORT_VERSION",
supportCoreUi : "com.android.support:support-core-ui:$ANDROID_SUPPORT_VERSION",
supportRecyclerView: "com.android.support:recyclerview-v7:$ANDROID_SUPPORT_VERSION",
supportConstraintLayout: 'com.android.support.constraint:constraint-layout:1.1.0',
supportEspresso : 'com.android.support.test.espresso:espresso-core:2.2.2',
supportDesign : "com.android.support:design:$ANDROID_SUPPORT_VERSION",
supportEspressoIntents : 'com.android.support.test.espresso:espresso-intents:2.2.2',
supportTestRunner : 'com.android.support.test:runner:1.0.2',
supportAnnotations : "androidx.annotation:annotation:$ANDROIDX_VERSION",
supportAppCompat : "androidx.appcompat:appcompat:$ANDROIDX_VERSION",
supportCoreUi : "androidx.legacy:legacy-support-core-ui:$ANDROIDX_VERSION",
supportRecyclerView: "androidx.recyclerview:recyclerview:$ANDROIDX_VERSION",
supportConstraintLayout: "androidx.constraintlayout:constraintlayout:1.1.2",
supportEspresso : 'androidx.test.espresso:espresso-core:3.1.0',
supportDesign : "com.google.android.material:material:1.0.0-rc01",
supportEspressoIntents : 'androidx.test.espresso:espresso-intents:3.1.0',
supportTestRunner : 'androidx.test:runner:1.1.0',
// Arch
archPaging : 'android.arch.paging:runtime:1.0.0',
// First-party

5
gradle.properties
View File

@@ -13,8 +13,11 @@ POM_DEVELOPER_NAME=facebook
# Shared version numbers
LITHO_VERSION=0.24.0
ANDROID_SUPPORT_VERSION=28.0.0
ANDROIDX_VERSION=1.0.0
# Gradle internals
org.gradle.internal.repository.max.retries=10
org.gradle.internal.repository.initial.backoff=1250
android.useAndroidX=true
android.enableJetifier=true