diff --git a/.gitignore b/.gitignore
index f6b286c..81d4b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,7 @@ captures/
 
 # Intellij
 *.iml
-.idea/workspace.xml
+.idea/
 
 # Keystore files
 *.jks
diff --git a/README.md b/README.md
index 74fa673..5ebef2c 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,220 @@
-# EventDispatcher
\ No newline at end of file
+# Universal Event Bus
+=============================
+
+The Universal Event Bus is an event dispatcher architecture which help you to use most common event bus implementation as Otto in a structured mode.
+
+An events is a bus designed to separate different parts of the application, while still allowing them to communicate efficiently.
+The operation of the EventDispatcher is based on the publish-subscribe pattern: the bus asked a series of events that will be collected by those who joined them.
+
+The publisher is, in this case, called Bus or RxBus and deals with post events using the Observable of RxJava. The event dispatcher contains two RxBuses: one dedicated to the UI thread, and the other for all the other events that have nothing to do with the UI (network calls, CRUD operations with the database etc.).
+
+The events that are posted by the Event dispatcher are heard by all those who sign up. To register, you must write down the method that the signing will take as an argument the type of object that the public EventDispatcher and will be annotated with the notation @Subscribe or @RxSubscribe
+
+![alt tag](http://sharing.sysdata.it/fvgmock/ues-diagram01.png)
+
+Usage
+--------
+
+1) You've got to initialize the EventDispatcher with your favorite process. 
+We suggest to do it in the MainApplication's onCreate() and use RxEventProcessor which use RxJava.
+
+```java
+  EventDispatcher.useEventProcessor(RxEventProcessor.newInstance());
+```
+We also implemented an EventProcessor which use Otto as Event Bus.
+
+```java
+  EventDispatcher.useEventProcessor(EventProcessor.newInstance());
+```
+2) Register the EventDispatcher when the Activity/Fragment/Service is created and unregister it when it is destroyed.
+
+```java
+    
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // register the event dispatcher in order to receive 
+        // events that are posted on the Bus.
+        EventDispatcher.register(this);
+    }
+    
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // unregister the event dispatcher
+        EventDispatcher.unregister(this);
+    }
+```
+3) Create events, post and receive them: Once the EventDispatcher is initialized and register in your Android component, you can post and receive events easily. Use `EventDispatcher.post()` to post the event you want to stream in the bus. Create a public method that has the same event type in its signature and annotate it with the `@RxSubscribe` signature in order to receive the Object that has been posted.
+
+```java
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // post an example event 
+        EventDispatcher.post(new ExampleEvent());
+    }
+    
+    @RxSubscribe
+    public void onConsumeExampleEvent(ExampleEvent event) {
+        // do what you want with the incoming event
+    }
+    
+    /**
+    * This is an example empty event: remember to add the "Event" annotation!!
+    */
+    @Event(type = Event.Type.UI)
+    public class ExampleEvent {
+    
+        public ExampleEvent() {
+          // empty constructor
+        }
+        
+    }
+```
+
+The posting class can be different from the receiving one: both must be registered to the EventDispatcher, though! Remember that each Class that you want to use as an event MUST have the `@Event` annotation. You can choose between 5 type of events based on which is the use of the designed event: GENERIC, DATA, NETWORK, CONTEXT and UI. The difference is that UI events will be posted on the UI thread, meanwhile the others will be posted in a separated Thread.
+
+Handle configuration changes
+--------
+
+EventDispatcher allows you to handle configuration changes easily. By using `EventDispatcher.loadPoint()` and `EventDispatcher.savePoint()` you will be able to receive posted events even after a configuration change (i.e. rotation or other lifecycle events).
+
+```java
+    
+    private String mEventDispatcherTag;
+    
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // retrieve the saved state, if present
+        if (savedInstanceState != null && savedInstanceState.containsKey("ett")) {
+            this.mEventDispatcherTag = savedInstanceState.getString("ett");
+        }
+        // loadPoint() is used to handle events' saved state between configuration changes 
+        EventDispatcher.loadPoint(this, this.mEventDispatcherTag);
+    }
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        // save the EventDispatcher's tag
+        outState.putString("ett", mEventDispatcherTag);
+    }
+    
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // save point is used to save the state in order to restore it later, after the configuration change.
+        this.mEventDispatcherTag = EventDispatcher.savePoint(this);
+    }
+```
+
+Create custom EventProcessor
+--------
+
+You can implement your own EventProcessor if you want, you need to create a class which implements the interface EventProcessor
+
+```java
+    public interface EventProcessor {
+
+        /**
+         * Registers a given Object on both Buses
+         *
+         * @param o Object to register on the Buses
+         */
+        void onRegister(Object o);
+    
+        /**
+         * Unregisters a given Object from both Buses
+         *
+         * @param o Object to unregister from the Buses
+         */
+        void onUnregister(Object o);
+
+        /**
+         * After checking whether the object being posted is annotated with the {@link Event} Annotation,
+         * it will be placed in the corresponding queue and such queue will be then sorted by {@link Event.Priority}.
+         * <p>
+         *     <b>NOTE: if an object being posted has not been annotated with the {@link Event} Annotation it will be disregarded!!!</b>
+         * </p>
+         *
+         * @param o the Object we want to post as an event
+         */
+        void onPost(Object o);
+    
+        /**
+         * This method return a string used by {@link EventProcessor} to save the state of the object in configuration changes.<br>
+         * You should use the string returned by this method with {@code EventDispatcher.loadPoint()}<br>
+         * This method must be called before {@code EventDispatcher.unregister(...)} (in {@code OnPause(...)} method for example)
+         * <p>
+         * <b>NOTE: this string should be saved on instance state in Activity and retrieved when it restart on OnCreate(...) method</b>
+         * </p>
+         *
+         * @param object
+         * @return
+         */
+        String onSavePoint(Object object);
+    
+        /**
+         * This method load the configuration variables used by {@link EventDispatcher} to handle the configuration changes.<br>
+         * You should use this method in pair with {@code EventDispatcher.savePoint(...)}.<br>
+         * This method must be called before {@code EventDispatcher.register(...)} (in {@code OnResume(...)} method for example)<br>
+         *
+         * @param object
+         *
+         */
+        void onLoadPoint(Object object, String key);
+    }
+```
+
+
+Download
+--------
+
+Downloadable .jars can be found on the [Bintray download page][2].
+
+You can also depend on the .jar through Maven:
+```xml
+<dependency>
+  <groupId>com.baseandroid</groupId>
+  <artifactId>baseandroid-rxeventdispatcher</artifactId>
+  <version>0.0.14</version>
+</dependency>
+```
+or Gradle:
+```groovy
+compile "com.baseandroid:baseandroid-rxeventdispatcher:0.0.14"
+// rxJava
+compile 'io.reactivex:rxandroid:1.2.1'
+// Because RxAndroid releases are few and far between, it is recommended you also
+// explicitly depend on RxJava's latest version for bug fixes and new features.
+compile 'io.reactivex:rxjava:1.2.6'
+```
+
+Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap].
+
+
+
+License
+-------
+
+  Copyright (C) 2020 Sysdata, S.p.a.
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+
+
+ [1]: http://square.github.com/otto/
+ [2]: https://dl.bintray.com/sysdata/maven/com/baseandroid/baseandroid-eventdispatcher/
+ [snap]: https://oss.sonatype.org/content/repositories/snapshots/
diff --git a/app/build.gradle b/app/build.gradle
index eff4b58..6643b24 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "it.sysdata.eventdispatcher"
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -26,21 +25,21 @@ dependencies {
 
     def adapterVersionName = project.ext.libVersionName
 
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     // WITH THESE ONES YOU CAN TEST REMOTE LIBS
     // REMEMBER TO USE THESE AFTER TEST CAUSE JENKINS TROUBLES
-    compile "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
-    compile "com.baseandroid:baseandroid-eventdispatcher:$adapterVersionName"
-    // compile "com.baseandroid:baseandroid-rxeventdispatcher:$adapterVersionName'
+    implementation "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
+    // implementation "com.baseandroid:baseandroid-eventdispatcher:$adapterVersionName"
+    implementation "com.baseandroid:baseandroid-rxeventdispatcher:$adapterVersionName"
 
     // WITH THESE ONES YOU CAN USE LOCAL PROJECTS
     // REMEMBER: COMMENT THESE ONES BEFOR PUSH ON DEVELOP CAUSE JENKINS TROUBLES
-    //compile project(path: ':baseandroid-busadapter')
-    //compile project(path: ':baseandroid-eventdispatcher')
-    //compile project(path: ':baseandroid-rxeventdispatcher')
+    // implementation project(path: ':baseandroid-busadapter')
+    // implementation project(path: ':baseandroid-eventdispatcher')
+    // implementation project(path: ':baseandroid-rxeventdispatcher2')
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64ccc47..5af0c3d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="it.sysdata.eventdispatcher" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="it.sysdata.eventdispatcher">
 
     <application
-        android:allowBackup="true"
+        android:name=".SampleApplication"
+        android:allowBackup="false"
+        android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:replace="android:allowBackup">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/it/sysdata/eventdispatcher/SampleApplication.java b/app/src/main/java/it/sysdata/eventdispatcher/SampleApplication.java
new file mode 100644
index 0000000..d784df8
--- /dev/null
+++ b/app/src/main/java/it/sysdata/eventdispatcher/SampleApplication.java
@@ -0,0 +1,21 @@
+package it.sysdata.eventdispatcher;
+
+import android.app.Application;
+
+import com.baseandroid.events.EventDispatcher;
+import com.baseandroid.events.rx.RxEventProcessor;
+
+public class SampleApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // init event bus ASAP
+        initEventBus();
+    }
+
+    private void initEventBus() {
+        // choose the processor you want to use
+        EventDispatcher.useEventProcessor(RxEventProcessor.newInstance());
+    }
+}
diff --git a/app/src/main/java/it/sysdata/eventdispatcher/UIEvent.java b/app/src/main/java/it/sysdata/eventdispatcher/events/UIEvent.java
old mode 100755
new mode 100644
similarity index 88%
rename from app/src/main/java/it/sysdata/eventdispatcher/UIEvent.java
rename to app/src/main/java/it/sysdata/eventdispatcher/events/UIEvent.java
index cbf03af..4c1aafc
--- a/app/src/main/java/it/sysdata/eventdispatcher/UIEvent.java
+++ b/app/src/main/java/it/sysdata/eventdispatcher/events/UIEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package it.sysdata.eventdispatcher;
+package it.sysdata.eventdispatcher.events;
 
 import com.baseandroid.events.Event;
 
diff --git a/app/src/main/java/it/sysdata/eventdispatcher/MainActivity.java b/app/src/main/java/it/sysdata/eventdispatcher/ui/MainActivity.java
old mode 100755
new mode 100644
similarity index 79%
rename from app/src/main/java/it/sysdata/eventdispatcher/MainActivity.java
rename to app/src/main/java/it/sysdata/eventdispatcher/ui/MainActivity.java
index f60cb9a..cb56a9d
--- a/app/src/main/java/it/sysdata/eventdispatcher/MainActivity.java
+++ b/app/src/main/java/it/sysdata/eventdispatcher/ui/MainActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,20 @@
  * limitations under the License.
  */
 
-package it.sysdata.eventdispatcher;
+package it.sysdata.eventdispatcher.ui;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+
 import com.baseandroid.events.EventDispatcher;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import it.sysdata.eventdispatcher.R;
+import it.sysdata.eventdispatcher.events.UIEvent;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -31,10 +35,10 @@ public class MainActivity extends AppCompatActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
-		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-		EventDispatcher.register(this);
-		FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+		FloatingActionButton fab = findViewById(R.id.fab);
 		fab.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
diff --git a/app/src/main/java/it/sysdata/eventdispatcher/MainActivityFragment.java b/app/src/main/java/it/sysdata/eventdispatcher/ui/MainFragment.java
old mode 100755
new mode 100644
similarity index 62%
rename from app/src/main/java/it/sysdata/eventdispatcher/MainActivityFragment.java
rename to app/src/main/java/it/sysdata/eventdispatcher/ui/MainFragment.java
index 548251c..ccad307
--- a/app/src/main/java/it/sysdata/eventdispatcher/MainActivityFragment.java
+++ b/app/src/main/java/it/sysdata/eventdispatcher/ui/MainFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,35 +14,50 @@
  * limitations under the License.
  */
 
-package it.sysdata.eventdispatcher;
+package it.sysdata.eventdispatcher.ui;
 
 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.Toast;
 
 import com.baseandroid.events.EventDispatcher;
-import com.squareup.otto.Subscribe;
+import com.baseandroid.events.rx.annotations.RxSubscribe;
+
+import androidx.fragment.app.Fragment;
+import it.sysdata.eventdispatcher.R;
+import it.sysdata.eventdispatcher.events.UIEvent;
 
 /**
  * A placeholder fragment containing a simple view.
  */
-public class MainActivityFragment extends Fragment {
+public class MainFragment extends Fragment {
 
-	public MainActivityFragment() {
+	public MainFragment() {
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-	                         Bundle savedInstanceState) {
-		EventDispatcher.register(this);
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		return inflater.inflate(R.layout.fragment_main, container, false);
 	}
 
-	@Subscribe
-	public void onConsumePippo(final UIEvent UIEvent) {
+	@Override
+	public void onResume() {
+		super.onResume();
+		// register to events
+		EventDispatcher.register(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		// unregister from incoming events
+		EventDispatcher.unregister(this);
+	}
+
+	@RxSubscribe
+	public void onConsumeUIEvent(final UIEvent uiEvent) {
 		Toast.makeText(getActivity(), "received UIEvent", Toast.LENGTH_SHORT).show();
 	}
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 800bcfc..0a348c0 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,32 +15,32 @@
   ~ limitations under the License.
   -->
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -48,4 +48,4 @@
         android:layout_margin="@dimen/fab_margin"
         android:src="@android:drawable/ic_dialog_email"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 21b1aad..16f8beb 100755
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           xmlns:app="http://schemas.android.com/apk/res-auto"
           android:id="@+id/fragment"
-          android:name="it.sysdata.eventdispatcher.MainActivityFragment"
+          android:name="it.sysdata.eventdispatcher.ui.MainFragment"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 4407c04..2c0bf93 100755
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 android:paddingBottom="@dimen/activity_vertical_margin"
                 tools:showIn="@layout/activity_main"
-                tools:context=".MainActivityFragment">
+                tools:context=".ui.MainFragment">
 
     <TextView
         android:text="Hello World!"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 17b7c37..cf24193 100755
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
-      tools:context=".MainActivity">
+      tools:context=".ui.MainActivity">
     <item android:id="@+id/action_settings"
           android:title="@string/action_settings"
           android:orderInCategory="100"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index a490268..7f2a768 100755
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index c1c1b7b..a38650c 100755
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a706a0b..ee17bf0 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 44e2008..6f0eabf 100755
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b06e8d1..0c8ae09 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d67389b..01d5b45 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java b/app/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java
deleted file mode 100755
index 4aba6d6..0000000
--- a/app/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package it.sysdata.eventdispatcher;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-	@Test
-	public void addition_isCorrect() throws Exception {
-		assertEquals(4, 2 + 2);
-	}
-}
\ No newline at end of file
diff --git a/baseandroid-busadapter/build.gradle b/baseandroid-busadapter/build.gradle
index 5d75b30..34e84e8 100755
--- a/baseandroid-busadapter/build.gradle
+++ b/baseandroid-busadapter/build.gradle
@@ -6,26 +6,23 @@ buildscript {
             maven { url "https://plugins.gradle.org/m2/" }
             maven { url 'https://oss.jfrog.org/libs-snapshot' }
         }
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 def libName = "baseandroid-busadapter"
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode libVersionCode
         versionName libVersionName
     }
@@ -36,8 +33,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         abortOnError false
@@ -45,9 +42,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'
 }
 
 // pubblicazione maven
diff --git a/baseandroid-busadapter/publishBintray.gradle b/baseandroid-busadapter/publishBintray.gradle
index abe686e..e9d21ce 100755
--- a/baseandroid-busadapter/publishBintray.gradle
+++ b/baseandroid-busadapter/publishBintray.gradle
@@ -1,3 +1,15 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
+    }
+}
+
 apply plugin: 'com.android.library'
 
 ext {
@@ -56,6 +68,7 @@ install {
 
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven'
 
 version = libraryVersion
 
@@ -66,8 +79,8 @@ task sourcesJar(type: Jar) {
 }
 
 task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+//    source = android.sourceSets.main.java.srcDirs
+//    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/baseandroid-busadapter/src/androidTest/java/com/baseandroid/eventdispatcher/busadapter/ApplicationTest.java b/baseandroid-busadapter/src/androidTest/java/com/baseandroid/eventdispatcher/busadapter/ApplicationTest.java
deleted file mode 100755
index 959a87b..0000000
--- a/baseandroid-busadapter/src/androidTest/java/com/baseandroid/eventdispatcher/busadapter/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.baseandroid.eventdispatcher.busadapter;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-	public ApplicationTest() {
-		super(Application.class);
-	}
-}
\ No newline at end of file
diff --git a/baseandroid-busadapter/src/main/AndroidManifest.xml b/baseandroid-busadapter/src/main/AndroidManifest.xml
index a9b89ea..b643434 100755
--- a/baseandroid-busadapter/src/main/AndroidManifest.xml
+++ b/baseandroid-busadapter/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
         >
diff --git a/baseandroid-busadapter/src/main/java/com/baseandroid/events/Event.java b/baseandroid-busadapter/src/main/java/com/baseandroid/events/Event.java
index f02ca5b..47c825e 100755
--- a/baseandroid-busadapter/src/main/java/com/baseandroid/events/Event.java
+++ b/baseandroid-busadapter/src/main/java/com/baseandroid/events/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventDispatcher.java b/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventDispatcher.java
index 2496d26..d8c534d 100755
--- a/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventDispatcher.java
+++ b/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventProcessor.java b/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventProcessor.java
index d1a8853..f54d087 100755
--- a/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventProcessor.java
+++ b/baseandroid-busadapter/src/main/java/com/baseandroid/events/EventProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-busadapter/src/main/res/values/strings.xml b/baseandroid-busadapter/src/main/res/values/strings.xml
index 7b347b5..d8b9a06 100755
--- a/baseandroid-busadapter/src/main/res/values/strings.xml
+++ b/baseandroid-busadapter/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/baseandroid-busadapter/src/test/java/com/baseandroid/eventdispatcher/busadapter/ExampleUnitTest.java b/baseandroid-busadapter/src/test/java/com/baseandroid/eventdispatcher/busadapter/ExampleUnitTest.java
deleted file mode 100755
index 2e05a70..0000000
--- a/baseandroid-busadapter/src/test/java/com/baseandroid/eventdispatcher/busadapter/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baseandroid.eventdispatcher.busadapter;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-	@Test
-	public void addition_isCorrect() throws Exception {
-		assertEquals(4, 2 + 2);
-	}
-}
\ No newline at end of file
diff --git a/baseandroid-eventdispatcher/build.gradle b/baseandroid-eventdispatcher/build.gradle
index ee19aa3..a12fdb1 100755
--- a/baseandroid-eventdispatcher/build.gradle
+++ b/baseandroid-eventdispatcher/build.gradle
@@ -7,26 +7,23 @@ buildscript {
             maven { url 'https://oss.jfrog.org/libs-snapshot' }
             maven { url 'https://dl.bintray.com/sysdata/maven' }
         }
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 def libName = 'baseandroid-eventdispatcher'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode libVersionCode
         versionName libVersionName
     }
@@ -42,8 +39,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.7
-        sourceCompatibility 1.7
+        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_7
     }
     lintOptions {
         abortOnError false
@@ -54,28 +51,25 @@ dependencies {
 
     def adapterVersionName = project.ext.libVersionName
 
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'
     //log
-    compile 'org.slf4j:slf4j-api:1.7.12'
-    compile 'com.github.tony19:logback-android-core:1.1.1-4'
-    compile 'com.github.tony19:logback-android-classic:1.1.1-4'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'com.github.tony19:logback-android-core:1.1.1-6'
+    implementation 'com.github.tony19:logback-android-classic:1.1.1-6'
     // otto
-    compile 'com.squareup:otto:1.3.8'
-
+    implementation 'com.squareup:otto:1.3.8'
     // BusAdapter
-    compile "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
-
+    implementation "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
     // rxJava
-    compile 'io.reactivex:rxandroid:1.1.0'
+    implementation 'io.reactivex:rxandroid:1.2.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    compile 'io.reactivex:rxjava:1.1.3'
+    implementation 'io.reactivex:rxjava:1.3.8'
 }
 
 // pubblicazione maven
-if(project.rootProject.file('local.properties').exists()) {
+if (project.rootProject.file('local.properties').exists()) {
     Properties properties = new Properties()
     properties.load(project.rootProject.file('local.properties').newDataInputStream())
     ext {
diff --git a/baseandroid-eventdispatcher/publishBintray.gradle b/baseandroid-eventdispatcher/publishBintray.gradle
index ec231ea..e9d21ce 100755
--- a/baseandroid-eventdispatcher/publishBintray.gradle
+++ b/baseandroid-eventdispatcher/publishBintray.gradle
@@ -1,19 +1,16 @@
 buildscript {
     repositories {
+        google()
         jcenter()
-        mavenCentral()
-        maven { url 'https://oss.jfrog.org/libs-snapshot' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 ext {
     libraryDescription = ''
@@ -71,6 +68,7 @@ install {
 
 //apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven'
 
 version = libraryVersion
 
diff --git a/baseandroid-eventdispatcher/src/androidTest/java/it/sysdata/eventdispatcher/ApplicationTest.java b/baseandroid-eventdispatcher/src/androidTest/java/it/sysdata/eventdispatcher/ApplicationTest.java
deleted file mode 100755
index 85a6646..0000000
--- a/baseandroid-eventdispatcher/src/androidTest/java/it/sysdata/eventdispatcher/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package it.sysdata.eventdispatcher;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-	public ApplicationTest() {
-		super(Application.class);
-	}
-}
\ No newline at end of file
diff --git a/baseandroid-eventdispatcher/src/main/AndroidManifest.xml b/baseandroid-eventdispatcher/src/main/AndroidManifest.xml
index 2e992c4..c4af031 100755
--- a/baseandroid-eventdispatcher/src/main/AndroidManifest.xml
+++ b/baseandroid-eventdispatcher/src/main/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.baseandroid.eventdispatcher">
+    package="com.baseandroid.eventdispatcher">
 
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-        >
+    <application
+        android:label="@string/app_name"
+        android:supportsRtl="true">
 
     </application>
 
diff --git a/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/MainThreadBus.java b/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/MainThreadBus.java
index 40e4be4..bdea52e 100755
--- a/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/MainThreadBus.java
+++ b/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/MainThreadBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,12 @@ public void post(final Object event) {
         if (Looper.myLooper() == Looper.getMainLooper()) {
             super.post(event);
         } else {
-            mHandler.post(() -> MainThreadBus.super.post(event));
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    MainThreadBus.super.post(event);
+                }
+            });
         }
     }
 }
diff --git a/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/OttoEventProcessor.java b/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/OttoEventProcessor.java
index d80e5b9..37f009b 100755
--- a/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/OttoEventProcessor.java
+++ b/baseandroid-eventdispatcher/src/main/java/com/baseandroid/events/otto/OttoEventProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import java.util.concurrent.TimeUnit;
 
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -138,25 +139,29 @@ private static void startEventsConsumption() {
          * This Observable (Observable.interval) cycles every EVENT_CONSUMPTION_INTERVAL millis
          * we observe results on a new Thread and remove items from non-UI queues
          */
-        rx.Observable.interval(EVENT_CONSUMPTION_INTERVAL, TimeUnit.MILLISECONDS).onBackpressureBuffer().subscribeOn(Schedulers.newThread()).observeOn(Schedulers.newThread()).subscribe(aLong1 -> {
-            if (!mNetworkEvents.isEmpty()) {
-                Object ev = mNetworkEvents.remove(0);
-                logEvent(ev, false);
-                BUS.post(ev);
-            } else if (!mDataEvents.isEmpty()) {
-                Object ev = mDataEvents.remove(0);
-                logEvent(ev, false);
-                BUS.post(ev);
-            } else if (!mGenericEvents.isEmpty()) {
-                Object ev = mGenericEvents.remove(0);
-                logEvent(ev, false);
-                BUS.post(ev);
-            } else if (!mContextEvents.isEmpty()) {
-                Object ev = mContextEvents.remove(0);
-                logEvent(ev, false);
-                BUS.post(ev);
-            }
-        });
+        rx.Observable.interval(EVENT_CONSUMPTION_INTERVAL, TimeUnit.MILLISECONDS).onBackpressureBuffer().subscribeOn(Schedulers.newThread()).observeOn(Schedulers.newThread()).subscribe(
+                new Action1<Long>() {
+                    @Override
+                    public void call(Long aLong1) {
+                        if (!mNetworkEvents.isEmpty()) {
+                            Object ev = mNetworkEvents.remove(0);
+                            logEvent(ev, false);
+                            BUS.post(ev);
+                        } else if (!mDataEvents.isEmpty()) {
+                            Object ev = mDataEvents.remove(0);
+                            logEvent(ev, false);
+                            BUS.post(ev);
+                        } else if (!mGenericEvents.isEmpty()) {
+                            Object ev = mGenericEvents.remove(0);
+                            logEvent(ev, false);
+                            BUS.post(ev);
+                        } else if (!mContextEvents.isEmpty()) {
+                            Object ev = mContextEvents.remove(0);
+                            logEvent(ev, false);
+                            BUS.post(ev);
+                        }
+                    }
+                });
 
         /*
          * This Observable (Observable.interval) cycles every EVENT_CONSUMPTION_INTERVAL millis
@@ -166,11 +171,14 @@ private static void startEventsConsumption() {
                 .onBackpressureBuffer()
                 .subscribeOn(Schedulers.newThread())
                 .observeOn(AndroidSchedulers.mainThread())//UI Events must be posted on the Main Thread
-                .subscribe(aLong -> {
-                    if (!mUIEvents.isEmpty()) {
-                        Object ev = mUIEvents.remove(0);
-                        logEvent(ev, true);
-                        UI_BUS.post(ev);
+                .subscribe(new Action1<Long>() {
+                    @Override
+                    public void call(Long aLong) {
+                        if (!mUIEvents.isEmpty()) {
+                            Object ev = mUIEvents.remove(0);
+                            logEvent(ev, true);
+                            UI_BUS.post(ev);
+                        }
                     }
                 });
     }
diff --git a/baseandroid-eventdispatcher/src/main/res/values/strings.xml b/baseandroid-eventdispatcher/src/main/res/values/strings.xml
index e7bbafc..d65fef7 100755
--- a/baseandroid-eventdispatcher/src/main/res/values/strings.xml
+++ b/baseandroid-eventdispatcher/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/baseandroid-eventdispatcher/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java b/baseandroid-eventdispatcher/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java
deleted file mode 100755
index 4aba6d6..0000000
--- a/baseandroid-eventdispatcher/src/test/java/it/sysdata/eventdispatcher/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package it.sysdata.eventdispatcher;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-	@Test
-	public void addition_isCorrect() throws Exception {
-		assertEquals(4, 2 + 2);
-	}
-}
\ No newline at end of file
diff --git a/baseandroid-logadapter/build.gradle b/baseandroid-logadapter/build.gradle
index a01fb01..e5c13c4 100755
--- a/baseandroid-logadapter/build.gradle
+++ b/baseandroid-logadapter/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -19,7 +18,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13'
 }
diff --git a/baseandroid-rxeventdispatcher/build.gradle b/baseandroid-rxeventdispatcher/build.gradle
index ae5b0ac..bf9a4e1 100755
--- a/baseandroid-rxeventdispatcher/build.gradle
+++ b/baseandroid-rxeventdispatcher/build.gradle
@@ -7,26 +7,23 @@ buildscript {
             maven { url "https://plugins.gradle.org/m2/" }
             maven { url 'https://oss.jfrog.org/libs-snapshot' }
         }
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 def libName = 'baseandroid-rxeventdispatcher'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode libVersionCode
         versionName libVersionName
     }
@@ -49,21 +46,20 @@ android {
 dependencies {
     def adapterVersionName = project.ext.libVersionName
 
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.13'
     // BusAdapter
-    // compile project(path: ':baseandroid-busadapter')
-    compile "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
+    // implementation project(path: ':baseandroid-busadapter')
+    implementation "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
     // rxJava
-    compile 'io.reactivex:rxandroid:1.1.0'
+    implementation 'io.reactivex:rxandroid:1.2.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    compile 'io.reactivex:rxjava:1.1.3'
+    implementation 'io.reactivex:rxjava:1.3.8'
 }
 
 // pubblicazione maven
-if(project.rootProject.file('local.properties').exists()) {
+if (project.rootProject.file('local.properties').exists()) {
     Properties properties = new Properties()
     properties.load(project.rootProject.file('local.properties').newDataInputStream())
     ext {
diff --git a/baseandroid-rxeventdispatcher/publishBintray.gradle b/baseandroid-rxeventdispatcher/publishBintray.gradle
new file mode 100644
index 0000000..e9d21ce
--- /dev/null
+++ b/baseandroid-rxeventdispatcher/publishBintray.gradle
@@ -0,0 +1,123 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+ext {
+    libraryDescription = ''
+    siteUrl = ''
+    gitUrl = ''
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+
+                }
+            }
+        }
+    }
+}
+
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven'
+
+version = libraryVersion
+
+task sourcesJar(type: Jar) {
+//    dependsOn = ['test', 'connectedAndroidTest']
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+//    source = android.sourceSets.main.java.srcDirs
+//    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+// Bintray
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        desc = libraryDescription
+        userOrg = bintrayOrganization
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+        publicDownloadNumbers = true
+        version {
+            desc = libraryDescription
+            gpg {
+                sign = true //Determines whether to GPG sign the files. The default is false
+                passphrase = properties.getProperty("bintray.gpg.password")
+                //Optional. The passphrase for GPG signing'
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher/src/androidTest/java/com/example/baseandroid_rxbus/ApplicationTest.java b/baseandroid-rxeventdispatcher/src/androidTest/java/com/example/baseandroid_rxbus/ApplicationTest.java
deleted file mode 100755
index 68c77f1..0000000
--- a/baseandroid-rxeventdispatcher/src/androidTest/java/com/example/baseandroid_rxbus/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.baseandroid_rxbus;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher/src/main/AndroidManifest.xml b/baseandroid-rxeventdispatcher/src/main/AndroidManifest.xml
index dac7fe1..5761834 100755
--- a/baseandroid-rxeventdispatcher/src/main/AndroidManifest.xml
+++ b/baseandroid-rxeventdispatcher/src/main/AndroidManifest.xml
@@ -1,10 +1,9 @@
-<manifest package="com.example.baseandroid_rxbus"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.baseandroid_rxbus">
 
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-    >
+    <application
+        android:label="@string/app_name"
+        android:supportsRtl="true">
 
     </application>
 
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxBus.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxBus.java
index 89587f6..955d8c3 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxBus.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxBus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxEventProcessor.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxEventProcessor.java
index 32eaa9c..f396fc0 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxEventProcessor.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/RxEventProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 import java.util.WeakHashMap;
 
 import rx.Observer;
-import rx.schedulers.Schedulers;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * Class managing the events used throughout the application using {@link RxBus} classes.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxAnnotatedHandlerFinder.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxAnnotatedHandlerFinder.java
index 23d3ddf..bb2ab57 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxAnnotatedHandlerFinder.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxAnnotatedHandlerFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventHandler.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventHandler.java
index 2a2578e..3c21930 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventHandler.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventProducer.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventProducer.java
index 63c8fac..d248fc2 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventProducer.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxEventProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxProduce.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxProduce.java
index d1c4d39..f216304 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxProduce.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxProduce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxSubscribe.java b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxSubscribe.java
index 0830e0c..1a7e912 100755
--- a/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxSubscribe.java
+++ b/baseandroid-rxeventdispatcher/src/main/java/com/baseandroid/events/rx/annotations/RxSubscribe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Sysdata Digital, S.r.l.
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/main/res/values/strings.xml b/baseandroid-rxeventdispatcher/src/main/res/values/strings.xml
index 4f73d8e..966d8f1 100755
--- a/baseandroid-rxeventdispatcher/src/main/res/values/strings.xml
+++ b/baseandroid-rxeventdispatcher/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Sysdata Digital, S.r.l.
+  ~ Copyright (C) 2020 Sysdata Digital, S.r.l.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/baseandroid-rxeventdispatcher/src/test/java/com/example/baseandroid_rxbus/ExampleUnitTest.java b/baseandroid-rxeventdispatcher/src/test/java/com/example/baseandroid_rxbus/ExampleUnitTest.java
deleted file mode 100755
index e20b3ac..0000000
--- a/baseandroid-rxeventdispatcher/src/test/java/com/example/baseandroid_rxbus/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.baseandroid_rxbus;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher2/.gitignore b/baseandroid-rxeventdispatcher2/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/baseandroid-rxeventdispatcher2/build.gradle b/baseandroid-rxeventdispatcher2/build.gradle
new file mode 100644
index 0000000..296311c
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/build.gradle
@@ -0,0 +1,86 @@
+apply plugin: 'com.android.library'
+
+buildscript {
+    dependencies {
+        repositories {
+            mavenCentral()
+            maven { url 'https://dl.bintray.com/sysdata/maven' }
+            // serve per org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1
+            maven { url "https://plugins.gradle.org/m2/" }
+            maven { url 'https://oss.jfrog.org/libs-snapshot' }
+        }
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+def libName = 'baseandroid-rxeventdispatcher2'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode libVersionCode
+        versionName libVersionName
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    lintOptions {
+        abortOnError false
+    }
+
+}
+
+dependencies {
+    def adapterVersionName = project.ext.libVersionName
+
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.13'
+    // BusAdapter
+    // implementation project(path: ':baseandroid-busadapter')
+    implementation "com.baseandroid:baseandroid-busadapter:$adapterVersionName"
+    // rxJava
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    // Because RxAndroid releases are few and far between, it is recommended you also
+    // explicitly depend on RxJava's latest version for bug fixes and new features.
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
+}
+
+// pubblicazione maven
+if (project.rootProject.file('local.properties').exists()) {
+    Properties properties = new Properties()
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+    ext {
+        // GROUP_ID
+        publishedGroupId = 'com.baseandroid'
+        // ARTIFACT_ID
+        artifact = libName
+        // VERSION_ID
+        libraryVersion = libVersionName
+
+        developerId = properties.getProperty("bintray.developer.id")
+        developerName = properties.getProperty("bintray.developer.name")
+        developerEmail = properties.getProperty("bintray.developer.email")
+
+        bintrayRepo = 'maven'
+        bintrayName = 'baseandroid-rxeventdispatcher2'
+        libraryName = 'baseandroid-rxeventdispatcher2'
+        bintrayOrganization = 'sysdata'
+    }
+
+    apply from: 'publishBintray.gradle'
+}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher2/proguard-rules.pro b/baseandroid-rxeventdispatcher2/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/baseandroid-rxeventdispatcher2/publishBintray.gradle b/baseandroid-rxeventdispatcher2/publishBintray.gradle
new file mode 100644
index 0000000..e9d21ce
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/publishBintray.gradle
@@ -0,0 +1,123 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+ext {
+    libraryDescription = ''
+    siteUrl = ''
+    gitUrl = ''
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = publishedGroupId                               // Maven Group ID for the artifact
+
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                groupId publishedGroupId
+                artifactId artifact
+
+                // Add your description here
+                name libraryName
+                description libraryDescription
+                url siteUrl
+
+                // Set your license
+                licenses {
+                    license {
+                        name licenseName
+                        url licenseUrl
+                    }
+                }
+                developers {
+                    developer {
+                        id developerId
+                        name developerName
+                        email developerEmail
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+
+                }
+            }
+        }
+    }
+}
+
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven'
+
+version = libraryVersion
+
+task sourcesJar(type: Jar) {
+//    dependsOn = ['test', 'connectedAndroidTest']
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+//    source = android.sourceSets.main.java.srcDirs
+//    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+// Bintray
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        desc = libraryDescription
+        userOrg = bintrayOrganization
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+        publicDownloadNumbers = true
+        version {
+            desc = libraryDescription
+            gpg {
+                sign = true //Determines whether to GPG sign the files. The default is false
+                passphrase = properties.getProperty("bintray.gpg.password")
+                //Optional. The passphrase for GPG signing'
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher2/src/main/AndroidManifest.xml b/baseandroid-rxeventdispatcher2/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..f6eb0b5
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.baseandroid.events.rx2" />
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxBus.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxBus.java
new file mode 100644
index 0000000..c1c425c
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxBus.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2;
+
+import com.baseandroid.events.rx2.annotations.RxAnnotatedHandlerFinder;
+
+import org.reactivestreams.Subscription;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Observer;
+import io.reactivex.Scheduler;
+import io.reactivex.annotations.Nullable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.internal.util.AppendOnlyLinkedArrayList;
+import io.reactivex.internal.util.NotificationLite;
+import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subjects.ReplaySubject;
+import io.reactivex.subjects.Subject;
+
+/**
+ * This class implements the Event Bus pattern using RxJava2 {@link Subject}.
+ * The subject serialize a wrapped subject, the wrapped object depends on constructor called.
+ *
+ * @author Andrea Guitto
+ */
+public class RxBus<T> extends Subject<T> implements AppendOnlyLinkedArrayList.NonThrowingPredicate<Object> {
+
+    /**
+     * The actual subscriber to serialize Subscriber calls to.
+     */
+    final Subject<T> actual;
+    /**
+     * This map handle the subscriptions list, keys contains {@link Observer}, values contains {@link Subscription}
+     */
+    private final Map<Observer, Disposable> mSubscriptionsList;
+    /**
+     * Indicates an emission is going on, guarded by this.
+     */
+    boolean emitting;
+    /**
+     * If not null, it holds the missed NotificationLite events.
+     */
+    AppendOnlyLinkedArrayList<Object> queue;
+    /**
+     * Indicates a terminal event has been received and all further events will be dropped.
+     */
+    volatile boolean done;
+
+    /**
+     * With this constructor the {@link RxBus} use a {@link PublishSubject} and instantiate it calling the static method {@code PublishSubject.create()}
+     *
+     * @see PublishSubject
+     */
+    public RxBus() {
+        actual = (Subject<T>) PublishSubject.create().toSerialized();
+        mSubscriptionsList = new WeakHashMap<>();
+    }
+
+    /**
+     * With this constructor the {@link RxBus} use a {@link ReplaySubject} and instantiate it calling the static method {@code ReplaySubject.createWithSize(cacheSize)}
+     *
+     * @param cacheSize numbers of max events retained
+     * @see ReplaySubject
+     */
+    public RxBus(int cacheSize) {
+        actual = (Subject<T>) ReplaySubject.createWithSize(cacheSize).toSerialized();
+        mSubscriptionsList = new WeakHashMap<>();
+    }
+
+    /**
+     * With this constructor the {@link RxBus} use a {@link ReplaySubject} and instantiate it calling the static method  {@code ReplaySubject.createWithTime(retainTime, timeUnit, scheduler)}
+     *
+     * @param retainTime events retain time, passed to {@link ReplaySubject}
+     * @param timeUnit events retain time unit, passed to {@link ReplaySubject}
+     * @param scheduler events retain time scheduler, passed to {@link ReplaySubject}
+     * @see ReplaySubject
+     */
+    public RxBus(int retainTime, TimeUnit timeUnit, Scheduler scheduler) {
+        actual = (Subject<T>) ReplaySubject.createWithTime(retainTime, timeUnit, scheduler).toSerialized();
+        mSubscriptionsList = new WeakHashMap<>();
+    }
+
+    /**
+     * This method is used to register an {@link Observer} to this bus.
+     * Here is called the {@code subscribe()} to subject
+     *
+     * @param o
+     * @return
+     */
+    public synchronized void register(RxEventProcessor.ObserverWrapper o) {
+        if (o != null) {
+            subscribe(o);
+            mSubscriptionsList.put(o, o.getDisposable());
+        }
+    }
+
+    /**
+     * This method is used to unregister an {@link Observer} from this bus
+     * Here is called the {@code unsubscribe()}
+     *
+     * @param o
+     * @return
+     */
+    public synchronized void unregister(Observer o) {
+        if (o != null) {
+            if (mSubscriptionsList.containsKey(o)) {
+                Disposable subscription = mSubscriptionsList.get(o);
+                if (subscription != null) {
+                    subscription.dispose();
+                    mSubscriptionsList.remove(o);
+                }
+            }
+            RxAnnotatedHandlerFinder.clearResources(o);
+        }
+    }
+
+    /**
+     * This method post events on bus, it use {@code onNext(ev)} method of subject
+     *
+     * @param ev
+     */
+    public synchronized void post(T ev) {
+        onNext(ev);
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        actual.subscribe(observer);
+    }
+
+    @Override
+    public void onSubscribe(Disposable d) {
+        boolean cancel;
+        if (!done) {
+            synchronized (this) {
+                if (done) {
+                    cancel = true;
+                } else {
+                    if (emitting) {
+                        AppendOnlyLinkedArrayList<Object> q = queue;
+                        if (q == null) {
+                            q = new AppendOnlyLinkedArrayList<Object>(4);
+                            queue = q;
+                        }
+                        q.add(NotificationLite.disposable(d));
+                        return;
+                    }
+                    emitting = true;
+                    cancel = false;
+                }
+            }
+        } else {
+            cancel = true;
+        }
+        if (cancel) {
+            d.dispose();
+        } else {
+            actual.onSubscribe(d);
+            emitLoop();
+        }
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (done) {
+            return;
+        }
+        synchronized (this) {
+            if (done) {
+                return;
+            }
+            if (emitting) {
+                AppendOnlyLinkedArrayList<Object> q = queue;
+                if (q == null) {
+                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    queue = q;
+                }
+                q.add(NotificationLite.next(t));
+                return;
+            }
+            emitting = true;
+        }
+        actual.onNext(t);
+        emitLoop();
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        if (done) {
+            RxJavaPlugins.onError(t);
+            return;
+        }
+        boolean reportError;
+        synchronized (this) {
+            if (done) {
+                reportError = true;
+            } else {
+                done = true;
+                if (emitting) {
+                    AppendOnlyLinkedArrayList<Object> q = queue;
+                    if (q == null) {
+                        q = new AppendOnlyLinkedArrayList<Object>(4);
+                        queue = q;
+                    }
+                    q.setFirst(NotificationLite.error(t));
+                    return;
+                }
+                reportError = false;
+                emitting = true;
+            }
+        }
+        if (reportError) {
+            RxJavaPlugins.onError(t);
+            return;
+        }
+        actual.onError(t);
+    }
+
+    @Override
+    public void onComplete() {
+        if (done) {
+            return;
+        }
+        synchronized (this) {
+            if (done) {
+                return;
+            }
+            done = true;
+            if (emitting) {
+                AppendOnlyLinkedArrayList<Object> q = queue;
+                if (q == null) {
+                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    queue = q;
+                }
+                q.add(NotificationLite.complete());
+                return;
+            }
+            emitting = true;
+        }
+        actual.onComplete();
+    }
+
+    /**
+     * Loops until all notifications in the queue has been processed.
+     */
+    void emitLoop() {
+        for (; ; ) {
+            AppendOnlyLinkedArrayList<Object> q;
+            synchronized (this) {
+                q = queue;
+                if (q == null) {
+                    emitting = false;
+                    return;
+                }
+                queue = null;
+            }
+            q.forEachWhile(this);
+        }
+    }
+
+    @Override
+    public boolean test(Object o) {
+        return NotificationLite.acceptFull(o, actual);
+    }
+
+    @Override
+    public boolean hasObservers() {
+        return actual.hasObservers();
+    }
+
+    @Override
+    public boolean hasThrowable() {
+        return actual.hasThrowable();
+    }
+
+    @Override
+    @Nullable
+    public Throwable getThrowable() {
+        return actual.getThrowable();
+    }
+
+    @Override
+    public boolean hasComplete() {
+        return actual.hasComplete();
+    }
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxEventProcessor.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxEventProcessor.java
new file mode 100644
index 0000000..d9d46aa
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/RxEventProcessor.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2;
+
+import android.util.Log;
+
+import com.baseandroid.events.Event;
+import com.baseandroid.events.EventProcessor;
+import com.baseandroid.events.rx2.annotations.RxAnnotatedHandlerFinder;
+
+import java.lang.ref.WeakReference;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.WeakHashMap;
+
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Class managing the events used throughout the application using {@link RxBus} classes.
+ * <br>
+ * <ul>
+ * <li>{@link #BUS}: a Bus working on a thread separated by the Android Main Thread</li>
+ * <li>{@link #UI_BUS}: a Bus working on the Android Main Thread</li>
+ * </ul>
+ * <br>
+ * <br>
+ * Events are emitted to all subscribers and maintains time sequence.
+ * <br>
+ *
+ * @author Andrea Guitto
+ */
+public final class RxEventProcessor implements EventProcessor {
+
+    private static final String LOG_TAG = RxEventProcessor.class.getSimpleName();
+    private static boolean verbose;
+    /**
+     * This Map contains in keys some autogenerate String and used to identify a subscriber, in values some timestamps.
+     * These timestamps values are generated when a subscriber call the method {@code EventDispatcher.savePoint(...)}.
+     */
+    private final Map<String, Long> mSavePoints = new HashMap<>();
+    /**
+     * Bus working on a thread separated by the Android Main Thread
+     */
+
+    private final RxBus BUS = new RxBus();
+    /**
+     * Bus working on the Android Main Thread
+     */
+    private final RxBus UI_BUS = new RxBus(10);
+    /**
+     * This map contains in keys the objects registered to all Bus, in value the wrapper of object with {@link Observer} interface
+     */
+    private final Map<Object, ObserverWrapper> wrapperCache = new WeakHashMap();
+
+    private RxEventProcessor() {
+        // No instances.
+        BUS.observeOn(Schedulers.newThread()).subscribeOn(Schedulers.newThread()).toFlowable(BackpressureStrategy.BUFFER).onBackpressureBuffer();
+        UI_BUS.observeOn(Schedulers.newThread()).subscribeOn(AndroidSchedulers.mainThread()).toFlowable(BackpressureStrategy.BUFFER).onBackpressureBuffer();
+    }
+
+    /**
+     * Convenience method used for debugging purposes. It will log what kind of event is being posted on what Bus.
+     *
+     * @param ev The event being posted
+     * @param uiEvent whether it's a UI event or not.
+     */
+    private static void logEvent(Object ev, boolean uiEvent) {
+        String bus;
+        if (uiEvent) {
+            bus = "UI_BUS";
+        } else {
+            bus = "BUS";
+        }
+        if (verbose) {
+            Log.i(LOG_TAG, "posting " + ev.getClass().getSimpleName() + " of type " + ev.getClass().getAnnotation(Event.class).type() + " on " + bus);
+        }
+    }
+
+    public static EventProcessor newInstance() {
+        return new RxEventProcessor();
+    }
+
+    /**
+     * This method is used to call the event on listener, it use reflection to know what method call on listener object.
+     *
+     * @param listener
+     * @param event
+     */
+    private static void handleEvent(Object listener, Object event) {
+        RxAnnotatedHandlerFinder.handleEvent(listener, event);
+    }
+
+    /**
+     * It will retrieve an {@link ObserverWrapper} of the object passed by parameter
+     * This method store the wrapper inside an internal cache.
+     * It should be used in pair with {@code RxEventProcessor.removeWrapper(...)}
+     *
+     * @param o
+     * @return
+     */
+    private ObserverWrapper getWrapper(Object o) {
+        if (!wrapperCache.containsKey(o)) {
+            wrapperCache.put(o, new ObserverWrapper(o));
+        }
+        return wrapperCache.get(o);
+    }
+
+    /**
+     * It will remove the {@link ObserverWrapper} of the object passed by parameter
+     * This method return {@link ObserverWrapper} removed from cache
+     *
+     * @param o
+     * @return
+     */
+    private ObserverWrapper removeWrapper(Object o) {
+        return wrapperCache.remove(o);
+    }
+
+    /**
+     * This method is used to make a current timestamp
+     *
+     * @return
+     */
+    private long makeTimestamp() {
+        return new Date().getTime();
+    }
+
+    @Override
+    public void onRegister(Object o) {
+        if (o != null) {
+            ObserverWrapper observerWrapper = getWrapper(o);
+            if (observerWrapper.mSavedTimestamp <= 0) {
+                observerWrapper.mSavedTimestamp = makeTimestamp();
+            }
+            BUS.register(observerWrapper);
+            UI_BUS.register(observerWrapper);
+        }
+    }
+
+    @Override
+    public void onUnregister(Object o) {
+        if (o != null) {
+            ObserverWrapper removedObject = removeWrapper(o);
+            if (removedObject != null) {
+                BUS.unregister(removedObject);
+                UI_BUS.unregister(removedObject);
+                removedObject.clear();
+            }
+        }
+    }
+
+    @Override
+    public void onPost(Object o) {
+        if (verbose) {
+            Log.i(LOG_TAG, "received new object to post: " + o.getClass().getSimpleName());
+        }
+        //check if it's an event we recognise
+        if (o != null && o.getClass().isAnnotationPresent(Event.class)) {
+            //put it in the right list and sort the list
+            Event.Type t = o.getClass().getAnnotation(Event.class).type();
+            if (verbose) {
+                Log.i(LOG_TAG, "object " + o.getClass().getSimpleName() + " is an event of type " + t);
+            }
+            switch (t) {
+                case UI:
+                    UI_BUS.post(new ObservedEvent(o, makeTimestamp(), t));
+                    break;
+                default:
+                    BUS.post(new ObservedEvent(o, makeTimestamp(), t));
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public String onSavePoint(Object object) {
+        String key = null;
+        // creating a key based on timestamp + class name + hashcode + random number
+        if (object != null) {
+            // creating timestamp
+            long timestamp = makeTimestamp();
+            // creating prefix of the string with class name and objecthashcode
+            String prefix = object.getClass().getName() + "$" + object.hashCode();
+            // creating a random number
+            long LOWER_RANGE = 0; //assign lower range value
+            long UPPER_RANGE = 1000000; //assign upper range value
+            Random random = new Random();
+            long randomSeed = LOWER_RANGE + (long) (random.nextDouble() * (UPPER_RANGE - LOWER_RANGE));
+
+            // assembling the final key
+            key = prefix + randomSeed + timestamp;
+            mSavePoints.put(key, new Date().getTime());
+        }
+        return key;
+    }
+
+    @Override
+    public void onLoadPoint(Object object, String key) {
+        if (object != null && key != null && !key.isEmpty()) {
+            // retrieve the saved timestamp based on the key
+            Long timestamp = mSavePoints.get(key);
+            // save it inside the wrapper
+            ObserverWrapper wrapper = getWrapper(object);
+            if (wrapper != null && timestamp != null) {
+                wrapper.mSavedTimestamp = timestamp;
+            }
+        }
+    }
+
+    public void setVerbose(boolean verbose) {
+        RxEventProcessor.verbose = verbose;
+    }
+
+    /**
+     * This class is used to wrap an object annotated with {@link Event} annotation.
+     * This wrapper app information about the save point used with {@code EventDispatcher.savePoint} and {@code EventDispatcher.loadPoint}
+     */
+    private static final class ObservedEvent {
+        /**
+         * The reference of the event
+         */
+        private final WeakReference mEvent;
+        /**
+         * When the event was posted
+         */
+        private final long mEventPostTimestamp;
+        /**
+         * The {@link Event.Type} of the event
+         */
+        private final Event.Type mEventType;
+
+        /**
+         * This method is used to instantiate a new {@link ObservedEvent}
+         *
+         * @param event the wrapped event
+         * @param eventPostTimestamp The timestamp of when the event was posted
+         * @param eventType the wrapped event type
+         */
+        public ObservedEvent(Object event, long eventPostTimestamp, Event.Type eventType) {
+            this.mEvent = new WeakReference(event);
+            this.mEventPostTimestamp = eventPostTimestamp;
+            this.mEventType = eventType;
+        }
+    }
+
+    /**
+     * This class is used to wrap bus subscribers and make them compatible with {@link Observer} interface
+     */
+    static final class ObserverWrapper implements Observer {
+
+        /**
+         * The reference of the subscriber
+         */
+        private final WeakReference mWrapped;
+        /**
+         * The timestamp saved by method {@code EventDispatcher.savePoint}
+         */
+        private long mSavedTimestamp;
+        /**
+         * A reference of the disposable
+         */
+        private Disposable mDisposable;
+
+        public ObserverWrapper(Object wrapped) {
+            mWrapped = new WeakReference(wrapped);
+        }
+
+        @Override
+        public void onError(Throwable e) {
+
+        }
+
+        @Override
+        public void onComplete() {
+
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            this.mDisposable = d;
+        }
+
+        @Override
+        public void onNext(Object event) {
+            if (mWrapped != null) {
+                Object wrappedRefObject = mWrapped.get();
+                if (wrappedRefObject != null && event instanceof ObservedEvent) {
+                    ObservedEvent observedEvent = (ObservedEvent) event;
+                    boolean shouldHandleEvent = true;
+
+                    // manage timestamp of ObservedEvent
+                    long eventTimestamp = observedEvent.mEventPostTimestamp;
+                    Object eventToHandle = observedEvent.mEvent.get();
+                    Event.Type eventType = observedEvent.mEventType;
+
+                    // if the event post timestamp is before the last saved timestamp of the subscriber
+                    // we don't emit it, cause the event was already catched by the subscriber
+                    if (mSavedTimestamp > 0) {
+                        shouldHandleEvent = eventTimestamp >= mSavedTimestamp;
+                    }
+
+                    if (shouldHandleEvent && eventToHandle != null) {
+                        RxEventProcessor.logEvent(eventToHandle, eventType == Event.Type.UI);
+                        RxEventProcessor.handleEvent(wrappedRefObject, eventToHandle);
+                    }
+                }
+            }
+        }
+
+        public void clear() {
+            if (mWrapped != null) {
+                mWrapped.clear();
+            }
+        }
+
+        public Disposable getDisposable() {
+            return mDisposable;
+        }
+
+        public void setDisposable(Disposable disposable) {
+            mDisposable = disposable;
+        }
+    }
+}
\ No newline at end of file
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxAnnotatedHandlerFinder.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxAnnotatedHandlerFinder.java
new file mode 100644
index 0000000..e3fed29
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxAnnotatedHandlerFinder.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2.annotations;
+
+import android.util.Log;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Helper methods for finding methods annotated with {@link RxProduce} and {@link RxSubscribe}.
+ *
+ * @author Cliff Biffle
+ * @author Louis Wasserman
+ * @author Jake Wharton
+ * @author Andrea Guitto
+ */
+public final class RxAnnotatedHandlerFinder {
+
+    /**
+     * Cache event bus producer methods for each class.
+     */
+    private static final ConcurrentMap<Class<?>, Map<Class<?>, Method>> PRODUCERS_CACHE = new ConcurrentHashMap<Class<?>, Map<Class<?>, Method>>();
+
+    /**
+     * Cache event bus subscriber methods for each class.
+     */
+    private static final ConcurrentMap<Class<?>, Map<Class<?>, Set<Method>>> SUBSCRIBERS_CACHE = new ConcurrentHashMap<Class<?>, Map<Class<?>, Set<Method>>>();
+    private static final String LOG_TAG = RxAnnotatedHandlerFinder.class.getSimpleName();
+
+    private RxAnnotatedHandlerFinder() {
+        // No instances.
+    }
+
+    private static void loadAnnotatedProducerMethods(Class<?> listenerClass, Map<Class<?>, Method> producerMethods) {
+        Map<Class<?>, Set<Method>> subscriberMethods = new HashMap<Class<?>, Set<Method>>();
+        loadAnnotatedMethods(listenerClass, producerMethods, subscriberMethods);
+    }
+
+    private static void loadAnnotatedSubscriberMethods(Class<?> listenerClass, Map<Class<?>, Set<Method>> subscriberMethods) {
+        Map<Class<?>, Method> producerMethods = new HashMap<Class<?>, Method>();
+        loadAnnotatedMethods(listenerClass, producerMethods, subscriberMethods);
+    }
+
+    /**
+     * Load all methods annotated with {@link RxProduce} or {@link RxSubscribe} into their respective caches for the
+     * specified class.
+     */
+    private static void loadAnnotatedMethods(Class<?> listenerClass, Map<Class<?>, Method> producerMethods, Map<Class<?>, Set<Method>> subscriberMethods) {
+        for (Method method : listenerClass.getDeclaredMethods()) {
+            // The compiler sometimes creates synthetic bridge methods as part of the
+            // type erasure process. As of JDK8 these methods now include the same
+            // annotations as the original declarations. They should be ignored for
+            // subscribe/produce.
+            if (method.isBridge()) {
+                continue;
+            }
+            if (method.isAnnotationPresent(RxSubscribe.class)) {
+                Class<?>[] parameterTypes = method.getParameterTypes();
+                if (parameterTypes.length != 1) {
+                    throw new IllegalArgumentException(
+                            "Method " + method + " has @Subscribe annotation but requires " + parameterTypes.length + " arguments.  Methods must require a single argument.");
+                }
+
+                Class<?> eventType = parameterTypes[0];
+                if (eventType.isInterface()) {
+                    throw new IllegalArgumentException("Method " + method + " has @Subscribe annotation on " + eventType + " which is an interface.  Subscription must be on a concrete class type.");
+                }
+
+                if ((method.getModifiers() & Modifier.PUBLIC) == 0) {
+                    throw new IllegalArgumentException("Method " + method + " has @Subscribe annotation on " + eventType + " but is not 'public'.");
+                }
+
+                Set<Method> methods = subscriberMethods.get(eventType);
+                if (methods == null) {
+                    methods = new HashSet<Method>();
+                    subscriberMethods.put(eventType, methods);
+                }
+                methods.add(method);
+            } else if (method.isAnnotationPresent(RxProduce.class)) {
+                Class<?>[] parameterTypes = method.getParameterTypes();
+                if (parameterTypes.length != 0) {
+                    throw new IllegalArgumentException("Method " + method + "has @Produce annotation but requires " + parameterTypes.length + " arguments.  Methods must require zero arguments.");
+                }
+                if (method.getReturnType() == Void.class) {
+                    throw new IllegalArgumentException("Method " + method + " has a return type of void.  Must declare a non-void type.");
+                }
+
+                Class<?> eventType = method.getReturnType();
+                if (eventType.isInterface()) {
+                    throw new IllegalArgumentException("Method " + method + " has @Produce annotation on " + eventType + " which is an interface.  Producers must return a concrete class type.");
+                }
+                if (eventType.equals(Void.TYPE)) {
+                    throw new IllegalArgumentException("Method " + method + " has @Produce annotation but has no return type.");
+                }
+
+                if ((method.getModifiers() & Modifier.PUBLIC) == 0) {
+                    throw new IllegalArgumentException("Method " + method + " has @Produce annotation on " + eventType + " but is not 'public'.");
+                }
+
+                if (producerMethods.containsKey(eventType)) {
+                    throw new IllegalArgumentException("Producer for type " + eventType + " has already been registered.");
+                }
+                producerMethods.put(eventType, method);
+            }
+        }
+
+        PRODUCERS_CACHE.put(listenerClass, producerMethods);
+        SUBSCRIBERS_CACHE.put(listenerClass, subscriberMethods);
+    }
+
+    /**
+     * This implementation finds all methods marked with a {@link RxProduce} annotation.
+     */
+    static Map<Class<?>, RxEventProducer> findAllProducers(Object listener) {
+        final Class<?> listenerClass = listener.getClass();
+        Map<Class<?>, RxEventProducer> handlersInMethod = new HashMap<Class<?>, RxEventProducer>();
+
+        Map<Class<?>, Method> methods = PRODUCERS_CACHE.get(listenerClass);
+        if (null == methods) {
+            methods = new HashMap<Class<?>, Method>();
+            loadAnnotatedProducerMethods(listenerClass, methods);
+        }
+        if (!methods.isEmpty()) {
+            for (Map.Entry<Class<?>, Method> e : methods.entrySet()) {
+                RxEventProducer producer = new RxEventProducer(listener, e.getValue());
+                handlersInMethod.put(e.getKey(), producer);
+            }
+        }
+
+        return handlersInMethod;
+    }
+
+    /**
+     * This implementation finds all methods marked with a {@link RxSubscribe} annotation.
+     */
+    static Map<Class<?>, Set<RxEventHandler>> findAllSubscribers(Object listener) {
+        Class<?> listenerClass = listener.getClass();
+        Map<Class<?>, Set<RxEventHandler>> handlersInMethod = new HashMap<Class<?>, Set<RxEventHandler>>();
+
+        Map<Class<?>, Set<Method>> methods = SUBSCRIBERS_CACHE.get(listenerClass);
+        if (null == methods) {
+            methods = new HashMap<Class<?>, Set<Method>>();
+            loadAnnotatedSubscriberMethods(listenerClass, methods);
+        }
+        if (!methods.isEmpty()) {
+            for (Map.Entry<Class<?>, Set<Method>> e : methods.entrySet()) {
+                Set<RxEventHandler> handlers = new HashSet<RxEventHandler>();
+                for (Method m : e.getValue()) {
+                    handlers.add(new RxEventHandler(listener, m));
+                }
+                handlersInMethod.put(e.getKey(), handlers);
+            }
+        }
+
+        return handlersInMethod;
+    }
+
+    /**
+     * It will clear resources associated with listener and return reference count freed
+     *
+     * @param listener
+     * @return total objects removed
+     */
+    public static int clearResources(Object listener) {
+        Map<Class<?>, Set<Method>> subscribersCache = SUBSCRIBERS_CACHE.remove(listener);
+        Map<Class<?>, Method> producersCache = PRODUCERS_CACHE.remove(listener);
+
+        int subscribersRefCount = 0, producersRefCount = 0;
+        if (subscribersCache != null) {
+            subscribersRefCount = subscribersCache.size();
+        }
+        if (producersCache != null) {
+            producersRefCount = producersCache.size();
+        }
+        return subscribersRefCount + producersRefCount;
+    }
+
+    /**
+     * This method is used to call the event on listener, it use reflection to know what method call on listener object.
+     *
+     * @param listener
+     * @param event
+     */
+    public static void handleEvent(Object listener, Object event) {
+        Map<Class<?>, Set<RxEventHandler>> allSubscribers = RxAnnotatedHandlerFinder.findAllSubscribers(listener);
+
+        if (allSubscribers != null && !allSubscribers.isEmpty()) {
+            Set<RxEventHandler> rxEventHandlers = allSubscribers.get(event.getClass());
+            if (rxEventHandlers != null && !rxEventHandlers.isEmpty()) {
+                Iterator<RxEventHandler> iterator = rxEventHandlers.iterator();
+                while (iterator.hasNext()) {
+                    RxEventHandler handler = iterator.next();
+                    try {
+                        handler.handleEvent(event);
+                    } catch (InvocationTargetException e) {
+                        Log.e(LOG_TAG, Log.getStackTraceString(e.getCause()));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventHandler.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventHandler.java
new file mode 100644
index 0000000..8902e1a
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventHandler.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2.annotations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Wraps a single-argument 'handler' method on a specific object.
+ *
+ * <p>This class only verifies the suitability of the method and event type if something fails.  Callers are expected t
+ * verify their uses of this class.
+ *
+ * <p>Two EventHandlers are equivalent when they refer to the same method on the same object (not class).   This
+ * property is used to ensure that no handler method is registered more than once.
+ *
+ * @author Cliff Biffle
+ * @author Andrea Guitto
+ */
+class RxEventHandler {
+
+    /**
+     * Object sporting the handler method.
+     */
+    private final Object target;
+    /**
+     * Handler method.
+     */
+    private final Method method;
+    /**
+     * Object hash code.
+     */
+    private final int hashCode;
+    /**
+     * Should this handler receive events?
+     */
+    private boolean valid = true;
+
+    RxEventHandler(Object target, Method method) {
+        if (target == null) {
+            throw new NullPointerException("EventHandler target cannot be null.");
+        }
+        if (method == null) {
+            throw new NullPointerException("EventHandler method cannot be null.");
+        }
+
+        this.target = target;
+        this.method = method;
+        method.setAccessible(true);
+
+        // Compute hash code eagerly since we know it will be used frequently and we cannot estimate the runtime of the
+        // target's hashCode call.
+        final int prime = 31;
+        hashCode = (prime + method.hashCode()) * prime + target.hashCode();
+    }
+
+    public boolean isValid() {
+        return valid;
+    }
+
+    /**
+     * If invalidated, will subsequently refuse to handle events.
+     *
+     * Should be called when the wrapped object is unregistered from the Bus.
+     */
+    public void invalidate() {
+        valid = false;
+    }
+
+    /**
+     * Invokes the wrapped handler method to handle {@code event}.
+     *
+     * @param event event to handle
+     * @throws IllegalStateException if previously invalidated.
+     * @throws InvocationTargetException if the wrapped method throws any {@link Throwable} that is not
+     * an {@link Error} ({@code Error}s are propagated as-is).
+     */
+    public void handleEvent(Object event) throws InvocationTargetException {
+        if (!valid) {
+            throw new IllegalStateException(toString() + " has been invalidated and can no longer handle events.");
+        }
+        try {
+            method.invoke(target, event);
+        } catch (IllegalAccessException e) {
+            throw new AssertionError(e);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() instanceof Error) {
+                throw (Error) e.getCause();
+            }
+            throw e;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "[EventHandler " + method + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj == null) {
+            return false;
+        }
+
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+
+        final RxEventHandler other = (RxEventHandler) obj;
+
+        return method.equals(other.method) && target == other.target;
+    }
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventProducer.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventProducer.java
new file mode 100644
index 0000000..1995adb
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxEventProducer.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2.annotations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Wraps a 'producer' method on a specific object.
+ *
+ * <p> This class only verifies the suitability of the method and event type if something fails.  Callers are expected
+ * to verify their uses of this class.
+ *
+ * @author Jake Wharton
+ * @author Andrea Guitto
+ */
+class RxEventProducer {
+
+    /**
+     * Object sporting the producer method.
+     */
+    final Object target;
+    /**
+     * Producer method.
+     */
+    private final Method method;
+    /**
+     * Object hash code.
+     */
+    private final int hashCode;
+    /**
+     * Should this producer produce events?
+     */
+    private boolean valid = true;
+
+    RxEventProducer(Object target, Method method) {
+        if (target == null) {
+            throw new NullPointerException("EventProducer target cannot be null.");
+        }
+        if (method == null) {
+            throw new NullPointerException("EventProducer method cannot be null.");
+        }
+
+        this.target = target;
+        this.method = method;
+        method.setAccessible(true);
+
+        // Compute hash code eagerly since we know it will be used frequently and we cannot estimate the runtime of the
+        // target's hashCode call.
+        final int prime = 31;
+        hashCode = (prime + method.hashCode()) * prime + target.hashCode();
+    }
+
+    public boolean isValid() {
+        return valid;
+    }
+
+    /**
+     * If invalidated, will subsequently refuse to produce events.
+     *
+     * Should be called when the wrapped object is unregistered from the Bus.
+     */
+    public void invalidate() {
+        valid = false;
+    }
+
+    /**
+     * Invokes the wrapped producer method.
+     *
+     * @throws IllegalStateException if previously invalidated.
+     * @throws InvocationTargetException if the wrapped method throws any {@link Throwable} that is not
+     * an {@link Error} ({@code Error}s are propagated as-is).
+     */
+    public Object produceEvent() throws InvocationTargetException {
+        if (!valid) {
+            throw new IllegalStateException(toString() + " has been invalidated and can no longer produce events.");
+        }
+        try {
+            return method.invoke(target);
+        } catch (IllegalAccessException e) {
+            throw new AssertionError(e);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() instanceof Error) {
+                throw (Error) e.getCause();
+            }
+            throw e;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "[EventProducer " + method + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj == null) {
+            return false;
+        }
+
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+
+        final RxEventProducer other = (RxEventProducer) obj;
+
+        return method.equals(other.method) && target == other.target;
+    }
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxProduce.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxProduce.java
new file mode 100644
index 0000000..f9e41fb
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxProduce.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2.annotations;
+
+import com.baseandroid.events.rx2.RxBus;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a method as an instance producer, as used by {@link RxAnnotatedHandlerFinder} and {@link RxBus}.
+ * <p>
+ * Otto infers the instance type from the annotated method's return type. Producer methods may return null when there is
+ * no appropriate value to share. The calling {@link RxBus} ignores such returns and posts nothing.
+ *
+ * @author Andrea Guitto
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RxProduce {
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxSubscribe.java b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxSubscribe.java
new file mode 100644
index 0000000..021f793
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/java/com/baseandroid/events/rx2/annotations/RxSubscribe.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2020 Sysdata Digital, S.r.l.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.baseandroid.events.rx2.annotations;
+
+import com.baseandroid.events.rx2.RxBus;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a method as an event handler, as used by {@link RxAnnotatedHandlerFinder} and {@link RxBus}.
+ *
+ * <p>The method's first (and only) parameter defines the event type.
+ * <p>If this annotation is applied to methods with zero parameters or more than one parameter, the object containing
+ * the method will not be able to register for event delivery from the {@link RxBus}. Otto fails fast by throwing
+ * runtime exceptions in these cases.
+ *
+ * @author Andrea Guitto
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RxSubscribe {
+}
diff --git a/baseandroid-rxeventdispatcher2/src/main/res/values/strings.xml b/baseandroid-rxeventdispatcher2/src/main/res/values/strings.xml
new file mode 100644
index 0000000..1b81849
--- /dev/null
+++ b/baseandroid-rxeventdispatcher2/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">baseandroid-rxeventdispatcher2</string>
+</resources>
diff --git a/build.gradle b/build.gradle
index aa3df01..0039d58 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
         maven { url 'https://dl.bintray.com/sysdata/maven' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-
+        classpath 'com.android.tools.build:gradle:3.5.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven { url 'https://dl.bintray.com/sysdata/maven' }
     }
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # 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
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 27c1d7e..f6a629a 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 14 12:01:21 CEST 2016
+#Wed Jan 15 15:02:01 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/settings.gradle b/settings.gradle
index e40ada6..d5348b1 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':baseandroid-busadapter', ':baseandroid-eventdispatcher', ':baseandroid-rxeventdispatcher'
+include ':app', ':baseandroid-busadapter', ':baseandroid-eventdispatcher', ':baseandroid-rxeventdispatcher', ':baseandroid-rxeventdispatcher2'