chore: update Scala to version 2.13.6 (#633)

* Scala 2.13.1 -> 2.13.6
* Sbt 1.3.8 -> 1.5.2

Author: aallam

.bsp/sbt.json

@@ -0,0 +1 @@
+{"name":"sbt","version":"1.5.2","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/Users/mouaad.aallam/.sdkman/candidates/java/11.0.10.hs-adpt/bin/java","-Xms100m","-Xmx100m","-classpath","/Users/mouaad.aallam/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7628.21/IntelliJ IDEA.app.plugins/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp","--sbt-launch-jar=/Users/mouaad.aallam/Library/Application%20Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/211.7628.21/IntelliJ%20IDEA.app.plugins/Scala/launcher/sbt-launch.jar"]}

build.sbt

@@ -1,11 +1,11 @@
 organization := "com.algolia"
 name := "algoliasearch-scala"
 description := "Scala client for Algolia Search API"
-crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1")
-scalaVersion := "2.13.1"
-testOptions in Test += Tests.Argument("-P10")
+crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.6")
+scalaVersion := "2.13.6"
+Test / testOptions += Tests.Argument("-P10")
 publishMavenStyle := true
-publishArtifact in Test := false
+Test / publishArtifact := false
 licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
 homepage := Some(url("https://github.com/algolia/algoliasearch-client-scala/"))
 scmInfo := Some(
@@ -32,7 +32,7 @@ lazy val root = project
   .settings(
     buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
     buildInfoPackage := "algolia",
-    evictionWarningOptions in update := EvictionWarningOptions.default
+    update / evictionWarningOptions := EvictionWarningOptions.default
       .withWarnTransitiveEvictions(false)
       .withWarnDirectEvictions(false)
       .withWarnScalaVersionEviction(false)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.5.2

src/main/scala/algolia/dsl/GetDsl.scala

@@ -77,7 +77,7 @@ trait GetDsl {
     def personalizationRecommendationStrategy() =
       GetRecommendationStrategyDefinition()
 
-    def dictionarySettings(): GetSettingsDictionaryDefinition =
+    def dictionarySettings: GetSettingsDictionaryDefinition =
       GetSettingsDictionaryDefinition()
 
   }

src/test/scala/algolia/integration/LogIntegrationTest.scala

@@ -25,25 +25,24 @@
 
 package algolia.integration
 
-import algolia.responses.{LogType, Logs}
-import algolia.AlgoliaTest
 import algolia.AlgoliaDsl._
+import algolia.AlgoliaTest
+import algolia.responses.LogType
 
-import scala.concurrent.Future
+import scala.concurrent.duration.DurationInt
+import scala.concurrent.{Await, Future}
+import scala.language.postfixOps
 
 class LogIntegrationTest extends AlgoliaTest {
 
-  val indexName: String = getTestIndexName("indexToSearch")
-
   it("should get the logs") {
-    val indexRes = AlgoliaTest.client.execute {
-      index into indexName `object` Obj("1")
-    }
-
-    taskShouldBeCreatedAndWaitForIt(indexRes, indexName)
+    val listIndices1 = AlgoliaTest.client.execute { list indexes }
+    val listIndices2 = AlgoliaTest.client.execute { list indexes }
+    val futures = Future.sequence(Seq(listIndices1, listIndices2))
+    Await.result(futures, 10 seconds)
 
     val getLogsRes = AlgoliaTest.client.execute {
-      getLogs offset 0 length 10 `type` LogType.all
+      getLogs offset 0 length 2 `type` LogType.all
     }
 
     whenReady(getLogsRes) { r =>

src/test/scala/algolia/integration/MCMIntegrationTest.scala

@@ -27,19 +27,19 @@ package algolia.integration
 
 import java.time.format.DateTimeFormatter
 import java.time.{LocalDateTime, ZoneOffset, ZonedDateTime}
-
 import algolia.AlgoliaDsl._
 import algolia.inputs.{UserIDAssignment, UserIDsAssignment}
 import algolia.responses.{ClusterData, UserDataWithCluster}
 import algolia.{
   AlgoliaClient,
   AlgoliaClientConfiguration,
+  AlgoliaClientException,
   AlgoliaHttpClient,
   AlgoliaTest,
   SkipInCI
 }
-import org.scalatest.Ignore
 
+import scala.annotation.tailrec
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
 import scala.language.postfixOps
@@ -119,7 +119,7 @@ class MCMIntegrationTest extends AlgoliaTest {
         10 seconds
       )
 
-    Thread.sleep(3000)
+    waitUserID(mcmClient, userID)
 
     val hits = Await
       .result(
@@ -132,10 +132,38 @@ class MCMIntegrationTest extends AlgoliaTest {
       hits.exists(_.userID == u) should be(true)
     )
 
-    val mappingFuture = mcmClient execute (has pendingMappings)
+    removeUserId(mcmClient, userID)
+
+    val mappingFuture = mcmClient execute has.pendingMappings()
     noException should be thrownBy whenReady(mappingFuture) { res =>
       res.pending should not be None
     }
 
   }
+
+  @tailrec
+  final def waitUserID(client: AlgoliaClient, id: String): Unit = {
+    try Await.result(client.execute(get userID id), 10 seconds)
+    catch {
+      case e: AlgoliaClientException =>
+        if (e.getMessage.contains("Mapping does not exist for this userID")) {
+          Thread.sleep(1000)
+          waitUserID(client, id)
+        }
+    }
+  }
+
+  @tailrec
+  final def removeUserId(client: AlgoliaClient, id: String): Unit = {
+    try Await.result(client.execute(remove userID id), 10 seconds)
+    catch {
+      case e: AlgoliaClientException =>
+        if (e.getMessage.contains(
+              "Another mapping operation is already running for this userID"
+            )) {
+          Thread.sleep(1000)
+          removeUserId(client, id)
+        }
+    }
+  }
 }

src/test/scala/algolia/integration/RecommendationIntegrationTest.scala

@@ -38,7 +38,7 @@ class RecommendationIntegrationTest extends AlgoliaTest {
 
     it("should get personalization strategy without failing") {
       val task: Future[GetStrategyResponse] = AlgoliaTest.client.execute {
-        get personalizationRecommendationStrategy
+        get.personalizationRecommendationStrategy()
       }
 
       whenReady(task) { strategy =>