Fix error build

Author: xiaokun

app/build.gradle

@@ -64,4 +64,5 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.4.0'
     implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.2.3'
+    implementation 'org.jsoup:jsoup:1.11.3'
 }

app/src/main/java/com/xiaokun/advance_practive/im/adapter/MsgsAdapter.java

@@ -7,7 +7,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.facebook.litho.Diff;
 import com.xiaokun.advance_practive.im.database.bean.PdMessage;
 import com.xiaokun.advance_practive.im.entity.Message;
 import com.xiaokun.advance_practive.im.entity.MsgItem;

baselib/build.gradle

@@ -44,6 +44,7 @@ dependencies {
     //rxjava 2.0
     api 'io.reactivex.rxjava2:rxjava:2.0.1'
     api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    api "org.reactivestreams:reactive-streams:1.0.2"
     //RxJava2 Adapter
     api 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     //Retrofit

baselib/src/main/java/com/xiaokun/baselib/BaseApplication.java

@@ -19,7 +19,6 @@
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin.SharedPreferencesDescriptor;
-import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.soloader.SoLoader;
 import com.xiaokun.baselib.util.ACache;
 import com.xiaokun.baselib.util.ContextHolder;
@@ -73,7 +72,6 @@ public void onCreate() {
 
         // Normally, you would want to make this dependent on a BuildConfig flag, but
         // for this demo application we can safely assume that you always want to debug.
-        ComponentsConfiguration.isDebugModeEnabled = true;
         LithoFlipperDescriptors.add(descriptorMapping);
         client.addPlugin(new InspectorFlipperPlugin(this, descriptorMapping));
         client.addPlugin(networkPlugin);

baselib/src/main/java/com/xiaokun/baselib/rx/util/RxBus2.java

@@ -9,7 +9,6 @@
 
 import io.reactivex.Flowable;
 import io.reactivex.Observable;
-import io.reactivex.processors.FlowableProcessor;
 import io.reactivex.processors.PublishProcessor;
 import io.reactivex.subjects.Subject;
 
@@ -28,7 +27,7 @@ public class RxBus2 {
      * PublishProcessor 同时充当了Observer和Observable的角色
      */
     @SuppressWarnings("rawtypes")
-    private ConcurrentHashMap<Object, List<FlowableProcessor>> subjectMapper = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<Object, List<PublishProcessor>> subjectMapper = new ConcurrentHashMap<>();
 
     private RxBus2() {
     }
@@ -50,14 +49,14 @@ private static class RxBus2Holder {
      */
     @SuppressWarnings({"rawtypes"})
     public <T> Flowable<T> register(@NonNull Object tag) {
-        List<FlowableProcessor> subjectList = subjectMapper.get(tag);
+        List<PublishProcessor> subjectList = subjectMapper.get(tag);
         if (null == subjectList) {
             subjectList = new ArrayList<>();
             subjectMapper.put(tag, subjectList);
         }
 
         //考虑到多线程原因使用toSerialized方法
-        FlowableProcessor<T> processor = (FlowableProcessor<T>) PublishProcessor.create().toSerialized();
+        PublishProcessor<T> processor = (PublishProcessor<T>) PublishProcessor.create().toSerialized();
         subjectList.add(processor);
         return processor;
     }
@@ -69,7 +68,7 @@ public <T> Flowable<T> register(@NonNull Object tag) {
      */
     @SuppressWarnings("rawtypes")
     public void unregister(@NonNull Object tag) {
-        List<FlowableProcessor> subjectList = subjectMapper.get(tag);
+        List<PublishProcessor> subjectList = subjectMapper.get(tag);
         if (null != subjectList) {
             subjectMapper.remove(tag);
         }
@@ -89,7 +88,7 @@ public RxBus2 unregister(@NonNull Object tag,
             return getInstance();
         }
 
-        List<FlowableProcessor> subjectList = subjectMapper.get(tag);
+        List<PublishProcessor> subjectList = subjectMapper.get(tag);
         if (null != subjectList) {
             // 从subjectList中删去observable
             subjectList.remove((Subject<?>) observable);
@@ -118,9 +117,9 @@ public void post(@NonNull Object content) {
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
     public void post(@NonNull Object tag, @NonNull Object content) {
-        List<FlowableProcessor> subjectList = subjectMapper.get(tag);
+        List<PublishProcessor> subjectList = subjectMapper.get(tag);
         if (!isEmpty(subjectList)) {
-            for (FlowableProcessor subject : subjectList) {
+            for (PublishProcessor subject : subjectList) {
                 subject.onNext(content);
             }
         }
@@ -133,7 +132,7 @@ public void post(@NonNull Object tag, @NonNull Object content) {
      * @return
      */
     @SuppressWarnings("rawtypes")
-    public static boolean isEmpty(Collection<FlowableProcessor> collection) {
+    public static boolean isEmpty(Collection<PublishProcessor> collection) {
         return null == collection || collection.isEmpty();
     }
 }

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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip