fix concurrency issue surrounding lazy delegate lookup/caching and di…

…ff util.
trevjonez · Apr 16, 2019 · 7384f44 · 7384f44
1 parent 200fe87
commit 7384f44
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+### 0.6.1
+- Synchronize Fix concurrency issue due to the lazy nature of delegate caching.
+
 ### 0.6.0 - BREAKING CHANGES
 - Module breakup and artifact id changes
 - Move adapter configuration entirely into constructor

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [ ![Download](https://api.bintray.com/packages/trevorjones141/maven/PolyAdapter-Android/images/download.svg) ](https://bintray.com/trevorjones141/maven/PolyAdapter-Android/_latestVersion)
 
-A composable recycler view adapter.
+A dagger centric recycler view adapter.
 
 ## Installation
 

diff --git a/core/src/main/java/polyadapter/PolyAdapter.kt b/core/src/main/java/polyadapter/PolyAdapter.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
-import androidx.collection.SimpleArrayMap
 import androidx.recyclerview.widget.AdapterListUpdateCallback
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -18,8 +18,8 @@ class PolyAdapter @Inject constructor(
     private val delegateFactories: Map<Class<*>, @JvmSuppressWildcards Provider<BindingDelegate<*, *>>>
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-  private val typeLookup = SimpleArrayMap<Class<*>, BindingDelegate<*, *>>()
-  private val layoutLookup = SimpleArrayMap<Int, BindingDelegate<*, *>>()
+  private val typeLookup = ConcurrentHashMap<Class<*>, BindingDelegate<*, *>>()
+  private val layoutLookup = ConcurrentHashMap<Int, BindingDelegate<*, *>>()
 
   init {
     itemProvider.onAttach(AdapterListUpdateCallback(this), PolyAdapterItemCallback())

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 group=com.trevjonez.polyadapter
-version=0.6.0
+version=0.6.1
 
-agpVersion=3.5.0-alpha10
-kotlinVersion=1.3.21
-daggerVersion=2.22
+agpVersion=3.5.0-alpha11
+kotlinVersion=1.3.30
+daggerVersion=2.22.1
 
 org.gradle.parallel=true
 org.gradle.caching=true