From 7b35232b7e6c10cf11777c2fe833be58bc24da7e Mon Sep 17 00:00:00 2001
From: TrevJonez <trevorjones141@gmail.com>
Date: Fri, 22 Mar 2019 00:38:18 -0600
Subject: [PATCH 1/5] latest gradle. injection driven split provider to
 separate artifact.

---
 .idea/codeStyles/Project.xml                  |   7 +
 CHANGELOG.md                                  |   7 +
 README.md                                     |   2 +-
 app/build.gradle                              |  22 +++-
 app/src/main/AndroidManifest.xml              |   5 +-
 .../polyadapter/sample/data/DividerLine.kt    |   3 -
 .../java/polyadapter/sample/ActivityScope.kt  |   6 +
 app/src/main/java/polyadapter/sample/App.kt   |  10 ++
 .../java/polyadapter/sample/AppComponent.kt   |  15 +++
 .../sample/ArchitecturalThing.kt}             |  47 ++-----
 .../java/polyadapter/sample/SampleActivity.kt |  97 ++++++++++++++
 .../polyadapter/sample/SampleGlideModule.kt   |   2 +-
 .../polyadapter/sample/data/CategoryTitle.kt  |   2 +-
 .../polyadapter/sample/data/DividerLine.kt    |   3 +
 .../polyadapter/sample/data/Movie.kt          |   2 +-
 .../sample/delegates/CategoryDelegate.kt      |  13 +-
 .../sample/delegates/DividerDelegate.kt       |  13 +-
 .../sample/delegates/MovieDelegate.kt         |  19 +--
 .../sample/viewholder/CategoryHolder.kt       |   4 +-
 .../sample/viewholder/DataboundViewHolder.kt  |   2 +-
 .../sample/viewholder/DividerHolder.kt        |   2 +-
 app/src/main/res/layout/category_item.xml     |  23 ++--
 app/src/main/res/layout/divider_line.xml      |  15 ++-
 app/src/main/res/layout/movie_item.xml        |  76 +++++------
 app/src/main/res/layout/sample_activity.xml   |   7 +-
 bintray.gradle                                |  18 +++
 build.gradle                                  |   4 +-
 core/build.gradle                             |  85 ++----------
 core/proguard-rules.pro                       |   7 -
 core/src/main/AndroidManifest.xml             |   2 +-
 .../providers/AsyncListProvider.kt            |  51 -------
 .../providers/AsyncPagedListProvider.kt       |  58 --------
 .../trevjonez => }/polyadapter/PolyAdapter.kt | 124 +++++++++---------
 gradle.properties                             |   7 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 lib-module.gradle                             |  30 +++++
 maven-publish-android.gradle                  |  37 ++++++
 provider-rxjava2/.gitignore                   |   1 +
 provider-rxjava2/build.gradle                 |  12 ++
 provider-rxjava2/proguard-rules.pro           |   0
 provider-rxjava2/src/main/AndroidManifest.xml |   1 +
 .../polyadapter/provider}/RxListProvider.kt   |  16 +--
 .../provider/RxListProviderTest.kt            | 105 +++++++++++++++
 settings.gradle                               |   2 +-
 44 files changed, 553 insertions(+), 413 deletions(-)
 delete mode 100644 app/src/main/java/com/trevjonez/polyadapter/sample/data/DividerLine.kt
 create mode 100644 app/src/main/java/polyadapter/sample/ActivityScope.kt
 create mode 100644 app/src/main/java/polyadapter/sample/App.kt
 create mode 100644 app/src/main/java/polyadapter/sample/AppComponent.kt
 rename app/src/main/java/{com/trevjonez/polyadapter/sample/SampleActivity.kt => polyadapter/sample/ArchitecturalThing.kt} (53%)
 create mode 100644 app/src/main/java/polyadapter/sample/SampleActivity.kt
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/SampleGlideModule.kt (78%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/data/CategoryTitle.kt (54%)
 create mode 100644 app/src/main/java/polyadapter/sample/data/DividerLine.kt
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/data/Movie.kt (66%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/delegates/CategoryDelegate.kt (67%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/delegates/DividerDelegate.kt (66%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/delegates/MovieDelegate.kt (69%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/viewholder/CategoryHolder.kt (79%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/viewholder/DataboundViewHolder.kt (80%)
 rename app/src/main/java/{com/trevjonez => }/polyadapter/sample/viewholder/DividerHolder.kt (73%)
 create mode 100644 bintray.gradle
 delete mode 100644 core/src/main/java/com/trevjonez/polyadapter/providers/AsyncListProvider.kt
 delete mode 100644 core/src/main/java/com/trevjonez/polyadapter/providers/AsyncPagedListProvider.kt
 rename core/src/main/java/{com/trevjonez => }/polyadapter/PolyAdapter.kt (64%)
 create mode 100644 lib-module.gradle
 create mode 100644 maven-publish-android.gradle
 create mode 100644 provider-rxjava2/.gitignore
 create mode 100644 provider-rxjava2/build.gradle
 create mode 100644 provider-rxjava2/proguard-rules.pro
 create mode 100644 provider-rxjava2/src/main/AndroidManifest.xml
 rename {core/src/main/java/com/trevjonez/polyadapter/providers => provider-rxjava2/src/main/java/polyadapter/provider}/RxListProvider.kt (83%)
 create mode 100644 provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a51ac69..274a4b8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,6 +3,13 @@
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3d3de8..44fff12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Changelog
 
+### 0.6.0
+- Move adapter configuration entirely into constructor
+- Relocate specific item providers into separate modules
+- Remove androidx list differ impl's
+TODO(readme updates)
+TODO(publishing configuration updates)
+
 ### 0.5.0
 - Optional RxAndroid Dependency to provide an impl of an RX based diff processing list provider
 - Rename the existing providers, not everything needs to be poly. Breaking Change, Migration provided via deprecation.
diff --git a/README.md b/README.md
index 232b816..3c8c7be 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Available via [jcenter](https://bintray.com/trevorjones141/maven/PolyAdapter-And
 
 from jcenter: 
 ```groovy
-implementation 'com.trevjonez.polyadapter:core:0.5.0'
+implementation 'polyadapter:core:0.5.0'
 ```
 
 from jitpack:
diff --git a/app/build.gradle b/app/build.gradle
index e380856..7ee375a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.trevjonez.polyadapter"
+        applicationId "polyadapter.sample"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
@@ -24,15 +24,23 @@ android {
 }
 
 dependencies {
-    implementation(project(":core"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
+    implementation(project(":provider-rxjava2"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("androidx.appcompat:appcompat:1.0.0")
-    implementation('androidx.constraintlayout:constraintlayout:1.1.3')
+    implementation("androidx.constraintlayout:constraintlayout:1.1.3")
+    implementation("io.reactivex.rxjava2:rxkotlin:2.3.0")
 
-    kapt('com.github.bumptech.glide:compiler:4.8.0')
-    implementation('com.github.bumptech.glide:glide:4.8.0')
+    kapt('com.github.bumptech.glide:compiler:4.9.0')
+    implementation('com.github.bumptech.glide:glide:4.9.0')
 
-    kapt("androidx.databinding:databinding-compiler:$agp_version")
+    kapt("androidx.databinding:databinding-compiler:$agpVersion")
+
+    implementation("com.google.dagger:dagger:$daggerVersion")
+    kapt("com.google.dagger:dagger-compiler:$daggerVersion")
+
+    implementation("com.google.dagger:dagger-android:$daggerVersion")
+    implementation("com.google.dagger:dagger-android-support:$daggerVersion")
+    kapt("com.google.dagger:dagger-android-processor:$daggerVersion")
 
     testImplementation('junit:junit:4.12')
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2cf5beb..4deef81 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,12 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.trevjonez.polyadapter">
+    package="polyadapter.sample">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
   <application
+      android:name=".App"
       android:allowBackup="true"
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
@@ -13,7 +14,7 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
     <activity
-        android:name=".sample.SampleActivity"
+        android:name=".SampleActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/data/DividerLine.kt b/app/src/main/java/com/trevjonez/polyadapter/sample/data/DividerLine.kt
deleted file mode 100644
index 2e56b7c..0000000
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/data/DividerLine.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.trevjonez.polyadapter.sample.data
-
-class DividerLine
\ No newline at end of file
diff --git a/app/src/main/java/polyadapter/sample/ActivityScope.kt b/app/src/main/java/polyadapter/sample/ActivityScope.kt
new file mode 100644
index 0000000..2bf8cb9
--- /dev/null
+++ b/app/src/main/java/polyadapter/sample/ActivityScope.kt
@@ -0,0 +1,6 @@
+package polyadapter.sample
+
+import javax.inject.Scope
+
+@Scope
+annotation class ActivityScope
\ No newline at end of file
diff --git a/app/src/main/java/polyadapter/sample/App.kt b/app/src/main/java/polyadapter/sample/App.kt
new file mode 100644
index 0000000..82492c2
--- /dev/null
+++ b/app/src/main/java/polyadapter/sample/App.kt
@@ -0,0 +1,10 @@
+package polyadapter.sample
+
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
+
+class App: DaggerApplication() {
+  override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
+    return DaggerAppComponent.create()
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/polyadapter/sample/AppComponent.kt b/app/src/main/java/polyadapter/sample/AppComponent.kt
new file mode 100644
index 0000000..682fab9
--- /dev/null
+++ b/app/src/main/java/polyadapter/sample/AppComponent.kt
@@ -0,0 +1,15 @@
+package polyadapter.sample
+
+import dagger.Component
+import dagger.android.AndroidInjectionModule
+import dagger.android.AndroidInjector
+import javax.inject.Singleton
+
+@Singleton
+@Component(
+    modules = [
+      SampleActivity.BindingModule::class,
+      AndroidInjectionModule::class
+    ]
+)
+interface AppComponent : AndroidInjector<App>
\ No newline at end of file
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/SampleActivity.kt b/app/src/main/java/polyadapter/sample/ArchitecturalThing.kt
similarity index 53%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/SampleActivity.kt
rename to app/src/main/java/polyadapter/sample/ArchitecturalThing.kt
index 8e5eb7c..b0f03a3 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/SampleActivity.kt
+++ b/app/src/main/java/polyadapter/sample/ArchitecturalThing.kt
@@ -1,40 +1,17 @@
-package com.trevjonez.polyadapter.sample
+package polyadapter.sample
 
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.databinding.DataBindingUtil
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.trevjonez.polyadapter.PolyAdapter
-import com.trevjonez.polyadapter.R
-import com.trevjonez.polyadapter.databinding.SampleActivityBinding
-import com.trevjonez.polyadapter.providers.AsyncListProvider
-import com.trevjonez.polyadapter.providers.updateList
-import com.trevjonez.polyadapter.sample.data.CategoryTitle
-import com.trevjonez.polyadapter.sample.data.DividerLine
-import com.trevjonez.polyadapter.sample.data.Movie
-import com.trevjonez.polyadapter.sample.delegates.CategoryDelegate
-import com.trevjonez.polyadapter.sample.delegates.DividerDelegate
-import com.trevjonez.polyadapter.sample.delegates.MovieDelegate
+import io.reactivex.Observable
+import polyadapter.sample.data.CategoryTitle
+import polyadapter.sample.data.DividerLine
+import polyadapter.sample.data.Movie
+import javax.inject.Inject
 
-class SampleActivity : AppCompatActivity() {
-
-  private lateinit var viewBinding: SampleActivityBinding
-  private val polyAdapter = PolyAdapter(AsyncListProvider()).apply {
-    addDelegate(CategoryDelegate())
-    addDelegate(DividerDelegate())
-    addDelegate(MovieDelegate())
-  }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    viewBinding = DataBindingUtil.setContentView(this, R.layout.sample_activity)
-
-    viewBinding.recycler.apply {
-      layoutManager = LinearLayoutManager(context)
-      adapter = polyAdapter
-    }
-
-    polyAdapter.updateList(listOf(
+/**
+ * place holder for VM/Presenter/etc...
+ */
+class ArchitecturalThing @Inject constructor() {
+  fun dataSource(): Observable<List<Any>> {
+    return Observable.just(listOf(
         CategoryTitle("The Hobbit"),
         Movie("An Unexpected Journey",
             "https://www.imdb.com/title/tt0903624/",
diff --git a/app/src/main/java/polyadapter/sample/SampleActivity.kt b/app/src/main/java/polyadapter/sample/SampleActivity.kt
new file mode 100644
index 0000000..b843eb2
--- /dev/null
+++ b/app/src/main/java/polyadapter/sample/SampleActivity.kt
@@ -0,0 +1,97 @@
+package polyadapter.sample
+
+import android.os.Bundle
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import dagger.android.support.DaggerAppCompatActivity
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+import io.reactivex.disposables.CompositeDisposable
+import polyadapter.PolyAdapter
+import polyadapter.provider.RxListProvider
+import polyadapter.sample.data.CategoryTitle
+import polyadapter.sample.data.DividerLine
+import polyadapter.sample.data.Movie
+import polyadapter.sample.databinding.SampleActivityBinding
+import polyadapter.sample.delegates.CategoryDelegate
+import polyadapter.sample.delegates.DividerDelegate
+import polyadapter.sample.delegates.MovieDelegate
+import javax.inject.Inject
+
+class SampleActivity : DaggerAppCompatActivity() {
+
+  private lateinit var viewBinding: SampleActivityBinding
+
+  @Inject
+  lateinit var archThing: ArchitecturalThing
+
+  @Inject
+  lateinit var polyAdapter: PolyAdapter
+
+  @Inject
+  lateinit var rxProvider: RxListProvider
+
+  private val createDisposables = CompositeDisposable()
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    viewBinding = DataBindingUtil.setContentView(this, R.layout.sample_activity)
+
+    viewBinding.recycler.apply {
+      layoutManager = LinearLayoutManager(context)
+      adapter = polyAdapter
+    }
+
+    archThing.dataSource() //grab your data source
+        .compose(rxProvider) //pipe it into the list provider to calculate diff result
+        .subscribe { it() } //apply the new list and diff result when you are ready
+        .also { createDisposables.add(it) }
+  }
+
+  override fun onDestroy() {
+    createDisposables.dispose()
+    super.onDestroy()
+  }
+
+  @Module
+  abstract class DelegatesModule {
+    @Binds
+    @IntoMap
+    @ClassKey(CategoryTitle::class)
+    abstract fun categoryDelegate(impl: CategoryDelegate): PolyAdapter.BindingDelegate<*, *>
+
+    @Binds
+    @IntoMap
+    @ClassKey(DividerLine::class)
+    abstract fun dividerDelegate(impl: DividerDelegate): PolyAdapter.BindingDelegate<*, *>
+
+    @Binds
+    @IntoMap
+    @ClassKey(Movie::class)
+    abstract fun movieDelegate(impl: MovieDelegate): PolyAdapter.BindingDelegate<*, *>
+
+    @Binds
+    abstract fun listProvider(impl: RxListProvider): PolyAdapter.ItemProvider
+  }
+
+  @Module
+  class ProvidesModule {
+    @Provides
+    @ActivityScope
+    fun rxProvider(): RxListProvider {
+      return RxListProvider()
+    }
+  }
+
+  @Module
+  abstract class BindingModule {
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [DelegatesModule::class, ProvidesModule::class])
+    abstract fun contributeInjector(): SampleActivity
+  }
+}
+
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/SampleGlideModule.kt b/app/src/main/java/polyadapter/sample/SampleGlideModule.kt
similarity index 78%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/SampleGlideModule.kt
rename to app/src/main/java/polyadapter/sample/SampleGlideModule.kt
index a300425..b114718 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/SampleGlideModule.kt
+++ b/app/src/main/java/polyadapter/sample/SampleGlideModule.kt
@@ -1,4 +1,4 @@
-package com.trevjonez.polyadapter.sample
+package polyadapter.sample
 
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/data/CategoryTitle.kt b/app/src/main/java/polyadapter/sample/data/CategoryTitle.kt
similarity index 54%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/data/CategoryTitle.kt
rename to app/src/main/java/polyadapter/sample/data/CategoryTitle.kt
index 8b0dea0..e98319d 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/data/CategoryTitle.kt
+++ b/app/src/main/java/polyadapter/sample/data/CategoryTitle.kt
@@ -1,4 +1,4 @@
-package com.trevjonez.polyadapter.sample.data
+package polyadapter.sample.data
 
 data class CategoryTitle(
     val text: CharSequence
diff --git a/app/src/main/java/polyadapter/sample/data/DividerLine.kt b/app/src/main/java/polyadapter/sample/data/DividerLine.kt
new file mode 100644
index 0000000..9a934bd
--- /dev/null
+++ b/app/src/main/java/polyadapter/sample/data/DividerLine.kt
@@ -0,0 +1,3 @@
+package polyadapter.sample.data
+
+class DividerLine
\ No newline at end of file
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/data/Movie.kt b/app/src/main/java/polyadapter/sample/data/Movie.kt
similarity index 66%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/data/Movie.kt
rename to app/src/main/java/polyadapter/sample/data/Movie.kt
index d78429d..429f796 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/data/Movie.kt
+++ b/app/src/main/java/polyadapter/sample/data/Movie.kt
@@ -1,4 +1,4 @@
-package com.trevjonez.polyadapter.sample.data
+package polyadapter.sample.data
 
 data class Movie(
     val title: CharSequence,
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/CategoryDelegate.kt b/app/src/main/java/polyadapter/sample/delegates/CategoryDelegate.kt
similarity index 67%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/delegates/CategoryDelegate.kt
rename to app/src/main/java/polyadapter/sample/delegates/CategoryDelegate.kt
index f13daad..6c7b2d1 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/CategoryDelegate.kt
+++ b/app/src/main/java/polyadapter/sample/delegates/CategoryDelegate.kt
@@ -1,13 +1,14 @@
-package com.trevjonez.polyadapter.sample.delegates
+package polyadapter.sample.delegates
 
 import android.view.View
 import androidx.recyclerview.widget.DiffUtil
-import com.trevjonez.polyadapter.PolyAdapter
-import com.trevjonez.polyadapter.R
-import com.trevjonez.polyadapter.sample.data.CategoryTitle
-import com.trevjonez.polyadapter.sample.viewholder.CategoryHolder
+import polyadapter.PolyAdapter
+import polyadapter.sample.R
+import polyadapter.sample.data.CategoryTitle
+import polyadapter.sample.viewholder.CategoryHolder
+import javax.inject.Inject
 
-class CategoryDelegate : PolyAdapter.BindingDelegate<CategoryTitle, CategoryHolder> {
+class CategoryDelegate @Inject constructor() : PolyAdapter.BindingDelegate<CategoryTitle, CategoryHolder> {
   override val layoutId = R.layout.category_item
   override val dataType = CategoryTitle::class.java
   override val itemCallback = object : DiffUtil.ItemCallback<CategoryTitle>() {
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/DividerDelegate.kt b/app/src/main/java/polyadapter/sample/delegates/DividerDelegate.kt
similarity index 66%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/delegates/DividerDelegate.kt
rename to app/src/main/java/polyadapter/sample/delegates/DividerDelegate.kt
index 76cb31c..3850878 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/DividerDelegate.kt
+++ b/app/src/main/java/polyadapter/sample/delegates/DividerDelegate.kt
@@ -1,13 +1,14 @@
-package com.trevjonez.polyadapter.sample.delegates
+package polyadapter.sample.delegates
 
 import android.view.View
 import androidx.recyclerview.widget.DiffUtil
-import com.trevjonez.polyadapter.PolyAdapter
-import com.trevjonez.polyadapter.R
-import com.trevjonez.polyadapter.sample.data.DividerLine
-import com.trevjonez.polyadapter.sample.viewholder.DividerHolder
+import polyadapter.PolyAdapter
+import polyadapter.sample.R
+import polyadapter.sample.data.DividerLine
+import polyadapter.sample.viewholder.DividerHolder
+import javax.inject.Inject
 
-class DividerDelegate : PolyAdapter.BindingDelegate<DividerLine, DividerHolder> {
+class DividerDelegate @Inject constructor() : PolyAdapter.BindingDelegate<DividerLine, DividerHolder> {
   override val layoutId = R.layout.divider_line
   override val dataType = DividerLine::class.java
   override val itemCallback = object : DiffUtil.ItemCallback<DividerLine>() {
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/MovieDelegate.kt b/app/src/main/java/polyadapter/sample/delegates/MovieDelegate.kt
similarity index 69%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/delegates/MovieDelegate.kt
rename to app/src/main/java/polyadapter/sample/delegates/MovieDelegate.kt
index de008da..f8a1ba8 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/delegates/MovieDelegate.kt
+++ b/app/src/main/java/polyadapter/sample/delegates/MovieDelegate.kt
@@ -1,18 +1,19 @@
-package com.trevjonez.polyadapter.sample.delegates
+package polyadapter.sample.delegates
 
 import android.content.Intent
 import android.net.Uri
 import android.view.View
 import androidx.recyclerview.widget.DiffUtil
-import com.trevjonez.polyadapter.PolyAdapter
-import com.trevjonez.polyadapter.R
-import com.trevjonez.polyadapter.databinding.MovieItemBinding
-import com.trevjonez.polyadapter.databinding.MovieItemBinding.bind
-import com.trevjonez.polyadapter.sample.GlideApp
-import com.trevjonez.polyadapter.sample.data.Movie
-import com.trevjonez.polyadapter.sample.viewholder.DataboundViewHolder
+import polyadapter.PolyAdapter
+import polyadapter.sample.GlideApp
+import polyadapter.sample.R
+import polyadapter.sample.data.Movie
+import polyadapter.sample.databinding.MovieItemBinding
+import polyadapter.sample.databinding.MovieItemBinding.bind
+import polyadapter.sample.viewholder.DataboundViewHolder
+import javax.inject.Inject
 
-class MovieDelegate : PolyAdapter.BindingDelegate<Movie, DataboundViewHolder<MovieItemBinding>> {
+class MovieDelegate @Inject constructor() : PolyAdapter.BindingDelegate<Movie, DataboundViewHolder<MovieItemBinding>> {
   override val layoutId = R.layout.movie_item
   override val dataType = Movie::class.java
   override val itemCallback = object : DiffUtil.ItemCallback<Movie>() {
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/CategoryHolder.kt b/app/src/main/java/polyadapter/sample/viewholder/CategoryHolder.kt
similarity index 79%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/CategoryHolder.kt
rename to app/src/main/java/polyadapter/sample/viewholder/CategoryHolder.kt
index b9af810..c7ea112 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/CategoryHolder.kt
+++ b/app/src/main/java/polyadapter/sample/viewholder/CategoryHolder.kt
@@ -1,9 +1,9 @@
-package com.trevjonez.polyadapter.sample.viewholder
+package polyadapter.sample.viewholder
 
 import android.view.View
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.trevjonez.polyadapter.R
+import polyadapter.sample.R
 
 class CategoryHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
   private val title: TextView = itemView.findViewById(R.id.headerText)
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DataboundViewHolder.kt b/app/src/main/java/polyadapter/sample/viewholder/DataboundViewHolder.kt
similarity index 80%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DataboundViewHolder.kt
rename to app/src/main/java/polyadapter/sample/viewholder/DataboundViewHolder.kt
index 62940a1..e4cf572 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DataboundViewHolder.kt
+++ b/app/src/main/java/polyadapter/sample/viewholder/DataboundViewHolder.kt
@@ -1,4 +1,4 @@
-package com.trevjonez.polyadapter.sample.viewholder
+package polyadapter.sample.viewholder
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DividerHolder.kt b/app/src/main/java/polyadapter/sample/viewholder/DividerHolder.kt
similarity index 73%
rename from app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DividerHolder.kt
rename to app/src/main/java/polyadapter/sample/viewholder/DividerHolder.kt
index fee136b..856202c 100644
--- a/app/src/main/java/com/trevjonez/polyadapter/sample/viewholder/DividerHolder.kt
+++ b/app/src/main/java/polyadapter/sample/viewholder/DividerHolder.kt
@@ -1,4 +1,4 @@
-package com.trevjonez.polyadapter.sample.viewholder
+package polyadapter.sample.viewholder
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/category_item.xml b/app/src/main/res/layout/category_item.xml
index c8c5650..6f7d65c 100644
--- a/app/src/main/res/layout/category_item.xml
+++ b/app/src/main/res/layout/category_item.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/headerText"
-    android:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:background="@color/boring_header_background"
-    android:gravity="center_vertical|start"
-    android:padding="12dp"
-    android:textColor="@color/boring_header_text"
-    android:textSize="24sp"
-    tools:text="@tools:sample/cities"
-    />
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/headerText"
+  android:layout_width="match_parent"
+  android:layout_height="64dp"
+  android:background="@color/boring_header_background"
+  android:gravity="center_vertical|start"
+  android:padding="12dp"
+  android:textColor="@color/boring_header_text"
+  android:textSize="24sp"
+  tools:text="@tools:sample/cities"/>
diff --git a/app/src/main/res/layout/divider_line.xml b/app/src/main/res/layout/divider_line.xml
index b8413a4..c322ff4 100644
--- a/app/src/main/res/layout/divider_line.xml
+++ b/app/src/main/res/layout/divider_line.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="1dp">
-    <View android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:layout_marginStart="64dp"
-          android:background="@color/boring_divider"/>
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="1dp">
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginStart="64dp"
+    android:background="@color/boring_divider"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/movie_item.xml b/app/src/main/res/layout/movie_item.xml
index 36e76a1..0b2d2f9 100644
--- a/app/src/main/res/layout/movie_item.xml
+++ b/app/src/main/res/layout/movie_item.xml
@@ -1,51 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
   <androidx.constraintlayout.widget.ConstraintLayout
-      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="52dp"
-      >
+    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="52dp">
 
     <ImageView
-        android:id="@+id/movie_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars"
-        />
+      android:id="@+id/movie_image"
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:layout_margin="8dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintDimensionRatio="1:1"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:src="@tools:sample/avatars"/>
 
     <TextView
-        android:id="@+id/movie_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/web_link"
-        app:layout_constraintStart_toEndOf="@+id/movie_image"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names"
-        />
+      android:id="@+id/movie_title"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_margin="8dp"
+      android:ellipsize="end"
+      android:maxLines="1"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/web_link"
+      app:layout_constraintStart_toEndOf="@+id/movie_image"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:text="@tools:sample/full_names"/>
 
     <ImageButton
-        android:id="@+id/web_link"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_margin="8dp"
-        android:contentDescription="@string/open_in_browser"
-        android:src="@drawable/ic_open_in_browser_black_24dp"
-        android:tint="@color/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
-        />
+      android:id="@+id/web_link"
+      android:layout_width="36dp"
+      android:layout_height="36dp"
+      android:layout_margin="8dp"
+      android:contentDescription="@string/open_in_browser"
+      android:src="@drawable/ic_open_in_browser_black_24dp"
+      android:tint="@color/colorPrimary"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/sample_activity.xml b/app/src/main/res/layout/sample_activity.xml
index 8e1d8e2..8c55b6b 100644
--- a/app/src/main/res/layout/sample_activity.xml
+++ b/app/src/main/res/layout/sample_activity.xml
@@ -2,9 +2,8 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
   <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/recycler"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      />
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
 
 </layout>
diff --git a/bintray.gradle b/bintray.gradle
new file mode 100644
index 0000000..36d0f94
--- /dev/null
+++ b/bintray.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.jfrog.bintray'
+
+bintray {
+    user = project.findProperty('bintray_user')
+    key = project.findProperty('bintray_api_key')
+    publications = ['android']
+    pkg {
+        repo = 'maven'
+        name = 'PolyAdapter-Android'
+        licenses = ['Apache-2.0']
+        vcsUrl = 'git@github.com:trevjonez/PolyAdapter-Android.git'
+        version {
+            name = project.version
+            released = new Date()
+            vcsTag = project.version
+        }
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 271983f..907d0b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'digital.wup:android-maven-publish:3.6.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
     }
diff --git a/core/build.gradle b/core/build.gradle
index a65d838..028d8f6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,84 +1,15 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'digital.wup.android-maven-publish'
+ext.artifactId = "polyadapter"
+description = 'Multiple item/view type recycler view adapter'
 
-group = rootProject.group
-version = rootProject.version
+apply from: "../lib-module.gradle"
+apply from: "../maven-publish-android.gradle"
+apply from: "../bintray.gradle"
 
-android {
-    compileSdkVersion 28
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
-        versionName = project.version
-        consumerProguardFiles 'proguard-rules.pro'
-    }
-}
+apply plugin: 'kotlin-kapt'
 
 dependencies {
     api("androidx.recyclerview:recyclerview:1.0.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-
-    compileOnly('androidx.paging:paging-runtime:2.0.0')
-    compileOnly('io.reactivex.rxjava2:rxandroid:2.1.0')
-
-    testImplementation('junit:junit:4.12')
-}
-
-task sourceJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    archiveClassifier.set("sources")
-}
-
-publishing {
-    publications {
-        android(MavenPublication) {
-            from components.android
-            artifact(sourceJar)
-            pom {
-                name = 'core'
-                description = 'Multiple item/view type recycler view adapter'
-                url = 'https://github.com/trevjonez/PolyAdapter-Android'
-
-                licenses {
-                    license {
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = 'TrevJonez'
-                        name = 'Trevor Jones'
-                        email = 'trevorjones141@gmail.com'
-                    }
-                }
-
-                scm {
-                    connection = 'scm:git:git@github.com:trevjonez/PolyAdapter-Android.git'
-                    developerConnection = 'scm:git:git@github.com:trevjonez/PolyAdapter-Android.git'
-                    url = 'https://github.com/trevjonez/PolyAdapter-Android'
-                }
-            }
-        }
-    }
-}
 
-bintray {
-    user = project.findProperty('bintray_user')
-    key = project.findProperty('bintray_api_key')
-    publications = ['android']
-    pkg {
-        repo = 'maven'
-        name = 'PolyAdapter-Android'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'git@github.com:trevjonez/PolyAdapter-Android.git'
-        version {
-            name = project.version
-            released = new Date()
-            vcsTag = project.version
-        }
-    }
+    api("com.google.dagger:dagger:$daggerVersion")
+    kapt("com.google.dagger:dagger-compiler:$daggerVersion")
 }
diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
index 967fd71..e69de29 100644
--- a/core/proguard-rules.pro
+++ b/core/proguard-rules.pro
@@ -1,7 +0,0 @@
-# 'androidx.paging:paging-runtime' is an optional dependency
--dontwarn com.trevjonez.polyadapter.providers.AsyncPagedListProvider
--dontwarn com.trevjonez.polyadapter.providers.AsyncPagedListProvider*
-
-# 'io.reactivex.rxjava2:rxandroid' is an optional dependency
--dontwarn com.trevjonez.polyadapter.providers.RxListProvider
--dontwarn com.trevjonez.polyadapter.providers.RxListProvider*
\ No newline at end of file
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index eba3128..1b6635b 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.trevjonez.polyadapter.core"/>
\ No newline at end of file
+<manifest package="polyadapter.core"/>
\ No newline at end of file
diff --git a/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncListProvider.kt b/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncListProvider.kt
deleted file mode 100644
index 0575ce9..0000000
--- a/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncListProvider.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.trevjonez.polyadapter.providers
-
-import androidx.recyclerview.widget.*
-import com.trevjonez.polyadapter.PolyAdapter
-
-/**
- * Blindly cast the itemProvider to a [AsyncListProvider] to make list updates easier
- */
-fun PolyAdapter.updateList(items: List<Any>) = provider<AsyncListProvider>().updateList(items)
-
-
-@Deprecated("Class renamed to more closely describe its implementation",
-    ReplaceWith("AsyncListProvider(contentsChanged)",
-        "com.trevjonez.polyadapter.providers.AsyncListProvider"),
-    DeprecationLevel.ERROR)
-fun PolyListItemProvider(paddingItem: Any = Unit, contentsChanged: (() -> Unit)? = null) =
-    AsyncPagedListProvider(paddingItem, contentsChanged)
-
-/**
- * List ItemProvider impl via delegation to [AsyncListDiffer]
- * @param contentsChanged function called once the last diff callback has been delivered to the attached update callback
- */
-class AsyncListProvider(
-    private val contentsChanged: (() -> Unit)? = null
-) : PolyAdapter.ItemProvider {
-
-  private lateinit var listDiffer: AsyncListDiffer<Any>
-
-  override fun onAttach(listUpdateCallback: ListUpdateCallback, itemCallback: DiffUtil.ItemCallback<Any>) {
-    val finalDetector = object : BatchingListUpdateCallback(listUpdateCallback) {
-      override fun dispatchLastEvent() {
-        super.dispatchLastEvent()
-        contentsChanged?.invoke()
-      }
-    }
-
-    listDiffer = AsyncListDiffer(finalDetector, AsyncDifferConfig.Builder(itemCallback).build())
-  }
-
-  override fun getItemCount(): Int {
-    return listDiffer.currentList.size
-  }
-
-  override fun getItem(position: Int): Any {
-    return requireNotNull(listDiffer.currentList[position])
-  }
-
-  fun updateList(list: List<Any>) {
-    listDiffer.submitList(list)
-  }
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncPagedListProvider.kt b/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncPagedListProvider.kt
deleted file mode 100644
index 7ffcf06..0000000
--- a/core/src/main/java/com/trevjonez/polyadapter/providers/AsyncPagedListProvider.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.trevjonez.polyadapter.providers
-
-import androidx.paging.AsyncPagedListDiffer
-import androidx.paging.PagedList
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.BatchingListUpdateCallback
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListUpdateCallback
-import com.trevjonez.polyadapter.PolyAdapter
-
-/**
- * Blindly cast the itemProvider to a [AsyncPagedListProvider] to make list updates easier
- */
-fun PolyAdapter.updatePagedList(items: PagedList<Any>) = provider<AsyncPagedListProvider>().updateList(items)
-
-@Deprecated("Class renamed to more closely describe its implementation",
-    ReplaceWith("AsyncPagedListProvider(paddingItem, contentsChanged)",
-        "com.trevjonez.polyadapter.providers.AsyncPagedListProvider"),
-    DeprecationLevel.ERROR)
-fun PolyPagedListProvider(paddingItem: Any = Unit, contentsChanged: (() -> Unit)? = null) =
-    AsyncPagedListProvider(paddingItem, contentsChanged)
-
-/**
- * PagedList ItemProvider impl via delegation to [AsyncPagedListDiffer]
- *
- * It differs in two ways:
- * 1: It does not expose the `onCurrentListChanged` functionality.
- * 2: It allows customization of the padding object to preserve null safety.
- */
-class AsyncPagedListProvider(
-    private val paddingItem: Any = Unit,
-    private val contentsChanged: (() -> Unit)? = null
-) : PolyAdapter.ItemProvider {
-
-  private lateinit var listDiffer: AsyncPagedListDiffer<Any>
-
-  override fun onAttach(listUpdateCallback: ListUpdateCallback, itemCallback: DiffUtil.ItemCallback<Any>) {
-    val finalDetector = object : BatchingListUpdateCallback(listUpdateCallback) {
-      override fun dispatchLastEvent() {
-        super.dispatchLastEvent()
-        contentsChanged?.invoke()
-      }
-    }
-    listDiffer = AsyncPagedListDiffer(finalDetector, AsyncDifferConfig.Builder(itemCallback).build())
-  }
-
-  override fun getItemCount(): Int {
-    return listDiffer.itemCount
-  }
-
-  override fun getItem(position: Int): Any {
-    return listDiffer.getItem(position) ?: paddingItem
-  }
-
-  fun updateList(newList: PagedList<Any>) {
-    listDiffer.submitList(newList)
-  }
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/trevjonez/polyadapter/PolyAdapter.kt b/core/src/main/java/polyadapter/PolyAdapter.kt
similarity index 64%
rename from core/src/main/java/com/trevjonez/polyadapter/PolyAdapter.kt
rename to core/src/main/java/polyadapter/PolyAdapter.kt
index fc7e78e..c322b3f 100644
--- a/core/src/main/java/com/trevjonez/polyadapter/PolyAdapter.kt
+++ b/core/src/main/java/polyadapter/PolyAdapter.kt
@@ -1,7 +1,6 @@
-@file:JvmName("PolyAdapter")
-
-package com.trevjonez.polyadapter
+package polyadapter
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,21 +10,23 @@ import androidx.recyclerview.widget.AdapterListUpdateCallback
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
+import javax.inject.Inject
+import javax.inject.Provider
+
+class PolyAdapter @Inject constructor(
+    private val itemProvider: ItemProvider,
+    private val delegateFactories: Map<Class<*>, @JvmSuppressWildcards Provider<BindingDelegate<*, *>>>
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-class PolyAdapter(val itemProvider: ItemProvider) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-  private val layoutIdRegistry = SimpleArrayMap<Int, BindingDelegate<*, *>>()
-  private val classTypeRegistry = SimpleArrayMap<Class<*>, BindingDelegate<*, *>>()
-  private val itemCallback: DiffUtil.ItemCallback<Any> = PolyAdapterItemCallback()
+  private val typeLookup = SimpleArrayMap<Class<*>, BindingDelegate<*, *>>()
+  private val layoutLookup = SimpleArrayMap<Int, BindingDelegate<*, *>>()
 
   init {
-    itemProvider.onAttach(AdapterListUpdateCallback(this), itemCallback)
+    itemProvider.onAttach(AdapterListUpdateCallback(this), PolyAdapterItemCallback())
   }
 
   /**
-   * How [PolyAdapter] gets it's items, from a
-   * [List], [androidx.paging.PagedList],
-   * or whatever you want to implement.
+   * Adapter data owner, lookups are delegated to an instance of ItemProvider
    */
   interface ItemProvider {
     fun getItemCount(): Int
@@ -34,8 +35,7 @@ class PolyAdapter(val itemProvider: ItemProvider) :
     /**
      * Always called exactly once from the [PolyAdapter] init block.
      *
-     * Allows the ItemProvider to capture a reference for change notifications
-     * without introducing a compile time cyclic dependency.
+     * Allows the ItemProvider to capture a reference for change notifications.
      */
     fun onAttach(listUpdateCallback: ListUpdateCallback, itemCallback: DiffUtil.ItemCallback<Any>)
   }
@@ -84,48 +84,18 @@ class PolyAdapter(val itemProvider: ItemProvider) :
 
   override fun getItemCount() = itemProvider.getItemCount()
 
-  /**
-   * Add a new delegate to this [PolyAdapter]'s lookup tables.
-   */
-  fun addDelegate(delegate: BindingDelegate<*, *>) {
-    require(itemCount == 0) { "Do not modify delegate listing after supplying data to the ItemProvider" }
-    val viewTypeOverwrite = layoutIdRegistry.put(delegate.layoutId, delegate)
-    val dataTypeOverwrite = classTypeRegistry.put(delegate.dataType, delegate)
-
-    when {
-      viewTypeOverwrite != null && dataTypeOverwrite == null ->
-        throw IllegalArgumentException(
-            "Partial delegate overwrite.\n" +
-                "Layout id: '${delegate.layoutId}' collides between '$viewTypeOverwrite' and '$delegate'.\n" +
-                "You can use a resource alias to disambiguate multiple data types using the same layout.\n" +
-                "`<item name=\"the_alias_name\" type=\"layout\">@layout/the_real_name</item>`"
-        )
-
-      viewTypeOverwrite == null && dataTypeOverwrite != null ->
-        throw IllegalArgumentException(
-            "Partial delegate overwrite.\n" +
-                "Data type: '${delegate.dataType}' collides between '$dataTypeOverwrite' and '$delegate'."
-        )
-
-      viewTypeOverwrite != null && dataTypeOverwrite != null ->
-        throw IllegalArgumentException(
-            "Total delegate overwrite.\n" +
-                "Layout id: '${delegate.layoutId}' and data type: '${delegate.dataType}' collides between '$viewTypeOverwrite' and '$delegate'."
-        )
-    }
-  }
-
   override fun getItemViewType(position: Int): Int {
     val item = getItem(position)
-    return requireNotNull(classTypeRegistry[item.javaClass]) {
+    val delegate = getDelegate(item.javaClass)
+    return requireNotNull(delegate) {
       "Failed to get layout id for item of type ${item.javaClass.name}"
     }.layoutId
   }
 
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-    val delegate = requireNotNull(layoutIdRegistry[viewType]) {
-      "Not binding delegate found for viewType $viewType." +
-          "This should never happen as the delegate provides the viewType view the layout id property"
+    val delegate = requireNotNull(layoutLookup[viewType]) {
+      "No binding delegate found for viewType $viewType." +
+          "This should never happen as the delegate provides the viewType as the layout id property"
     }
     val inflater = LayoutInflater.from(parent.context)
     return delegate.createViewHolder(inflater.inflate(delegate.layoutId, parent, false))
@@ -175,6 +145,7 @@ class PolyAdapter(val itemProvider: ItemProvider) :
       }
     }
 
+    @SuppressLint("DiffUtilEquals")
     override fun areContentsTheSame(oldItem: Any, newItem: Any): Boolean {
       return when {
         oldItem.javaClass == newItem.javaClass -> {
@@ -191,12 +162,30 @@ class PolyAdapter(val itemProvider: ItemProvider) :
 
   private fun getDelegate(layoutId: Int): BindingDelegate<Any, RecyclerView.ViewHolder> {
     @Suppress("UNCHECKED_CAST")
-    return layoutIdRegistry[layoutId] as BindingDelegate<Any, RecyclerView.ViewHolder>
+    return layoutLookup[layoutId] as BindingDelegate<Any, RecyclerView.ViewHolder>
   }
 
-  private fun getDelegate(clazz: Class<*>): BindingDelegate<Any, RecyclerView.ViewHolder> {
-    @Suppress("UNCHECKED_CAST")
-    return classTypeRegistry[clazz] as BindingDelegate<Any, RecyclerView.ViewHolder>
+  private fun getDelegate(itemType: Class<*>): BindingDelegate<Any, RecyclerView.ViewHolder> {
+    if (typeLookup.containsKey(itemType)) {
+      @Suppress("UNCHECKED_CAST")
+      return typeLookup[itemType] as BindingDelegate<Any, RecyclerView.ViewHolder>
+    } else {
+      val delegateFactory = delegateFactories[itemType]
+          ?: throw MissingDelegateException(itemType)
+
+      val delegate = delegateFactory.get()
+
+      typeLookup.put(delegate.dataType, delegate)?.let { existing ->
+        throw DataTypeCollisionException(existing, delegate)
+      }
+
+      layoutLookup.put(delegate.layoutId, delegate)?.let { existing ->
+        throw LayoutIdCollisionException(existing, delegate)
+      }
+
+      @Suppress("UNCHECKED_CAST")
+      return delegate as BindingDelegate<Any, RecyclerView.ViewHolder>
+    }
   }
 
   private inline fun <reified T> BindingDelegate<Any, RecyclerView.ViewHolder>.asType(): T? {
@@ -215,14 +204,23 @@ class PolyAdapter(val itemProvider: ItemProvider) :
   private fun BindingDelegate<Any, RecyclerView.ViewHolder>.asViewDetachedDelegate() =
       asType<OnViewDetachedDelegate<RecyclerView.ViewHolder>>()
 
-  /**
-   * Blindly cast the itemProvider to [T]
-   */
-  inline fun <reified T : PolyAdapter.ItemProvider> provider(): T {
-    return itemProvider as? T
-        ?: throw UnsupportedOperationException(
-            "itemProvider was type ${itemProvider.javaClass.simpleName} " +
-                "but expected ${T::class.java.simpleName}"
-        )
-  }
+  class MissingDelegateException(itemType: Class<*>) :
+      RuntimeException("No delegate factory bound for Class<$itemType>")
+
+  class DataTypeCollisionException(
+      existingDelegate: BindingDelegate<*, *>,
+      collidingDelegate: BindingDelegate<*, *>
+  ) : RuntimeException(
+      "Data type: '${existingDelegate.dataType}' collides between '$collidingDelegate' and '$existingDelegate'."
+  )
+
+  class LayoutIdCollisionException(
+      existingDelegate: BindingDelegate<*, *>,
+      collidingDelegate: BindingDelegate<*, *>
+  ) : RuntimeException(
+      "Partial delegate overwrite.\n" +
+          "Layout id: '${existingDelegate.layoutId}' collides between '$collidingDelegate' and '$existingDelegate'.\n" +
+          "You can use a resource alias to disambiguate multiple data types using the same layout.\n" +
+          "`<item name=\"the_alias_name\" type=\"layout\">@layout/the_real_name</item>`"
+  )
 }
diff --git a/gradle.properties b/gradle.properties
index 8c6d47a..100d042 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,9 @@
 group=com.trevjonez.polyadapter
-version=0.5.0
+version=0.6.0
 
-agp_version=3.4.0-alpha10
-kotlin_version=1.3.11
+agpVersion=3.5.0-alpha07
+kotlinVersion=1.3.21
+daggerVersion=2.21
 
 org.gradle.parallel=true
 org.gradle.caching=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 10cb99e..b8a51fe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib-module.gradle b/lib-module.gradle
new file mode 100644
index 0000000..7944415
--- /dev/null
+++ b/lib-module.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+group = rootProject.group
+version = rootProject.version
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionName = project.version
+        consumerProguardFiles 'proguard-rules.pro'
+    }
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
+
+    testImplementation('junit:junit:4.12')
+    testImplementation("com.google.truth:truth:0.43")
+}
+
+task sourceJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    archiveClassifier.set("sources")
+}
\ No newline at end of file
diff --git a/maven-publish-android.gradle b/maven-publish-android.gradle
new file mode 100644
index 0000000..e60d75b
--- /dev/null
+++ b/maven-publish-android.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'digital.wup.android-maven-publish'
+
+publishing {
+    publications {
+        android(MavenPublication) {
+            from components.android
+            artifact(sourceJar)
+            artifactId = project.artifactId
+            pom {
+                name = project.artifactId
+                description = project.description
+                url = 'https://github.com/trevjonez/PolyAdapter-Android'
+
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id = 'TrevJonez'
+                        name = 'Trevor Jones'
+                        email = 'trevorjones141@gmail.com'
+                    }
+                }
+
+                scm {
+                    connection = 'scm:git:git@github.com:trevjonez/PolyAdapter-Android.git'
+                    developerConnection = 'scm:git:git@github.com:trevjonez/PolyAdapter-Android.git'
+                    url = 'https://github.com/trevjonez/PolyAdapter-Android'
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/provider-rxjava2/.gitignore b/provider-rxjava2/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/provider-rxjava2/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider-rxjava2/build.gradle b/provider-rxjava2/build.gradle
new file mode 100644
index 0000000..77a2238
--- /dev/null
+++ b/provider-rxjava2/build.gradle
@@ -0,0 +1,12 @@
+ext.artifactId = "provider-rxjava2"
+description = 'RxJava2 backed item provider for PolyAdapter'
+
+apply from: "../lib-module.gradle"
+apply from: "../maven-publish-android.gradle"
+apply from: "../bintray.gradle"
+
+dependencies {
+    api(project(":core"))
+    api('io.reactivex.rxjava2:rxandroid:2.1.0')
+    testImplementation('junit:junit:4.12')
+}
\ No newline at end of file
diff --git a/provider-rxjava2/proguard-rules.pro b/provider-rxjava2/proguard-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/provider-rxjava2/src/main/AndroidManifest.xml b/provider-rxjava2/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4db8552
--- /dev/null
+++ b/provider-rxjava2/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="polyadapter.provider.rxjava2"/>
\ No newline at end of file
diff --git a/core/src/main/java/com/trevjonez/polyadapter/providers/RxListProvider.kt b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
similarity index 83%
rename from core/src/main/java/com/trevjonez/polyadapter/providers/RxListProvider.kt
rename to provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
index e61a95d..51c8b1d 100644
--- a/core/src/main/java/com/trevjonez/polyadapter/providers/RxListProvider.kt
+++ b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
@@ -1,24 +1,20 @@
-package com.trevjonez.polyadapter.providers
+package polyadapter.provider
 
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
-import com.trevjonez.polyadapter.PolyAdapter
+import polyadapter.PolyAdapter
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
 import io.reactivex.ObservableTransformer
 import io.reactivex.Scheduler
-import io.reactivex.android.MainThreadDisposable
+import io.reactivex.android.MainThreadDisposable.*
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 
-/**
- * Blindly cast the itemProvider to a [RxListProvider] to make list updates easier
- */
-fun PolyAdapter.rxListProvider() = provider<RxListProvider>()
-
 /**
  * RxJava based diff util management.
- * Transforms the new list into a function that dispatches the update to the attached list update callback.
+ * Transforms the new list into an effect function that when called,
+ * dispatches the updated data set and diff result to the attached list update callback.
  */
 class RxListProvider(
     defaultItems: List<Any> = emptyList(),
@@ -58,7 +54,7 @@ class RxListProvider(
       }
           .map { (diffResult, newList) ->
             {
-              MainThreadDisposable.verifyMainThread()
+              verifyMainThread()
               list = newList
               diffResult.dispatchUpdatesTo(listUpdateCallback)
             }
diff --git a/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt b/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt
new file mode 100644
index 0000000..25af8b0
--- /dev/null
+++ b/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt
@@ -0,0 +1,105 @@
+package polyadapter.provider
+
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListUpdateCallback
+import com.google.common.truth.Truth.assertThat
+import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
+import org.junit.Test
+
+class RxListProviderTest {
+  @Test
+  fun `diff calls delegated to attached item callback`() {
+    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+    Observable.just(listOf(1, 2, 3))
+        .compose(provider)
+        .blockingFirst()
+
+    assertThat(itemCallback.itemSameInvocations).hasSize(6)
+    assertThat(itemCallback.contentsSameInvocations).hasSize(3)
+    assertThat(itemCallback.changePayloadInvocations).isEmpty()
+  }
+
+  @Test
+  fun `diff results delegated to attached list update callback`() {
+    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+    Observable.just(listOf(3, 2, 1))
+        .compose(provider)
+        .blockingFirst()
+        .invoke()
+
+    assertThat(listCallback.movedInvocations).hasSize(2)
+  }
+
+  @Test
+  fun `diff results and data not applied until effector is invoked`() {
+    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+    val effector = Observable.just(listOf(3, 2, 1))
+        .compose(provider)
+        .blockingFirst()
+
+    assertThat(listCallback.totalInvocations).isEqualTo(0)
+    effector()
+    assertThat(listCallback.totalInvocations).isGreaterThan(0)
+  }
+}
+
+class ItemCallbackFake : DiffUtil.ItemCallback<Any>() {
+  val itemSameInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun areItemsTheSame(oldItem: Any, newItem: Any): Boolean {
+    itemSameInvocations.add(oldItem to newItem)
+    return oldItem === newItem
+  }
+
+  val contentsSameInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun areContentsTheSame(oldItem: Any, newItem: Any): Boolean {
+    contentsSameInvocations.add(oldItem to newItem)
+    return oldItem == newItem
+  }
+
+  val changePayloadInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun getChangePayload(oldItem: Any, newItem: Any): Any? {
+    changePayloadInvocations.add(oldItem to newItem)
+    return super.getChangePayload(oldItem, newItem)
+  }
+}
+
+class ListCallbackFake : ListUpdateCallback {
+  val totalInvocations: Int
+    get() = changedInvocations.size +
+        movedInvocations.size +
+        insertedInvocations.size +
+        removedInvocations.size
+
+  val changedInvocations = mutableListOf<Triple<Int, Int, Any?>>()
+  override fun onChanged(position: Int, count: Int, payload: Any?) {
+    changedInvocations.add(Triple(position, count, payload))
+  }
+
+  val movedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onMoved(fromPosition: Int, toPosition: Int) {
+    movedInvocations.add(fromPosition to toPosition)
+  }
+
+  val insertedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onInserted(position: Int, count: Int) {
+    insertedInvocations.add(position to count)
+  }
+
+  val removedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onRemoved(position: Int, count: Int) {
+    removedInvocations.add(position to count)
+  }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6cba5bb..6202af1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
-include(':app', ':core')
+include(':app', ':core', 'provider-rxjava2')
 
 enableFeaturePreview('GRADLE_METADATA')
\ No newline at end of file

From 42ec5c400e7d565b554b2f570f941010e44eaf2f Mon Sep 17 00:00:00 2001
From: TrevJonez <trevorjones141@gmail.com>
Date: Sat, 6 Apr 2019 16:55:29 -0600
Subject: [PATCH 2/5] more automated sanity checks

---
 app/build.gradle                              | 12 ++-
 app/src/main/AndroidManifest.xml              |  4 +
 app/src/test/java/polyadapter/RxTestUtils.kt  | 74 +++++++++++++++++++
 app/src/test/java/polyadapter/ShampooRule.kt  | 26 +++++++
 .../polyadapter/sample/SampleActivityTest.kt  | 72 ++++++++++++++++++
 gradle.properties                             |  4 +-
 6 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100644 app/src/test/java/polyadapter/RxTestUtils.kt
 create mode 100644 app/src/test/java/polyadapter/ShampooRule.kt
 create mode 100644 app/src/test/java/polyadapter/sample/SampleActivityTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 7ee375a..eb5f054 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
@@ -42,5 +47,10 @@ dependencies {
     implementation("com.google.dagger:dagger-android-support:$daggerVersion")
     kapt("com.google.dagger:dagger-android-processor:$daggerVersion")
 
-    testImplementation('junit:junit:4.12')
+    testImplementation("androidx.test:runner:1.1.0")
+    testImplementation("androidx.test.ext:junit:1.1.0")
+    testImplementation("org.robolectric:robolectric:4.2.1")
+    testImplementation("androidx.test.espresso:espresso-core:3.1.0")
+    testImplementation("androidx.test.espresso:espresso-intents:3.1.0")
+    testImplementation("androidx.test.espresso:espresso-idling-resource:3.1.0")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4deef81..d7f40c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,10 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
+
+    <uses-library android:name="android.test.runner"
+                  android:required="false" />
+
     <activity
         android:name=".SampleActivity"
         android:label="@string/app_name">
diff --git a/app/src/test/java/polyadapter/RxTestUtils.kt b/app/src/test/java/polyadapter/RxTestUtils.kt
new file mode 100644
index 0000000..791c1c9
--- /dev/null
+++ b/app/src/test/java/polyadapter/RxTestUtils.kt
@@ -0,0 +1,74 @@
+package polyadapter
+
+import androidx.test.espresso.idling.CountingIdlingResource
+import io.reactivex.Scheduler
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import io.reactivex.disposables.Disposables
+import io.reactivex.schedulers.Schedulers
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+/**
+ * Allow wrapping a schedule with the ability to pause execution of work items
+ * All pending work items will be scheduled when calling resume.
+ * Once pending work items are scheduled calling pause will have no effect on them.
+ */
+class PauseableScheduler(private val actual: Scheduler = Schedulers.newThread()) : Scheduler() {
+
+  @Volatile
+  private var paused = false
+
+  private val pendingWork = LinkedList<() -> Unit>()
+  val idlingResource: CountingIdlingResource =
+      CountingIdlingResource(PauseableScheduler::class.java.simpleName, true)
+
+  fun pause() {
+    synchronized(pendingWork) {
+      paused = true
+    }
+  }
+
+  fun resume() {
+    synchronized(pendingWork) {
+      val pending = pendingWork.toList()
+      pendingWork.clear()
+      pending.forEach { it() }
+      paused = false
+    }
+  }
+
+  override fun createWorker(): Worker {
+    val realWorker = actual.createWorker()
+    return object : Worker() {
+      override fun dispose() = realWorker.dispose()
+      override fun isDisposed() = realWorker.isDisposed
+
+      init {
+        idlingResource.increment()
+      }
+
+      override fun schedule(run: Runnable, delay: Long, unit: TimeUnit): Disposable {
+        return synchronized(pendingWork) {
+          CompositeDisposable().also { result ->
+            val decrementingRun = Runnable {
+              run.run()
+              idlingResource.decrement()
+            }
+            val workItem: () -> Unit = {
+              realWorker.schedule(decrementingRun, delay, unit).also { result.add(it) }
+            }
+
+            if (paused) {
+              Disposables.fromRunnable { pendingWork.remove(workItem) }.also { result.add(it) }
+              pendingWork.add(workItem)
+            } else {
+              workItem()
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/test/java/polyadapter/ShampooRule.kt b/app/src/test/java/polyadapter/ShampooRule.kt
new file mode 100644
index 0000000..14bcec3
--- /dev/null
+++ b/app/src/test/java/polyadapter/ShampooRule.kt
@@ -0,0 +1,26 @@
+package polyadapter
+
+import androidx.annotation.IntRange
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+class ShampooRule(
+    @IntRange(from = 1) val iterations: Int,
+    val printIterationLabels: Boolean = true
+) : TestRule {
+  override fun apply(base: Statement, description: Description): Statement {
+    return object : Statement() {
+      override fun evaluate() {
+        (0 until iterations).forEach {
+          if (printIterationLabels) println("\n\n Iteration: $it")
+          try {
+            base.evaluate()
+          } catch (error: Throwable) {
+            throw AssertionError("Failed at iteration: $it", error)
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/test/java/polyadapter/sample/SampleActivityTest.kt b/app/src/test/java/polyadapter/sample/SampleActivityTest.kt
new file mode 100644
index 0000000..657cf96
--- /dev/null
+++ b/app/src/test/java/polyadapter/sample/SampleActivityTest.kt
@@ -0,0 +1,72 @@
+package polyadapter.sample
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.*
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.assertThat
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.reactivex.plugins.RxJavaPlugins
+import io.reactivex.schedulers.Schedulers
+import org.hamcrest.Matchers
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import polyadapter.PauseableScheduler
+import polyadapter.ShampooRule
+import java.util.concurrent.TimeoutException
+
+@RunWith(AndroidJUnit4::class)
+class SampleActivityTest {
+  private val pausingCompScheduler = PauseableScheduler()
+
+  @Before
+  fun setUp() {
+    pausingCompScheduler.pause()
+    IdlingRegistry.getInstance().register(pausingCompScheduler.idlingResource)
+    RxJavaPlugins.setComputationSchedulerHandler { pausingCompScheduler }
+  }
+
+  @After
+  fun tearDown() {
+    IdlingRegistry.getInstance().unregister(pausingCompScheduler.idlingResource)
+    RxJavaPlugins.reset()
+  }
+
+  @Test
+  fun `Default empty list first then items applied successfully`() {
+    ActivityScenario.launch(SampleActivity::class.java).use {
+      onView(withId(R.id.recycler))
+          .check(adapterItemCount(0))
+
+      pausingCompScheduler.resume()
+      pausingCompScheduler.idlingResource.waitForComputationFinish()
+
+      onView(withId(R.id.recycler))
+          .check(adapterItemCount(13))
+    }
+  }
+
+  private fun IdlingResource.waitForComputationFinish(sleepMillis: Long = 10, timeoutMillis: Long = 2000) {
+    var sleepTime = 0L
+    while (!isIdleNow) {
+      Thread.sleep(sleepMillis)
+      sleepTime += sleepMillis
+      if (sleepTime >= timeoutMillis)
+        throw TimeoutException("IdlingResource \"$name\" failed to idle after ${sleepTime}ms")
+    }
+  }
+
+  private fun adapterItemCount(expected: Int): ViewAssertion {
+    return ViewAssertion { view, noViewFoundException ->
+      noViewFoundException?.let { throw it }
+      val recycler = view as RecyclerView
+      val adapter = requireNotNull(recycler.adapter)
+
+      assertThat("Wrong adapter item count", adapter.itemCount, Matchers.`is`(expected))
+    }
+  }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 100d042..e0ac553 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=com.trevjonez.polyadapter
 version=0.6.0
 
-agpVersion=3.5.0-alpha07
+agpVersion=3.5.0-alpha10
 kotlinVersion=1.3.21
-daggerVersion=2.21
+daggerVersion=2.22
 
 org.gradle.parallel=true
 org.gradle.caching=true

From d580e5ef74ed758fb126868feefc59f44b25176d Mon Sep 17 00:00:00 2001
From: Trevor Jones <trevorjones141@gmail.com>
Date: Mon, 8 Apr 2019 09:26:38 -0600
Subject: [PATCH 3/5] default list provider and rx provider delegates to it.

---
 .../polyadapter/sample/SampleActivityTest.kt  | 18 +++---
 .../java/polyadapter/DefaultListProvider.kt   | 58 +++++++++++++++++++
 .../polyadapter/provider/RxListProvider.kt    | 53 ++++-------------
 3 files changed, 77 insertions(+), 52 deletions(-)
 create mode 100644 core/src/main/java/polyadapter/DefaultListProvider.kt

diff --git a/app/src/test/java/polyadapter/sample/SampleActivityTest.kt b/app/src/test/java/polyadapter/sample/SampleActivityTest.kt
index 657cf96..fef0345 100644
--- a/app/src/test/java/polyadapter/sample/SampleActivityTest.kt
+++ b/app/src/test/java/polyadapter/sample/SampleActivityTest.kt
@@ -25,7 +25,6 @@ class SampleActivityTest {
 
   @Before
   fun setUp() {
-    pausingCompScheduler.pause()
     IdlingRegistry.getInstance().register(pausingCompScheduler.idlingResource)
     RxJavaPlugins.setComputationSchedulerHandler { pausingCompScheduler }
   }
@@ -38,19 +37,20 @@ class SampleActivityTest {
 
   @Test
   fun `Default empty list first then items applied successfully`() {
+    pausingCompScheduler.pause()
     ActivityScenario.launch(SampleActivity::class.java).use {
       onView(withId(R.id.recycler))
           .check(adapterItemCount(0))
 
       pausingCompScheduler.resume()
-      pausingCompScheduler.idlingResource.waitForComputationFinish()
+      pausingCompScheduler.idlingResource.waitForIdle()
 
       onView(withId(R.id.recycler))
           .check(adapterItemCount(13))
     }
   }
 
-  private fun IdlingResource.waitForComputationFinish(sleepMillis: Long = 10, timeoutMillis: Long = 2000) {
+  private fun IdlingResource.waitForIdle(sleepMillis: Long = 10, timeoutMillis: Long = 2000) {
     var sleepTime = 0L
     while (!isIdleNow) {
       Thread.sleep(sleepMillis)
@@ -60,13 +60,11 @@ class SampleActivityTest {
     }
   }
 
-  private fun adapterItemCount(expected: Int): ViewAssertion {
-    return ViewAssertion { view, noViewFoundException ->
-      noViewFoundException?.let { throw it }
-      val recycler = view as RecyclerView
-      val adapter = requireNotNull(recycler.adapter)
+  private fun adapterItemCount(expected: Int) = ViewAssertion { view, noViewFoundException ->
+    noViewFoundException?.let { throw it }
+    val recycler = view as RecyclerView
+    val adapter = requireNotNull(recycler.adapter)
 
-      assertThat("Wrong adapter item count", adapter.itemCount, Matchers.`is`(expected))
-    }
+    assertThat("Wrong adapter item count", adapter.itemCount, Matchers.`is`(expected))
   }
 }
\ No newline at end of file
diff --git a/core/src/main/java/polyadapter/DefaultListProvider.kt b/core/src/main/java/polyadapter/DefaultListProvider.kt
new file mode 100644
index 0000000..c45f374
--- /dev/null
+++ b/core/src/main/java/polyadapter/DefaultListProvider.kt
@@ -0,0 +1,58 @@
+package polyadapter
+
+import android.os.Looper
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListUpdateCallback
+
+/**
+ * Default list provider encapsulates the basic flow for data swapping
+ */
+class DefaultListProvider(
+    defaultItems: List<Any>
+) : PolyAdapter.ItemProvider {
+
+  private lateinit var listUpdateCallback: ListUpdateCallback
+  private lateinit var itemCallback: DiffUtil.ItemCallback<Any>
+  private var items: List<Any> = defaultItems.toList()
+
+  override fun getItemCount() = items.size
+  override fun getItem(position: Int) = items[position]
+  override fun onAttach(listUpdateCallback: ListUpdateCallback, itemCallback: DiffUtil.ItemCallback<Any>) {
+    this.listUpdateCallback = listUpdateCallback
+    this.itemCallback = itemCallback
+  }
+
+  /**
+   * @return A function that will calculate against the current list when updateItems was called and the newItems param.
+   * The result of the diff calculation function will return a function that can then be used to apply
+   * the diff util result and swap the data list.
+   */
+  fun updateItems(newItems: List<Any>): () -> (() -> Unit) {
+    val oldList = items
+    return {
+      val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
+        override fun getOldListSize() = oldList.size
+
+        override fun getNewListSize() = newItems.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.areItemsTheSame(oldList[oldItemPosition], newItems[newItemPosition])
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.areContentsTheSame(oldList[oldItemPosition], newItems[newItemPosition])
+
+        override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int) =
+            itemCallback.getChangePayload(oldList[oldItemPosition], newItems[newItemPosition])
+      }, true)
+
+      val swapDataAndDispatchDiffResult: () -> Unit = {
+        if (Looper.myLooper() != Looper.getMainLooper())
+          throw IllegalStateException("Data swap and diffResult dispatching must be called from the main thread")
+        items = newItems
+        diffResult.dispatchUpdatesTo(listUpdateCallback)
+      }
+
+      swapDataAndDispatchDiffResult
+    }
+  }
+}
\ No newline at end of file
diff --git a/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
index 51c8b1d..bc9a3cb 100644
--- a/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
+++ b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
@@ -1,64 +1,33 @@
 package polyadapter.provider
 
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListUpdateCallback
-import polyadapter.PolyAdapter
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
 import io.reactivex.ObservableTransformer
 import io.reactivex.Scheduler
-import io.reactivex.android.MainThreadDisposable.*
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
+import polyadapter.DefaultListProvider
+import polyadapter.PolyAdapter
 
 /**
- * RxJava based diff util management.
+ * RxJava2 friendly diff util management.
  * Transforms the new list into an effect function that when called,
  * dispatches the updated data set and diff result to the attached list update callback.
+ *
+ * If new lists arrive before the last is done diff calculating the previous work request will be disposed.
  */
 class RxListProvider(
     defaultItems: List<Any> = emptyList(),
     private val workScheduler: Scheduler = Schedulers.computation(),
-    private val mainScheduler: Scheduler = AndroidSchedulers.mainThread()
-) : PolyAdapter.ItemProvider, ObservableTransformer<List<Any>, () -> Unit> {
-
-  private lateinit var listUpdateCallback: ListUpdateCallback
-  private lateinit var itemCallback: DiffUtil.ItemCallback<Any>
-  private var list: List<Any> = defaultItems
-
-  override fun getItem(position: Int) = list[position]
-  override fun getItemCount() = list.size
-  override fun onAttach(listUpdateCallback: ListUpdateCallback, itemCallback: DiffUtil.ItemCallback<Any>) {
-    this.listUpdateCallback = listUpdateCallback
-    this.itemCallback = itemCallback
-  }
+    private val mainScheduler: Scheduler = AndroidSchedulers.mainThread(),
+    private val defaultProvider: DefaultListProvider = DefaultListProvider(defaultItems)
+) : PolyAdapter.ItemProvider by defaultProvider,
+    ObservableTransformer<List<Any>, () -> Unit> {
 
   override fun apply(upstream: Observable<List<Any>>): ObservableSource<() -> Unit> {
     return upstream.switchMap { newList ->
-      val oldList = list
-      Observable.fromCallable {
-        DiffUtil.calculateDiff(object : DiffUtil.Callback() {
-          override fun getOldListSize() = oldList.size
-
-          override fun getNewListSize() = newList.size
-
-          override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-              itemCallback.areItemsTheSame(oldList[oldItemPosition], newList[newItemPosition])
-
-          override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-              itemCallback.areContentsTheSame(oldList[oldItemPosition], newList[newItemPosition])
-
-          override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int) =
-              itemCallback.getChangePayload(oldList[oldItemPosition], newList[newItemPosition])
-        }, true) to newList
-      }
-          .map { (diffResult, newList) ->
-            {
-              verifyMainThread()
-              list = newList
-              diffResult.dispatchUpdatesTo(listUpdateCallback)
-            }
-          }
+      val diffWork = defaultProvider.updateItems(newList)
+      Observable.fromCallable { diffWork() }
           .subscribeOn(workScheduler)
           .observeOn(mainScheduler)
     }

From a52585a84dd39d7f417642cf481ea6b61dca0125 Mon Sep 17 00:00:00 2001
From: Trevor Jones <trevorjones141@gmail.com>
Date: Mon, 8 Apr 2019 10:26:36 -0600
Subject: [PATCH 4/5] let the list provider test own the callback checking and
 focus on scheduler behavior for the rx test.

---
 ...DefaultListProvider.kt => ListProvider.kt} | 14 ++-
 .../test/java/polyadapter/ListProviderTest.kt | 97 +++++++++++++++++++
 provider-rxjava2/build.gradle                 |  1 -
 .../polyadapter/provider/RxListProvider.kt    |  8 +-
 .../provider/RxListProviderTest.kt            | 48 +++------
 5 files changed, 128 insertions(+), 40 deletions(-)
 rename core/src/main/java/polyadapter/{DefaultListProvider.kt => ListProvider.kt} (86%)
 create mode 100644 core/src/test/java/polyadapter/ListProviderTest.kt

diff --git a/core/src/main/java/polyadapter/DefaultListProvider.kt b/core/src/main/java/polyadapter/ListProvider.kt
similarity index 86%
rename from core/src/main/java/polyadapter/DefaultListProvider.kt
rename to core/src/main/java/polyadapter/ListProvider.kt
index c45f374..57fde0c 100644
--- a/core/src/main/java/polyadapter/DefaultListProvider.kt
+++ b/core/src/main/java/polyadapter/ListProvider.kt
@@ -1,13 +1,14 @@
 package polyadapter
 
 import android.os.Looper
+import android.util.Log
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 
 /**
  * Default list provider encapsulates the basic flow for data swapping
  */
-class DefaultListProvider(
+class ListProvider(
     defaultItems: List<Any>
 ) : PolyAdapter.ItemProvider {
 
@@ -30,6 +31,12 @@ class DefaultListProvider(
   fun updateItems(newItems: List<Any>): () -> (() -> Unit) {
     val oldList = items
     return {
+      if (onMainThread())
+        Log.w(
+            "ListProvider",
+            "DiffResult processing should be ran on a background thread to avoid blocking the main thread."
+        )
+
       val diffResult = DiffUtil.calculateDiff(object : DiffUtil.Callback() {
         override fun getOldListSize() = oldList.size
 
@@ -46,7 +53,7 @@ class DefaultListProvider(
       }, true)
 
       val swapDataAndDispatchDiffResult: () -> Unit = {
-        if (Looper.myLooper() != Looper.getMainLooper())
+        if (!onMainThread())
           throw IllegalStateException("Data swap and diffResult dispatching must be called from the main thread")
         items = newItems
         diffResult.dispatchUpdatesTo(listUpdateCallback)
@@ -55,4 +62,7 @@ class DefaultListProvider(
       swapDataAndDispatchDiffResult
     }
   }
+
+  private fun onMainThread() =
+      Looper.myLooper() == Looper.getMainLooper()
 }
\ No newline at end of file
diff --git a/core/src/test/java/polyadapter/ListProviderTest.kt b/core/src/test/java/polyadapter/ListProviderTest.kt
new file mode 100644
index 0000000..3bd94ea
--- /dev/null
+++ b/core/src/test/java/polyadapter/ListProviderTest.kt
@@ -0,0 +1,97 @@
+package polyadapter
+
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListUpdateCallback
+import com.google.common.truth.Truth
+import org.junit.Test
+
+class ListProviderTest {
+  @Test
+  fun `diff calls delegated to attached item callback`() {
+    val provider = ListProvider(listOf(1, 2, 3))
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+    provider.updateItems(listOf(1, 2, 3))()
+
+    Truth.assertThat(itemCallback.itemSameInvocations).hasSize(6)
+    Truth.assertThat(itemCallback.contentsSameInvocations).hasSize(3)
+    Truth.assertThat(itemCallback.changePayloadInvocations).isEmpty()
+  }
+
+  @Test
+  fun `diff results delegated to attached list update callback`() {
+    val provider = ListProvider(listOf(1, 2, 3))
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+    provider.updateItems(listOf(3, 2, 1))()()
+
+    Truth.assertThat(listCallback.movedInvocations).hasSize(2)
+  }
+
+  @Test
+  fun `diff results and data not applied until effector is invoked`() {
+    val provider = ListProvider(listOf(1, 2, 3))
+    val listCallback = ListCallbackFake()
+    val itemCallback = ItemCallbackFake()
+    provider.onAttach(listCallback, itemCallback)
+
+
+    val effector = provider.updateItems(listOf(3, 2, 1))()
+
+    Truth.assertThat(listCallback.totalInvocations).isEqualTo(0)
+    effector()
+    Truth.assertThat(listCallback.totalInvocations).isGreaterThan(0)
+  }
+}
+
+class ItemCallbackFake : DiffUtil.ItemCallback<Any>() {
+  val itemSameInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun areItemsTheSame(oldItem: Any, newItem: Any): Boolean {
+    itemSameInvocations.add(oldItem to newItem)
+    return oldItem === newItem
+  }
+
+  val contentsSameInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun areContentsTheSame(oldItem: Any, newItem: Any): Boolean {
+    contentsSameInvocations.add(oldItem to newItem)
+    return oldItem == newItem
+  }
+
+  val changePayloadInvocations = mutableListOf<Pair<Any, Any>>()
+  override fun getChangePayload(oldItem: Any, newItem: Any): Any? {
+    changePayloadInvocations.add(oldItem to newItem)
+    return super.getChangePayload(oldItem, newItem)
+  }
+}
+
+class ListCallbackFake : ListUpdateCallback {
+  val totalInvocations: Int
+    get() = changedInvocations.size +
+        movedInvocations.size +
+        insertedInvocations.size +
+        removedInvocations.size
+
+  val changedInvocations = mutableListOf<Triple<Int, Int, Any?>>()
+  override fun onChanged(position: Int, count: Int, payload: Any?) {
+    changedInvocations.add(Triple(position, count, payload))
+  }
+
+  val movedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onMoved(fromPosition: Int, toPosition: Int) {
+    movedInvocations.add(fromPosition to toPosition)
+  }
+
+  val insertedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onInserted(position: Int, count: Int) {
+    insertedInvocations.add(position to count)
+  }
+
+  val removedInvocations = mutableListOf<Pair<Int, Int>>()
+  override fun onRemoved(position: Int, count: Int) {
+    removedInvocations.add(position to count)
+  }
+}
\ No newline at end of file
diff --git a/provider-rxjava2/build.gradle b/provider-rxjava2/build.gradle
index 77a2238..e2d4cb0 100644
--- a/provider-rxjava2/build.gradle
+++ b/provider-rxjava2/build.gradle
@@ -8,5 +8,4 @@ apply from: "../bintray.gradle"
 dependencies {
     api(project(":core"))
     api('io.reactivex.rxjava2:rxandroid:2.1.0')
-    testImplementation('junit:junit:4.12')
 }
\ No newline at end of file
diff --git a/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
index bc9a3cb..4a0a136 100644
--- a/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
+++ b/provider-rxjava2/src/main/java/polyadapter/provider/RxListProvider.kt
@@ -6,7 +6,7 @@ import io.reactivex.ObservableTransformer
 import io.reactivex.Scheduler
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import polyadapter.DefaultListProvider
+import polyadapter.ListProvider
 import polyadapter.PolyAdapter
 
 /**
@@ -20,13 +20,13 @@ class RxListProvider(
     defaultItems: List<Any> = emptyList(),
     private val workScheduler: Scheduler = Schedulers.computation(),
     private val mainScheduler: Scheduler = AndroidSchedulers.mainThread(),
-    private val defaultProvider: DefaultListProvider = DefaultListProvider(defaultItems)
-) : PolyAdapter.ItemProvider by defaultProvider,
+    private val listProvider: ListProvider = ListProvider(defaultItems)
+) : PolyAdapter.ItemProvider by listProvider,
     ObservableTransformer<List<Any>, () -> Unit> {
 
   override fun apply(upstream: Observable<List<Any>>): ObservableSource<() -> Unit> {
     return upstream.switchMap { newList ->
-      val diffWork = defaultProvider.updateItems(newList)
+      val diffWork = listProvider.updateItems(newList)
       Observable.fromCallable { diffWork() }
           .subscribeOn(workScheduler)
           .observeOn(mainScheduler)
diff --git a/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt b/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt
index 25af8b0..a8659ea 100644
--- a/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt
+++ b/provider-rxjava2/src/test/java/polyadapter/provider/RxListProviderTest.kt
@@ -4,55 +4,37 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Observable
+import io.reactivex.Scheduler
 import io.reactivex.schedulers.Schedulers
 import org.junit.Test
 
 class RxListProviderTest {
-  @Test
-  fun `diff calls delegated to attached item callback`() {
-    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
-    val listCallback = ListCallbackFake()
-    val itemCallback = ItemCallbackFake()
-    provider.onAttach(listCallback, itemCallback)
 
-    Observable.just(listOf(1, 2, 3))
-        .compose(provider)
-        .blockingFirst()
-
-    assertThat(itemCallback.itemSameInvocations).hasSize(6)
-    assertThat(itemCallback.contentsSameInvocations).hasSize(3)
-    assertThat(itemCallback.changePayloadInvocations).isEmpty()
-  }
+  private val workScheduler = CountingSchedulerWrapper(Schedulers.trampoline())
+  private val mainScheduler = CountingSchedulerWrapper(Schedulers.trampoline())
 
   @Test
-  fun `diff results delegated to attached list update callback`() {
-    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
+  fun `schedulers invoked as expected`() {
+    val provider = RxListProvider(listOf(1, 2, 3), workScheduler, mainScheduler)
     val listCallback = ListCallbackFake()
     val itemCallback = ItemCallbackFake()
     provider.onAttach(listCallback, itemCallback)
 
+    assertThat(workScheduler.workersCreated).isEqualTo(0)
+    assertThat(mainScheduler.workersCreated).isEqualTo(0)
     Observable.just(listOf(3, 2, 1))
         .compose(provider)
         .blockingFirst()
-        .invoke()
-
-    assertThat(listCallback.movedInvocations).hasSize(2)
+    assertThat(workScheduler.workersCreated).isEqualTo(1)
+    assertThat(mainScheduler.workersCreated).isEqualTo(1)
   }
+}
 
-  @Test
-  fun `diff results and data not applied until effector is invoked`() {
-    val provider = RxListProvider(listOf(1, 2, 3), Schedulers.trampoline(), Schedulers.trampoline())
-    val listCallback = ListCallbackFake()
-    val itemCallback = ItemCallbackFake()
-    provider.onAttach(listCallback, itemCallback)
-
-    val effector = Observable.just(listOf(3, 2, 1))
-        .compose(provider)
-        .blockingFirst()
-
-    assertThat(listCallback.totalInvocations).isEqualTo(0)
-    effector()
-    assertThat(listCallback.totalInvocations).isGreaterThan(0)
+class CountingSchedulerWrapper(private val actual: Scheduler) : Scheduler() {
+  var workersCreated = 0L
+  override fun createWorker(): Worker {
+    workersCreated++
+    return actual.createWorker()
   }
 }
 

From 55640cb6c447fbde139cba947837654679192a5c Mon Sep 17 00:00:00 2001
From: Trevor Jones <trevorjones141@gmail.com>
Date: Mon, 8 Apr 2019 10:53:37 -0600
Subject: [PATCH 5/5] update readme and gradle wrapper

---
 CHANGELOG.md                                  |   8 +-
 README.md                                     | 102 ++++++++++++------
 .../java/polyadapter/sample/SampleActivity.kt |  26 +++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |  18 +++-
 gradlew.bat                                   |  18 +++-
 7 files changed, 126 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44fff12..123f635 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,9 @@
 ## Changelog
 
-### 0.6.0
+### 0.6.0 - BREAKING CHANGES
+- Module breakup and artifact id changes
 - Move adapter configuration entirely into constructor
-- Relocate specific item providers into separate modules
-- Remove androidx list differ impl's
-TODO(readme updates)
-TODO(publishing configuration updates)
+- Remove androidx list differ provider impl's. Threading is on the consumer now.
 
 ### 0.5.0
 - Optional RxAndroid Dependency to provide an impl of an RX based diff processing list provider
diff --git a/README.md b/README.md
index 3c8c7be..d4569b4 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,12 @@ A composable recycler view adapter.
 
 ## Installation
 
-Available via [jcenter](https://bintray.com/trevorjones141/maven/PolyAdapter-Android) or [jitpack.io](https://jitpack.io/#trevjonez/polyadapter-android):
+Available via [jcenter](https://bintray.com/trevorjones141/maven/PolyAdapter-Android)
 
 from jcenter: 
 ```groovy
-implementation 'polyadapter:core:0.5.0'
-```
-
-from jitpack:
-```groovy
- implementation 'com.github.trevjonez.polyadapter-android:core:0.5.0'
+implementation 'com.trevjonez.polyadapter:core:$polyAdapterVersion'
+implementation 'com.trevjonez.polyadapter:provider-rxjava2:$polyAdapterVersion'
 ```
 
 ## Usage
@@ -26,34 +22,87 @@ To use the library are three core types you need to be aware of.
 1. `PolyAdapter.ItemProvider`
 2. `PolyAdapter.BindingDelegate`
 
-In order to create a `PolyAdapter` you need to provide the constructor with a `PolyAdapter.ItemProvider` implementation.
-You can use one of the provided ItemProvider implementations or create your own.
+The recommended way to consume `PolyAdapter` is via [dagger.](https://google.github.io/dagger/)
 
-`AsyncListProvider` operates on `List<Any>`:
+Provide a binding for `ItemProvider` and utilize map multi-bindings for `Delegates`:
 ```kotlin
-val adapter = PolyAdapter(AsyncListProvider())
+@Module(includes = [
+  DelegatesModule::class,
+  ProviderModule::class
+])
+abstract class PolyAdapterConfigModule
+
+@Module
+abstract class DelegatesModule {
+  @Binds
+  @IntoMap
+  @ClassKey(CategoryTitle::class)
+  abstract fun categoryDelegate(impl: CategoryDelegate):
+      PolyAdapter.BindingDelegate<*, *>
+
+  @Binds
+  @IntoMap
+  @ClassKey(DividerLine::class)
+  abstract fun dividerDelegate(impl: DividerDelegate):
+      PolyAdapter.BindingDelegate<*, *>
+
+  @Binds
+  @IntoMap
+  @ClassKey(Movie::class)
+  abstract fun movieDelegate(impl: MovieDelegate):
+      PolyAdapter.BindingDelegate<*, *>
+
+  @Binds
+  abstract fun listProvider(impl: RxListProvider):
+      PolyAdapter.ItemProvider
+}
+
+@Module
+class ProviderModule {
+  @Provides
+  @ActivityScope
+  fun rxProvider() = RxListProvider()
+}
 ```
 
-Then you can add your `PolyAdapter.BindingDelegate` implementations to your new adapter:
+Request an injection of a `PolyAdapter` instance and pass it to your recycler:
 ```kotlin
-val polyAdapter = PolyAdapter(AsyncListProvider()).apply {
-  addDelegate(FooDelegate())
-  addDelegate(BarDelegate())
-}
+
+@Inject lateinit var polyAdapter: PolyAdapter
+
+[...]
 
 recyclerView.apply {
   adapter = polyAdapter
 }
+
 ```
 
-After that your adapter is ready to serve items via the ItemProvider we injected it with.
-This can be done either directly through the item provider's concrete api or one of the
-extension methods provided in the main library to make it feel a bit more familiar.
+To update the list contents send updates via the `ItemProvider` implementation.
+`RxListProvider`:
+```kotlin
+@Inject lateinit var itemProvider: RxListProvider
+
+[...]
+
+someLiveDataSource
+  .compose(itemProvider)
+  .subscribe { applyNewData ->
+    applyNewData()
+  }
+```
 
+`ListProvider`:
 ```kotlin
-someLiveDataSource.subscribe { listItems ->
-  adapter.updateList(listItems)
-}
+@Inject lateinit var itemProvider: ListProvider
+
+[...]
+
+val diffWork = itemProvider.updateItems(newItems)
+
+val applyNewData = diffWork() //do this from background thread
+
+applyNewData() //do this on main thread
 ```
 
 #### Binding Delegate's
@@ -142,15 +191,6 @@ method that includes payloads that are returned from your `DiffUtil.ItemCallback
 
 `PolyAdapter.OnViewDetachedDelegate` - Adds `onDetach`
 
-#### RxListProvider
-
-An RxJava based `RxListProvider` is also available. You can compose it
-on an observable of your source data and will transform your data into
-a ready to use function. Call the resulting function from the
-main thread to apply the diff and swap the data set, this also eliminates
-the need for a content changed callback as seen in `AsyncListProvider`.
-The transforming nature also keep disposal management simple.
-
 ## License
 
     Copyright 2018 Trevor Jones
diff --git a/app/src/main/java/polyadapter/sample/SampleActivity.kt b/app/src/main/java/polyadapter/sample/SampleActivity.kt
index b843eb2..b1f87b7 100644
--- a/app/src/main/java/polyadapter/sample/SampleActivity.kt
+++ b/app/src/main/java/polyadapter/sample/SampleActivity.kt
@@ -57,40 +57,48 @@ class SampleActivity : DaggerAppCompatActivity() {
     super.onDestroy()
   }
 
+  @Module(includes = [
+    DelegatesModule::class,
+    ProviderModule::class
+  ])
+  abstract class PolyAdapterConfigModule
+
   @Module
   abstract class DelegatesModule {
     @Binds
     @IntoMap
     @ClassKey(CategoryTitle::class)
-    abstract fun categoryDelegate(impl: CategoryDelegate): PolyAdapter.BindingDelegate<*, *>
+    abstract fun categoryDelegate(impl: CategoryDelegate):
+        PolyAdapter.BindingDelegate<*, *>
 
     @Binds
     @IntoMap
     @ClassKey(DividerLine::class)
-    abstract fun dividerDelegate(impl: DividerDelegate): PolyAdapter.BindingDelegate<*, *>
+    abstract fun dividerDelegate(impl: DividerDelegate):
+        PolyAdapter.BindingDelegate<*, *>
 
     @Binds
     @IntoMap
     @ClassKey(Movie::class)
-    abstract fun movieDelegate(impl: MovieDelegate): PolyAdapter.BindingDelegate<*, *>
+    abstract fun movieDelegate(impl: MovieDelegate):
+        PolyAdapter.BindingDelegate<*, *>
 
     @Binds
-    abstract fun listProvider(impl: RxListProvider): PolyAdapter.ItemProvider
+    abstract fun listProvider(impl: RxListProvider):
+        PolyAdapter.ItemProvider
   }
 
   @Module
-  class ProvidesModule {
+  class ProviderModule {
     @Provides
     @ActivityScope
-    fun rxProvider(): RxListProvider {
-      return RxListProvider()
-    }
+    fun rxProvider() = RxListProvider()
   }
 
   @Module
   abstract class BindingModule {
     @ActivityScope
-    @ContributesAndroidInjector(modules = [DelegatesModule::class, ProvidesModule::class])
+    @ContributesAndroidInjector(modules = [PolyAdapterConfigModule::class])
     abstract fun contributeInjector(): SampleActivity
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 3320
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
R^3$e5zsN`FCc2S<;XjD90!#n^

delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b8a51fe..51fb1c4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708f..b0d6d0a 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# 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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 6d57edc..9991c50 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome