Release 2.10.0

.gitignore

@@ -5,6 +5,7 @@
 *.iml
 local.properties
 *.hprof
+.bundle/
 
 # fastlane
 **/fastlane/report.xml
@@ -14,3 +15,4 @@ local.properties
 
 # bitrise
 .bitrise.yml
+bitrise.yml

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.10.0
+
+### Added
+- Integration of `InstantSearch Insights` library
+- Add `retry` to paging data sources
+
 # 2.9.0
 
 ### Added

Gemfile.lock

@@ -175,4 +175,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

build.gradle.kts

@@ -54,3 +54,7 @@ subprojects {
 tasks.withType<Test> {
     maxParallelForks = Runtime.getRuntime().availableProcessors().minus(1).coerceAtLeast(1)
 }
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.buildDir)
+}

buildSrc/src/main/kotlin/Library.kt

@@ -4,5 +4,5 @@ object Library: Dependency {
 
     override val group = "com.algolia"
     override val artifact = "instantsearch-android"
-    override val version = "2.9.0"
+    override val version = "2.10.0"
 }

buildSrc/src/main/kotlin/dependency/lib/Work.kt

@@ -0,0 +1,10 @@
+package dependency.lib
+
+import dependency.Dependency
+
+object Work : Dependency {
+
+    override val group = "androidx.work"
+    override val artifact = "work"
+    override val version = "2.5.0"
+}

buildSrc/src/main/kotlin/dependency/network/AlgoliaClient.kt

@@ -2,7 +2,6 @@ package dependency.network
 
 import dependency.Dependency
 
-
 object AlgoliaClient : Dependency {
 
     override val group = "com.algolia"

buildSrc/src/main/kotlin/dependency/plugin/AndroidTools.kt

@@ -6,5 +6,5 @@ object AndroidTools : Dependency {
 
     override val group = "com.android.tools.build"
     override val artifact = "gradle"
-    override val version = "4.0.1"
+    override val version = "4.0.2"
 }

buildSrc/src/main/kotlin/dependency/plugin/GradleMavenPublish.kt

@@ -6,5 +6,5 @@ object GradleMavenPublish : Dependency {
 
     override val group = "com.vanniktech"
     override val artifact = "gradle-maven-publish-plugin"
-    override val version = "0.13.0"
+    override val version = "0.14.2"
 }

buildSrc/src/main/kotlin/dependency/test/AndroidTestExt.kt

@@ -2,7 +2,6 @@ package dependency.test
 
 import dependency.Dependency
 
-
 object AndroidTestExt : Dependency {
 
     override val group = "androidx.test.ext"

buildSrc/src/main/kotlin/dependency/test/AndroidTestRunner.kt

@@ -7,4 +7,4 @@ object AndroidTestRunner: Dependency {
     override val group = "androidx.test"
     override val artifact = "runner"
     override val version = "1.2.0"
-}
+}

buildSrc/src/main/kotlin/dependency/test/Mockk.kt

@@ -0,0 +1,10 @@
+package dependency.test
+
+import dependency.Dependency
+
+object Mockk : Dependency {
+
+    override val group = "io.mockk"
+    override val artifact = "mockk"
+    override val version = "1.10.6"
+}

buildSrc/src/main/kotlin/dependency/test/Robolectric.kt

@@ -2,10 +2,9 @@ package dependency.test
 
 import dependency.Dependency
 
-
 object Robolectric : Dependency {
 
     override val group = "org.robolectric"
     override val artifact = "robolectric"
-    override val version = "4.3.1"
-}
+    override val version = "4.5.1"
+}

buildSrc/src/main/kotlin/dependency/util/AtomicFu.kt

@@ -2,7 +2,6 @@ package dependency.util
 
 import dependency.Dependency
 
-
 object AtomicFu: Dependency {
 
     override val group = "org.jetbrains.kotlinx"

gradle.properties

@@ -1,6 +1,5 @@
 kotlin.code.style=official
 
-android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.parallel=true
 
@@ -19,5 +18,3 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=algolia
 POM_DEVELOPER_NAME=The Algolia Team
 POM_DEVELOPER_EMAIL=[email protected]
-
-RELEASE_SIGNING_ENABLED=false

instantsearch-android-core/build.gradle.kts

@@ -5,13 +5,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm")
     id("java-library")
+    id ("com.vanniktech.maven.publish")
 }
 
-apply(from = "../gradle/gradle-maven-publish.gradle")
-
-group = Library.group
-version = Library.version
-
 sourceSets {
     main {
         java.srcDirs("$buildDir/generated/sources/templates/kotlin/main")

instantsearch-android/build.gradle.kts

@@ -1,24 +1,14 @@
-import dependency.network.AlgoliaClient
-import dependency.network.Coroutines
-import dependency.network.Ktor
-import dependency.test.AndroidTestExt
-import dependency.test.AndroidTestRunner
-import dependency.test.Robolectric
-import dependency.ui.AndroidCore
-import dependency.ui.AppCompat
-import dependency.ui.MaterialDesign
-import dependency.ui.Paging
-import dependency.ui.RecyclerView
-import dependency.ui.SwipeRefreshLayout
+import dependency.network.*
+import dependency.test.*
+import dependency.ui.*
 
 plugins {
     id("com.android.library")
     id("kotlin-android")
     id("kotlinx-serialization")
+    id("com.vanniktech.maven.publish")
 }
 
-apply(from = "../gradle/gradle-maven-publish.gradle")
-
 android {
     compileSdkVersion(30)
 
@@ -42,7 +32,6 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
         freeCompilerArgs += listOf(
-            "-Xexplicit-api=warning",
             "-Xopt-in=kotlin.RequiresOptIn",
             "-Xopt-in=com.algolia.search.ExperimentalAlgoliaClientAPI"
         )
@@ -56,11 +45,15 @@ android {
     }
 }
 
-group = Library.group
-version = Library.version
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    if ("UnitTest" !in name) {
+        kotlinOptions.freeCompilerArgs += "-Xexplicit-api=strict"
+    }
+}
 
 dependencies {
     api(project(":instantsearch-android-core"))
+    api(project(":instantsearch-insights"))
     api(AlgoliaClient())
     api(Ktor("client-okhttp"))
     api(AndroidCore("ktx"))
@@ -77,4 +70,6 @@ dependencies {
     testImplementation(AndroidTestRunner())
     testImplementation(AndroidTestExt())
     testImplementation(Robolectric())
+    testImplementation(Coroutines("test"))
+    testImplementation(Mockk())
 }

instantsearch-android/src/main/java/com/algolia/instantsearch/helper/android/list/RetryablePageKeyedDataSource.kt

@@ -0,0 +1,36 @@
+package com.algolia.instantsearch.helper.android.list
+
+import androidx.paging.PageKeyedDataSource
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.asExecutor
+import kotlinx.coroutines.withContext
+
+/**
+ * A [PageKeyedDataSource] with retry capability.
+ */
+public abstract class RetryablePageKeyedDataSource<Key, Value>(private val retryDispatcher: CoroutineDispatcher) :
+    PageKeyedDataSource<Key, Value>() {
+
+    internal var retry: (() -> Any)? = null
+
+    public suspend fun retry() {
+        retry?.let { prevRetry ->
+            retry = null
+            withContext(retryDispatcher) {
+                prevRetry()
+            }
+        }
+    }
+
+    /**
+     * Retries the latest call.
+     */
+    public fun retryAsync() {
+        retry?.let { prevRetry ->
+            retry = null
+            retryDispatcher.asExecutor().execute {
+                prevRetry()
+            }
+        }
+    }
+}

instantsearch-android/src/main/java/com/algolia/instantsearch/helper/android/list/SearcherMultipleIndexDataSource.kt

@@ -1,29 +1,38 @@
 package com.algolia.instantsearch.helper.android.list
 
 import androidx.paging.DataSource
-import androidx.paging.PageKeyedDataSource
 import com.algolia.instantsearch.helper.searcher.SearcherMultipleIndex
 import com.algolia.search.model.multipleindex.IndexQuery
 import com.algolia.search.model.response.ResponseSearch
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 
 public class SearcherMultipleIndexDataSource<T>(
     private val searcher: SearcherMultipleIndex,
     private val indexQuery: IndexQuery,
     private val triggerSearchForQueries: ((List<IndexQuery>) -> Boolean) = { true },
+    retryDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private val transformer: (ResponseSearch.Hit) -> T,
-) : PageKeyedDataSource<Int, T>() {
+) : RetryablePageKeyedDataSource<Int, T>(retryDispatcher) {
 
     public class Factory<T>(
         private val searcher: SearcherMultipleIndex,
         private val indexQuery: IndexQuery,
         private val triggerSearchForQueries: ((List<IndexQuery>) -> Boolean) = { true },
+        private val retryDispatcher: CoroutineDispatcher = Dispatchers.IO,
         private val transformer: (ResponseSearch.Hit) -> T,
     ) : DataSource.Factory<Int, T>() {
 
         override fun create(): DataSource<Int, T> {
-            return SearcherMultipleIndexDataSource(searcher, indexQuery, triggerSearchForQueries, transformer)
+            return SearcherMultipleIndexDataSource(
+                searcher = searcher,
+                indexQuery = indexQuery,
+                triggerSearchForQueries = triggerSearchForQueries,
+                transformer = transformer,
+                retryDispatcher = retryDispatcher
+            )
         }
     }
 
@@ -52,8 +61,10 @@ public class SearcherMultipleIndexDataSource<T>(
                     searcher.response.value = response
                     searcher.isLoading.value = false
                 }
+                retry = null
                 callback.onResult(result.hits.map(transformer), 0, result.nbHits, null, nextKey)
             } catch (throwable: Throwable) {
+                retry = { loadInitial(params, callback) }
                 resultError(throwable)
             }
         }
@@ -76,8 +87,10 @@ public class SearcherMultipleIndexDataSource<T>(
                     searcher.response.value = response
                     searcher.isLoading.value = false
                 }
+                retry = null
                 callback.onResult(result.hits.map(transformer), nextKey)
             } catch (throwable: Throwable) {
+                retry = { loadAfter(params, callback) }
                 resultError(throwable)
             }
         }