Migrate to androidx

app/build.gradle

@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -38,12 +38,12 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation "com.android.support:appcompat-v7:${rootProject.supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootProject.supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     testImplementation 'junit:junit:4.12'
     implementation 'com.github.bumptech.glide:glide:4.0.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.0'

app/src/androidTest/java/com/example/zhpan/circleviewpager/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.example.zhpan.circleviewpager;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.example.zhpan.circleviewpager", appContext.getPackageName());
-    }
-}

app/src/main/java/com/example/zhpan/circleviewpager/activity/BannerPhotoViewActivity.java

@@ -1,7 +1,7 @@
 package com.example.zhpan.circleviewpager.activity;
 
 import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.widget.Toast;
 

app/src/main/java/com/example/zhpan/circleviewpager/activity/CustomerBannerActivity.java

@@ -1,7 +1,7 @@
 package com.example.zhpan.circleviewpager.activity;
 
 import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.widget.Toast;
 

app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.java

@@ -2,7 +2,7 @@ package com.example.zhpan.circleviewpager.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.example.zhpan.circleviewpager.R;

app/src/main/java/com/example/zhpan/circleviewpager/activity/NetworkBannerActivity.java

@@ -1,8 +1,8 @@
 package com.example.zhpan.circleviewpager.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Toast;

app/src/main/java/com/example/zhpan/circleviewpager/activity/PageTransformerActivity.java

@@ -1,7 +1,7 @@
 package com.example.zhpan.circleviewpager.activity;
 
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/com/example/zhpan/circleviewpager/adapter/ArticleAdapter.java

@@ -1,8 +1,8 @@
 package com.example.zhpan.circleviewpager.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/example/zhpan/circleviewpager/bean/CustomBean.java

@@ -1,6 +1,6 @@
 package com.example.zhpan.circleviewpager.bean;
 
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 public class CustomBean {
 

app/src/main/java/com/example/zhpan/circleviewpager/imageloader/ImageLoaderOptions.java

@@ -1,8 +1,8 @@
 package com.example.zhpan.circleviewpager.imageloader;
 
 import android.content.Context;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
 import android.widget.ImageView;
 
 import com.zhpan.idea.utils.DensityUtils;

app/src/main/java/com/example/zhpan/circleviewpager/imageloader/transformer/BlurTransformation.java

@@ -1,8 +1,8 @@
 package com.example.zhpan.circleviewpager.imageloader.transformer;
 
 import android.graphics.Bitmap;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;

app/src/main/java/com/example/zhpan/circleviewpager/recyclerview/ui/CustomAdapter.java

@@ -2,11 +2,11 @@ package com.example.zhpan.circleviewpager.recyclerview.ui;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/example/zhpan/circleviewpager/recyclerview/ui/CustomRecyclerView.java

@@ -1,9 +1,9 @@
 package com.example.zhpan.circleviewpager.recyclerview.ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/example/zhpan/circleviewpager/recyclerview/ui/ScrollWrapRecycler.java

@@ -3,9 +3,9 @@ package com.example.zhpan.circleviewpager.recyclerview.ui;
 import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;

bannerview/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -32,9 +32,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 }
 
 version = "2.1.2"

bannerview/src/androidTest/java/com/zhpan/bannerview/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.zhpan.bannerview;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.zhpan.bannerview.test", appContext.getPackageName());
-    }
-}

bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java

@@ -6,10 +6,10 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DimenRes;
-import android.support.annotation.IntDef;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DimenRes;
+import androidx.annotation.IntDef;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;

bannerview/src/main/java/com/zhpan/bannerview/adapter/BannerPagerAdapter.java

@@ -1,7 +1,7 @@
 package com.zhpan.bannerview.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 

bannerview/src/main/java/com/zhpan/bannerview/provider/ViewStyleSetter.java

@@ -3,7 +3,7 @@
 package com.zhpan.bannerview.provider;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.view.View;
 
 /**

bannerview/src/main/java/com/zhpan/bannerview/transform/BaseTransformer.java

@@ -16,7 +16,7 @@
 
 package com.zhpan.bannerview.transform;
 
-import android.support.v4.view.ViewPager.PageTransformer;
+import androidx.viewpager.widget.ViewPager.PageTransformer;
 import android.view.View;
 
 public abstract class BaseTransformer implements PageTransformer {

bannerview/src/main/java/com/zhpan/bannerview/transform/PageTransformerFactory.java

@@ -1,6 +1,6 @@
 package com.zhpan.bannerview.transform;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 public class PageTransformerFactory {
 

bannerview/src/main/java/com/zhpan/bannerview/view/CustomViewPager.java

@@ -1,7 +1,7 @@
 package com.zhpan.bannerview.view;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

ideahttp/build.gradle

@@ -9,7 +9,7 @@ android {
         versionCode rootProject.releaseVersionCode
         versionName rootProject.releaseVersionName
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -24,9 +24,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:${rootProject.supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 

ideahttp/src/androidTest/java/com/zhpan/idea/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.zhpan.idea;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.zhpan.idea.test", appContext.getPackageName());
-    }
-}

ideahttp/src/main/java/com/zhpan/idea/net/common/ErrorCode.java

@@ -1,7 +1,7 @@
 
 package com.zhpan.idea.net.common;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import com.zhpan.idea.R;
 import com.zhpan.idea.utils.Utils;

ideahttp/src/main/java/com/zhpan/idea/net/common/ProgressUtils.java

@@ -1,7 +1,7 @@
 package com.zhpan.idea.net.common;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.zhpan.idea.dialog.DialogUtils;
 

ideahttp/src/main/java/com/zhpan/idea/utils/Utils.java

@@ -1,14 +1,8 @@
 package com.zhpan.idea.utils;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.view.KeyEvent;
 
-import java.lang.ref.WeakReference;
-
-import io.reactivex.Observable;
+import androidx.annotation.NonNull;
 
 /**
  * <pre>