升级AndroidX

maning0303 · Oct 16, 2020 · 02a4fef · 02a4fef
1 parent 945bec9
commit 02a4fef
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 28 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         targetSdkVersion 28
         versionCode 111
         versionName "1.1.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,9 +20,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
     implementation project(':library-crashmonitor')
 //    implementation ('com.github.maning0303:MNCrashMonitor:V1.1.1')

diff --git a/app/src/main/java/com/maning/crashmonitor/MainActivity.java b/app/src/main/java/com/maning/crashmonitor/MainActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;

diff --git a/app/src/main/java/com/maning/crashmonitor/SecondActivity.java b/app/src/main/java/com/maning/crashmonitor/SecondActivity.java
@@ -1,6 +1,6 @@
 package com.maning.crashmonitor;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,3 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.enableAapt2=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/library-crashmonitor/build.gradle b/library-crashmonitor/build.gradle
@@ -22,7 +22,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    compileOnly 'com.android.support:support-v4:28.0.0'
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
-    compileOnly 'com.android.support:recyclerview-v7:28.0.0'
+    compileOnly 'androidx.legacy:legacy-support-v4:1.0.0'
+    compileOnly 'androidx.appcompat:appcompat:1.2.0'
+    compileOnly 'androidx.recyclerview:recyclerview:1.1.0'
 }
diff --git a/...shmonitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashBaseActivity.java b/...shmonitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashBaseActivity.java
@@ -1,9 +1,9 @@
 package com.maning.librarycrashmonitor.ui.activity;
 
 import android.content.Context;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

diff --git a/...onitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashDetailsActivity.java b/...onitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashDetailsActivity.java
@@ -12,9 +12,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.view.View;

diff --git a/...shmonitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashListActivity.java b/...shmonitor/src/main/java/com/maning/librarycrashmonitor/ui/activity/CrashListActivity.java
@@ -6,11 +6,11 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;

diff --git a/...rashmonitor/src/main/java/com/maning/librarycrashmonitor/ui/adapter/CrashInfoAdapter.java b/...rashmonitor/src/main/java/com/maning/librarycrashmonitor/ui/adapter/CrashInfoAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;

diff --git a/...y-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MCrashFileProvider.java b/...y-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MCrashFileProvider.java
@@ -1,6 +1,6 @@
 package com.maning.librarycrashmonitor.utils;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * @author : maning

diff --git a/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MShareUtil.java b/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MShareUtil.java
@@ -5,7 +5,7 @@
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.widget.Toast;
 
 import java.io.File;

diff --git a/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MSpannableUtils.java b/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MSpannableUtils.java
@@ -1,7 +1,7 @@
 package com.maning.librarycrashmonitor.utils;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 import android.text.Spannable;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;

diff --git a/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MStatusBarUtils.java b/library-crashmonitor/src/main/java/com/maning/librarycrashmonitor/utils/MStatusBarUtils.java
@@ -2,8 +2,8 @@
 
 import android.app.Activity;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntRange;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
 import android.view.WindowManager;
 
 /**

diff --git a/library-crashmonitor/src/main/res/layout/activity_mncrash_list.xml b/library-crashmonitor/src/main/res/layout/activity_mncrash_list.xml
@@ -55,18 +55,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipeRefreshLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycleView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/crash_white" />
 
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </RelativeLayout>