Merge branch 'release/1.1.0'

Author: fed933

library/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'kotlin'
 apply plugin: 'maven-publish'
 
+version = '1.1.0'
+
 dependencies {
     def couchbaseLite = "com.couchbase.lite:couchbase-lite-java:2.7.0"
 
@@ -18,7 +20,7 @@ def mavPluginVersion = '1.0.3'
 apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
 
 project.ext {
-    mavDevelopers = ["damiano": "Damiano Giusti"]
+    mavDevelopers = ["damiano": "Damiano Giusti", "federico": "Federico Monti"]
     mavSiteUrl = "https://github.com/MOLO17/couchbase-lite-kotlin"
     mavGitUrl = mavSiteUrl + '.git'
     mavProjectName = 'Couchbase Lite Kotlin'

library/src/main/java/com/molo17/couchbase/lite/DatabaseExtensions.kt

@@ -20,6 +20,7 @@ import com.couchbase.lite.Database
 import com.couchbase.lite.DatabaseChange
 import com.couchbase.lite.DocumentChange
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 
@@ -29,7 +30,7 @@ import kotlinx.coroutines.flow.callbackFlow
  * @see Database.addChangeListener
  */
 fun Database.changesFlow(): Flow<DatabaseChange> = callbackFlow {
-    val token = addChangeListener { change -> offer(change) }
+    val token = addChangeListener { change -> sendBlocking(change) }
     awaitClose { removeChangeListener(token) }
 }
 
@@ -39,7 +40,7 @@ fun Database.changesFlow(): Flow<DatabaseChange> = callbackFlow {
  * @see Database.addDocumentChangeListener
  */
 fun Database.documentChangesFlow(documentId: String): Flow<DocumentChange> = callbackFlow {
-    val token = addDocumentChangeListener(documentId) { change -> offer(change) }
+    val token = addDocumentChangeListener(documentId) { change -> sendBlocking(change) }
     awaitClose { removeChangeListener(token) }
 }
 

library/src/main/java/com/molo17/couchbase/lite/QueryExtensions.kt

@@ -20,6 +20,7 @@ import com.couchbase.lite.Query
 import com.couchbase.lite.QueryChange
 import com.couchbase.lite.ResultSet
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.map
@@ -53,7 +54,7 @@ fun Query.asFlow(): Flow<ResultSet> = asQueryFlow().map { it.results }
  * @param factory the lambda used for creating object instances.
  */
 fun <T : Any> Query.asObjectsFlow(
-    factory: (Map<String, Any?>) -> T
+    factory: (Map<String, Any?>) -> T?
 ): Flow<List<T>> = asQueryFlow().map { queryChange -> queryChange.results.toObjects(factory) }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -63,7 +64,7 @@ fun <T : Any> Query.asObjectsFlow(
 private fun Query.asQueryFlow(): Flow<QueryChange> = callbackFlow {
     val token = addChangeListener { queryChange ->
         if (queryChange.error == null) {
-            offer(queryChange)
+            sendBlocking(queryChange)
         } else {
             throw queryChange.error
         }

library/src/main/java/com/molo17/couchbase/lite/ReplicatorExtensions.kt

@@ -23,6 +23,7 @@ import com.couchbase.lite.DocumentReplication
 import com.couchbase.lite.Replicator
 import com.couchbase.lite.ReplicatorChange
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 
@@ -32,7 +33,7 @@ import kotlinx.coroutines.flow.callbackFlow
  * @see Replicator.addChangeListener
  */
 fun Replicator.changesFlow(): Flow<ReplicatorChange> = callbackFlow {
-    val token = addChangeListener { change -> offer(change) }
+    val token = addChangeListener { change -> sendBlocking(change) }
     awaitClose { removeChangeListener(token) }
 }
 
@@ -42,7 +43,7 @@ fun Replicator.changesFlow(): Flow<ReplicatorChange> = callbackFlow {
  * @see Replicator.addDocumentReplicationListener
  */
 fun Replicator.documentReplicationFlow(): Flow<DocumentReplication> = callbackFlow {
-    val token = addDocumentReplicationListener { replication -> offer(replication) }
+    val token = addDocumentReplicationListener { replication -> sendBlocking(replication) }
     awaitClose { removeChangeListener(token) }
 }
 

library/src/main/java/com/molo17/couchbase/lite/ResultSetExtensions.kt

@@ -39,7 +39,7 @@ import com.couchbase.lite.ResultSet
  * @param factory lambda used for creating an object instance
  * @return a [List] of objects of type [T]
  */
-inline fun <T : Any> ResultSet.toObjects(factory: (Map<String, Any?>) -> T): List<T> =
+inline fun <T : Any> ResultSet.toObjects(factory: (Map<String, Any?>) -> T?): List<T> =
     mapNotNull { result ->
         result.run {