META-INF中多个文件冲突

zhxhcoder · zhxhcoder · commit c312dc8d364b · 2023-04-14T17:34:26.000+08:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 30
+    compileSdk 31
     buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.creditease.netspy.demo"
@@ -43,6 +43,6 @@ dependencies {
     implementation project(path: ':netspylib')
     implementation 'org.greenrobot:greendao:3.2.2'
     //noinspection GradleCompatible
-    implementation 'com.android.support:localbroadcastmanager:28.0.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
 }
diff --git a/app/src/main/java/com/creditease/netspy/demo/socket/ChatActivity.java b/app/src/main/java/com/creditease/netspy/demo/socket/ChatActivity.java
@@ -11,10 +11,10 @@
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.support.v4.content.LocalBroadcastManager;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/app/src/main/java/com/creditease/netspy/demo/socket/SocketMainActivity.java b/app/src/main/java/com/creditease/netspy/demo/socket/SocketMainActivity.java
@@ -6,8 +6,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.content.LocalBroadcastManager;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/netspylib/build.gradle b/netspylib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'org.greenrobot.greendao'
 apply plugin: 'com.github.dcendents.android-maven'
 android {
-    compileSdk 30
+    compileSdk 31
     buildToolsVersion  "30.0.3"
 
     defaultConfig {
