升级至androidx

xuexiangjys · May 23, 2022 · 55401cf · 55401cf
1 parent ac626e0
commit 55401cf
Show file tree

Hide file tree

Showing 28 changed files with 173 additions and 194 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,8 +54,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     lintOptions {
@@ -65,7 +65,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation deps.support.app_compat
+    implementation deps.androidx.appcompat
     testImplementation deps.junit
     androidTestImplementation deps.runner
     androidTestImplementation deps.espresso.core
@@ -78,11 +78,11 @@ dependencies {
 //    implementation 'com.github.xuexiangjys.XRouter:xrouter-runtime:1.0.1'
 //    annotationProcessor 'com.github.xuexiangjys.XRouter:xrouter-compiler:1.0.1'
 
-    implementation 'com.github.xuexiangjys.XUtil:xutil-core:1.1.6'
+    implementation 'com.github.xuexiangjys.XUtil:xutil-core:2.0.0'
 
     //XPage
-    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.9'
-    annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:2.2.9'
+    implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.2.0'
+    annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.2.0'
     //butterknife的sdk
     implementation deps.butterknife.runtime
     annotationProcessor deps.butterknife.compiler

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/App.java b/app/src/main/java/com/xuexiang/xrouterdemo/App.java
@@ -17,17 +17,11 @@
 package com.xuexiang.xrouterdemo;
 
 import android.app.Application;
-import android.content.Context;
 
-import com.xuexiang.xpage.AppPageConfig;
 import com.xuexiang.xpage.PageConfig;
-import com.xuexiang.xpage.PageConfiguration;
-import com.xuexiang.xpage.model.PageInfo;
 import com.xuexiang.xrouter.launcher.XRouter;
 import com.xuexiang.xutil.XUtil;
 
-import java.util.List;
-
 /**
  * @author xuexiang
  * @since 2018/5/21 下午10:57
@@ -46,12 +40,7 @@ public void onCreate() {
     }
 
     private void initXPage() {
-        PageConfig.getInstance().setPageConfiguration(new PageConfiguration() {
-            @Override
-            public List<PageInfo> registerPages(Context context) {
-                return AppPageConfig.getInstance().getPages();
-            }
-        }).debug("PageLog").enableWatcher(false).init(this);
+        PageConfig.getInstance().debug("PageLog").init(this);
     }
 
     private void initXRouter() {

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test1Activity.java b/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test1Activity.java
@@ -17,9 +17,10 @@
 package com.xuexiang.xrouterdemo.activity.test;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.xuexiang.xrouter.annotation.AutoWired;
 import com.xuexiang.xrouter.annotation.Router;
 import com.xuexiang.xrouter.launcher.XRouter;

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test2Activity.java b/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test2Activity.java
@@ -17,9 +17,9 @@
 package com.xuexiang.xrouterdemo.activity.test;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
-import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.xuexiang.xrouter.annotation.AutoWired;
 import com.xuexiang.xrouter.annotation.Router;

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test3Activity.java b/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test3Activity.java
@@ -17,8 +17,10 @@
 package com.xuexiang.xrouterdemo.activity.test;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.xuexiang.xrouter.annotation.AutoWired;
 import com.xuexiang.xrouter.annotation.Router;
 import com.xuexiang.xrouter.launcher.XRouter;

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test4Activity.java b/app/src/main/java/com/xuexiang/xrouterdemo/activity/test/Test4Activity.java
@@ -17,9 +17,11 @@
 package com.xuexiang.xrouterdemo.activity.test;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.xuexiang.xrouter.annotation.Router;
 import com.xuexiang.xrouterdemo.R;
 

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/fragment/BaseFunctionFragment.java b/app/src/main/java/com/xuexiang/xrouterdemo/fragment/BaseFunctionFragment.java
@@ -19,8 +19,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.fragment.app.Fragment;
 
 import com.xuexiang.xpage.annotation.Page;
 import com.xuexiang.xpage.base.XPageSimpleListFragment;

diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/fragment/test/BlankFragment.java b/app/src/main/java/com/xuexiang/xrouterdemo/fragment/test/BlankFragment.java
@@ -18,11 +18,14 @@
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
 import com.xuexiang.xrouter.annotation.AutoWired;
 import com.xuexiang.xrouter.annotation.Router;
 import com.xuexiang.xrouterdemo.entity.TestObj;
@@ -45,10 +48,9 @@ public BlankFragment() {
 
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        TextView textView = new TextView(getActivity());
-        return textView;
+        return new TextView(getActivity());
     }
 
 }
diff --git a/app/src/main/java/com/xuexiang/xrouterdemo/interceptor/Test1Interceptor.java b/app/src/main/java/com/xuexiang/xrouterdemo/interceptor/Test1Interceptor.java
@@ -49,7 +49,7 @@ public class Test1Interceptor implements IInterceptor {
     @Override
     public void process(final Postcard postcard, final InterceptorCallback callback) {
         if ("/test/activity4".equals(postcard.getPath())) {
-            final AlertDialog.Builder ab = new AlertDialog.Builder(XUtil.get().getActivityLifecycleHelper().getCurrentActivity());
+            final AlertDialog.Builder ab = new AlertDialog.Builder(XUtil.getActivityLifecycleHelper().getCurrentActivity());
             ab.setCancelable(false);
             ab.setTitle("温馨提醒");
             ab.setMessage("想要跳转到Test4Activity么？(触发了\"/inter/test1\"拦截器，拦截了本次跳转)");

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript { 
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
 
     apply from: './versions.gradle'
     addRepos(repositories) //增加代码仓库

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,9 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-isNeedPackage = false
+isNeedPackage = false
+
+# 表示主工程使用AndroidX形式
+android.useAndroidX=true
+# 表示针对主工程中使用到的三方库，也会自动执行AndroidX的替换过程。
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
diff --git a/module_java/build.gradle b/module_java/build.gradle
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
+    compileOnly deps.androidx.appcompat
 
     implementation project(':xrouter-runtime')
     annotationProcessor project(':xrouter-compiler')

diff --git a/module_java/src/main/java/com/xuexiang/xrouterdemo/java/TestModule2Activity.java b/module_java/src/main/java/com/xuexiang/xrouterdemo/java/TestModule2Activity.java
@@ -17,7 +17,9 @@
 package com.xuexiang.xrouterdemo.java;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.xuexiang.xrouter.annotation.Router;
 
 @Router(path = "/module/2", group = "m2")

diff --git a/module_kotlin/build.gradle b/module_kotlin/build.gradle
@@ -18,6 +18,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+
 android {
     compileSdkVersion build_versions.target_sdk
     buildToolsVersion build_versions.build_tools
@@ -33,8 +34,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     buildTypes {
@@ -59,10 +60,10 @@ kapt {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation deps.support.app_compat
-    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 deps.androidx.appcompat
+    testImplementation deps.junit
+    androidTestImplementation deps.runner
+    androidTestImplementation deps.espresso.core
 
     implementation project(':xrouter-runtime')
     kapt project(':xrouter-compiler')

diff --git a/...le_kotlin/src/androidTest/java/com/xuexiang/xrouterdemo/kotlin/ExampleInstrumentedTest.kt b/...le_kotlin/src/androidTest/java/com/xuexiang/xrouterdemo/kotlin/ExampleInstrumentedTest.kt
@@ -16,14 +16,12 @@
 
 package com.xuexiang.xrouterdemo.kotlin
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/module_kotlin/src/main/java/com/xuexiang/xrouterdemo/kotlin/TestNormalActivity.java b/module_kotlin/src/main/java/com/xuexiang/xrouterdemo/kotlin/TestNormalActivity.java
@@ -17,7 +17,9 @@
 package com.xuexiang.xrouterdemo.kotlin;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.xuexiang.xrouter.annotation.Router;
 
 @Router(path = "/kotlin/java")