AndroidX开始适配初版

blackbin · Jul 9, 2020 · df79cd7 · df79cd7
1 parent d0503d5
commit df79cd7
Show file tree

Hide file tree

Showing 49 changed files with 169 additions and 136 deletions.
diff --git a/ApiDemo/build.gradle b/ApiDemo/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.api.demo"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         //指定EventBus加速用的Index2
         javaCompileOptions {
             annotationProcessorOptions {
@@ -52,21 +52,29 @@ android {
         targetGenDir 'src/main/java' //生成源文件的路径。默认源文件目录是在build目录中的(build/generated/source/greendao)
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         abortOnError false
     }
 }
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
     testImplementation 'junit:junit:4.12'
-    api 'com.android.support:appcompat-v7:27.1.1'
-    api 'com.android.support:design:27.1.1'
-    api 'com.android.support:recyclerview-v7:27.1.1'
-    api 'com.android.support:cardview-v7:27.1.1'
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.1.0'
+    api 'androidx.recyclerview:recyclerview:1.1.0'
+    api 'androidx.cardview:cardview:1.0.0'
 
     //依赖Devring库
     //该库中已添加了Dagger2，Retrofit2，RxJava2，RxAndroid2，RxLifeCycle2，RxPermission2的依赖，不必重复添加。
@@ -77,16 +85,16 @@ dependencies {
     }
 
     //══════════════════════资源绑定(ButterKnife)开始══════════════════════
-    api 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'//用于butterknife在编译时根据注解生成相关文件
+    api 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'//用于butterknife在编译时根据注解生成相关文件
     //══════════════════════资源绑定(ButterKnife)结束══════════════════════
 
     //══════════════════════图片加载开始══════════════════════
     //Fresco
     //为了演示如何使用Fresco替换掉DevRing中默认的Glide，需添加Fresco的相关依赖
     //Fresco体积较大，如果对图片加载要求不高，建议使用Glide
-    api 'com.facebook.fresco:fresco:1.5.0'
-    api 'com.facebook.fresco:animated-gif:1.5.0' //用于Fresco加载gif动图
+    api 'com.facebook.fresco:fresco:1.13.0'
+    api 'com.facebook.fresco:animated-gif:1.13.0' //用于Fresco加载gif动图
     api 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'//用于替换fresco的网络加载为okhttp
     api 'jp.wasabeef:fresco-processors:2.1.0@aar'//用于提供fresco的各种图片变换
     //══════════════════════图片加载结束══════════════════════

diff --git a/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java b/ApiDemo/src/androidTest/java/com/api/demo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.api.demo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() throws Exception {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("com.api.demo", appContext.getPackageName());
     }

diff --git a/ApiDemo/src/main/java/com/api/demo/MainActivity.java b/ApiDemo/src/main/java/com/api/demo/MainActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 

diff --git a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityA.java
@@ -2,7 +2,7 @@
 
 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.TextView;
 

diff --git a/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java b/ApiDemo/src/main/java/com/api/demo/bus/BusActivityB.java
@@ -1,7 +1,7 @@
 package com.api.demo.bus;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java b/ApiDemo/src/main/java/com/api/demo/db/DBActivity.java
@@ -1,9 +1,9 @@
 package com.api.demo.db;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;

diff --git a/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java b/ApiDemo/src/main/java/com/api/demo/db/QueryResultAdapter.java
@@ -1,6 +1,6 @@
 package com.api.demo.db;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java b/ApiDemo/src/main/java/com/api/demo/db/greendao/GreenDBManager.java
@@ -1,6 +1,6 @@
 package com.api.demo.db.greendao;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.api.demo.db.User;
 import com.ljy.devring.DevRing;

diff --git a/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java b/ApiDemo/src/main/java/com/api/demo/db/nativedao/NativeDBManager.java
@@ -1,6 +1,6 @@
 package com.api.demo.db.nativedao;
 
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 import com.api.demo.db.User;
 import com.ljy.devring.DevRing;

diff --git a/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java b/ApiDemo/src/main/java/com/api/demo/http/HttpActivity.java
@@ -1,7 +1,7 @@
 package com.api.demo.http;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;

diff --git a/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java b/ApiDemo/src/main/java/com/api/demo/image/FrescoManager.java
@@ -4,7 +4,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.facebook.cache.disk.DiskCacheConfig;

diff --git a/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java b/ApiDemo/src/main/java/com/api/demo/image/ImageActivity.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ImageView;
 

diff --git a/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java b/ApiDemo/src/main/java/com/api/demo/other/OtherActivity.java
@@ -2,7 +2,7 @@
 
 import android.Manifest;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.api.demo.R;

diff --git a/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java b/ApiDemo/src/main/java/com/api/demo/util/UtilActivity.java
@@ -1,7 +1,7 @@
 package com.api.demo.util;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.api.demo.R;

diff --git a/ApiDemo/src/main/res/layout/activity_bus_a.xml b/ApiDemo/src/main/res/layout/activity_bus_a.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_margin="10dp"
             android:text="事件总线模块的配置请到ApiApplication类或使用文档中查看。\n 关于普通事件和粘性事件等介绍可以到我博客中查看。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -45,9 +45,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -90,7 +90,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/ApiDemo/src/main/res/layout/activity_bus_b.xml b/ApiDemo/src/main/res/layout/activity_bus_b.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -11,7 +11,7 @@
         android:orientation="vertical"
         >
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -41,9 +41,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -73,7 +73,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/ApiDemo/src/main/res/layout/activity_db.xml b/ApiDemo/src/main/res/layout/activity_db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:layout_margin="10dp"
             android:text="使用数据库模块前，请先在Application中设置数据库管理者。\n数据库管理者的实现以及更多增删改查的用法，请查看源码或使用文档。"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -48,7 +48,7 @@
                     android:textSize="14sp"
                     />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_result"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -57,9 +57,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -121,9 +121,9 @@
                     android:text="插入数据"/>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -176,9 +176,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -208,9 +208,9 @@
                     />
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -267,7 +267,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>