升级 androidx

ximencx · Jun 14, 2024 · bab804e · bab804e
1 parent 4309c2a
commit bab804e
Show file tree

Hide file tree

Showing 32 changed files with 107 additions and 111 deletions.
diff --git a/0.8.aar b/0.8.aar
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.xm.testmvp"
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -19,7 +19,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     annotationProcessor "com.google.dagger:dagger-compiler:2.14.1"
     api 'com.google.dagger:dagger:2.14.1'
     api project(':xmvp')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".main.MainActivity">
+        <activity android:name=".main.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/xm/testmvp/main/MainActivity.java b/app/src/main/java/com/xm/testmvp/main/MainActivity.java
@@ -2,7 +2,7 @@
 
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.xm.testmvp.domain.GetStringUseCase;

diff --git a/app/src/main/java/com/xm/testmvp/main/ViewActivityMain.java b/app/src/main/java/com/xm/testmvp/main/ViewActivityMain.java
@@ -1,7 +1,7 @@
 package com.xm.testmvp.main;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 

diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line
+        classpath 'com.android.tools.build:gradle:4.0.1' // 确认构建工具版本
+//        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -7,14 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=false
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.useAndroidX=true
+android.enableJetifier=true
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 11:19:01 CST 2019
+#Fri Jun 14 19:04:03 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/xmvp/build.gradle b/xmvp/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     annotationProcessor "com.google.dagger:dagger-compiler:2.14.1"
     api 'com.google.dagger:dagger:2.14.1'
     api 'com.google.code.gson:gson:2.2.4'

diff --git a/xmvp/src/main/java/com/xm/xmvp/application/BoundedApplicationConfig.java b/xmvp/src/main/java/com/xm/xmvp/application/BoundedApplicationConfig.java
@@ -1,6 +1,7 @@
 package com.xm.xmvp.application;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+
 
 /**
  * created on 2019/1/26.

diff --git a/xmvp/src/main/java/com/xm/xmvp/application/ComponentApplication.java b/xmvp/src/main/java/com/xm/xmvp/application/ComponentApplication.java
@@ -2,8 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/xmvp/src/main/java/com/xm/xmvp/application/ForkedApplication.java b/xmvp/src/main/java/com/xm/xmvp/application/ForkedApplication.java
@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/AroundQua.java b/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/AroundQua.java
@@ -1,6 +1,7 @@
 package com.xm.xmvp.di.annotation.qua;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/ConnSecurityQua.java b/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/ConnSecurityQua.java
@@ -1,6 +1,7 @@
 package com.xm.xmvp.di.annotation.qua;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/DiConfig.java b/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/DiConfig.java
@@ -1,6 +1,8 @@
 package com.xm.xmvp.di.annotation.qua;
 
-import android.support.annotation.StringDef;
+
+
+import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/StoreQua.java b/xmvp/src/main/java/com/xm/xmvp/di/annotation/qua/StoreQua.java
@@ -1,6 +1,7 @@
 package com.xm.xmvp.di.annotation.qua;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/ActivityModule.java b/xmvp/src/main/java/com/xm/xmvp/di/module/ActivityModule.java
@@ -4,8 +4,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.xm.xmvp.di.annotation.qua.AroundQua;
 import com.xm.xmvp.di.annotation.qua.DiConfig;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/ApplicationModule.java b/xmvp/src/main/java/com/xm/xmvp/di/module/ApplicationModule.java
@@ -4,9 +4,11 @@
 import android.app.AlarmManager;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.view.LayoutInflater;
 
+import androidx.annotation.NonNull;
+
 import com.xm.xmvp.application.AndroidApplication;
 import com.xm.xmvp.di.annotation.qua.AroundQua;
 import com.xm.xmvp.di.annotation.qua.DiConfig;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/FragmentModule.java b/xmvp/src/main/java/com/xm/xmvp/di/module/FragmentModule.java
@@ -3,8 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import com.xm.xmvp.di.annotation.qua.AroundQua;
 import com.xm.xmvp.di.annotation.qua.DiConfig;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/impl/PostExecutionThread.java b/xmvp/src/main/java/com/xm/xmvp/di/module/impl/PostExecutionThread.java
@@ -1,6 +1,7 @@
 package com.xm.xmvp.di.module.impl;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import rx.Scheduler;
 

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/impl/ThreadExecutorImpl.java b/xmvp/src/main/java/com/xm/xmvp/di/module/impl/ThreadExecutorImpl.java
@@ -1,7 +1,9 @@
 package com.xm.xmvp.di.module.impl;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Future;

diff --git a/xmvp/src/main/java/com/xm/xmvp/di/module/impl/UIThreadImpl.java b/xmvp/src/main/java/com/xm/xmvp/di/module/impl/UIThreadImpl.java
@@ -1,6 +1,8 @@
 package com.xm.xmvp.di.module.impl;
 
-import android.support.annotation.NonNull;
+
+
+import androidx.annotation.NonNull;
 
 import javax.inject.Inject;
 

diff --git a/xmvpbase/build.gradle b/xmvpbase/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.ximencx'
+//apply plugin: 'com.github.dcendents.android-maven'
+//group='com.github.ximencx'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -23,5 +23,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }
diff --git a/xmvpbase/src/main/java/com/xm/xmvpbase/ActivityStack.java b/xmvpbase/src/main/java/com/xm/xmvpbase/ActivityStack.java
@@ -1,17 +1,15 @@
 package com.xm.xmvpbase;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
- * created on 2019/1/26.
- * author:wangkezhi
- * email:45436460@qq.com
- * summary:
+ *
  */
 public class ActivityStack {
 

diff --git a/xmvpbase/src/main/java/com/xm/xmvpbase/FragmentStack.java b/xmvpbase/src/main/java/com/xm/xmvpbase/FragmentStack.java
@@ -1,15 +1,12 @@
 package com.xm.xmvpbase;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-
-/**
- * created on 2019/1/26.
- * author:wangkezhi
- * email:45436460@qq.com
- * summary:
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+/*
  */
 public class FragmentStack {
 

diff --git a/xmvpbase/src/main/java/com/xm/xmvpbase/XMvpException.java b/xmvpbase/src/main/java/com/xm/xmvpbase/XMvpException.java
@@ -1,14 +1,11 @@
 package com.xm.xmvpbase;
 
 /**
- * created on 2019/1/26.
- * author:wangkezhi
- * email:45436460@qq.com
- * summary:
+ *
  */
 public class XMvpException extends Exception {
 
-    public static final String FAILED_INIT_VIEW="FAILED_INIT_VIEW";
+    public static final String FAILED_INIT_VIEW = "FAILED_INIT_VIEW";
 
     public XMvpException() {
     }

diff --git a/xmvpbase/src/main/java/com/xm/xmvpbase/basemvp/BaseMvpActivity.java b/xmvpbase/src/main/java/com/xm/xmvpbase/basemvp/BaseMvpActivity.java
@@ -1,17 +1,16 @@
 package com.xm.xmvpbase.basemvp;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.xm.xmvpbase.presenter.Presenter;
 import com.xm.xmvpbase.vu.Vu;
 
 /**
- * created on 2019/1/26.
- * author:wangkezhi
- * email:45436460@qq.com
- * summary:
+ * @param <V>
+ * @param <P>
  */
 public abstract class BaseMvpActivity<V extends Vu.ActivityVu, P extends Presenter> extends AppCompatActivity implements Presenter {
 

diff --git a/xmvpbase/src/main/java/com/xm/xmvpbase/basemvp/BaseMvpFragment.java b/xmvpbase/src/main/java/com/xm/xmvpbase/basemvp/BaseMvpFragment.java
@@ -1,20 +1,20 @@
 package com.xm.xmvpbase.basemvp;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.xm.xmvpbase.presenter.Presenter;
 import com.xm.xmvpbase.vu.Vu;
 
 /**
- * created on 2019/1/26.
- * author:wangkezhi
- * email:45436460@qq.com
- * summary:
+ *
+ * @param <V>
+ * @param <P>
  */
 public abstract class BaseMvpFragment<V extends Vu.FragmentVu, P extends Presenter> extends Fragment implements Presenter {