feat(scala): Add cross compilation to scala 2.11 and 2.12

algolia · Jul 19, 2017 · 35df1b5 · 35df1b5
1 parent 00519aa
commit 35df1b5
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: scala
 scala:
-- 2.11.7
+- 2.11.11
+- 2.12.2
 
 jdk:
   - oraclejdk8

diff --git a/build.sbt b/build.sbt
@@ -6,11 +6,11 @@ description := "Scala client for Algolia Search API"
 
 version := "1.23.0-SNAPSHOT"
 
-scalaVersion := "2.11.7"
+crossScalaVersions := Seq("2.11.11", "2.12.2")
 
-//Wait fix in sbt-coveralls
-ScoverageSbtPlugin.ScoverageKeys.coverageHighlighting := false //setting to true crashes the coverage
-//coverageEnabled := true
+scalaVersion := "2.12.2"
+
+coverageEnabled := true
 
 val asyncHttpClientVersion = "2.0.33"
 val json4sVersion = "3.5.2"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 //Coverage
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.2")
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
+addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
 
 //Release
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

diff --git a/src/test/scala/algolia/AlgoliaClientTest.scala b/src/test/scala/algolia/AlgoliaClientTest.scala
@@ -33,7 +33,6 @@ import algolia.http.{GET, HttpPayload}
 import algolia.objects.Query
 import algolia.responses.{Task, TaskStatus}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{ExecutionContext, Future}
 
 class AlgoliaClientTest extends AlgoliaTest {
@@ -57,7 +56,7 @@ class AlgoliaClientTest extends AlgoliaTest {
 
     it("should set user agent") {
       apiClient.userAgent should (startWith("Algolia for Scala (1.") and include("; JVM (1.8") and include(
-        "; Scala (2.11"))
+        "; Scala (2.1"))
     }
 
     it("should set Content-Type header") {

diff --git a/src/test/scala/algolia/AlgoliaTest.scala b/src/test/scala/algolia/AlgoliaTest.scala
@@ -32,7 +32,6 @@ import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.{Millis, Seconds, Span}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{ExecutionContext, Future}
 
 class AlgoliaTest
@@ -55,6 +54,8 @@ class AlgoliaTest
   implicit val patience =
     PatienceConfig(timeout = Span(30000, Seconds), interval = Span(500, Millis))
 
+  implicit val ec: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
+
   def taskShouldBeCreatedAndWaitForIt(task: Future[AlgoliaTask], index: String)(
       implicit ec: ExecutionContext): Unit = {
     val t: AlgoliaTask = whenReady(task) { result =>

diff --git a/src/test/scala/algolia/NetworkTest.scala b/src/test/scala/algolia/NetworkTest.scala
@@ -27,7 +27,6 @@ package algolia
 
 import algolia.AlgoliaDsl._
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
 class NetworkTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/AlgoliaClientIntegrationTest.scala b/src/test/scala/algolia/integration/AlgoliaClientIntegrationTest.scala
@@ -29,8 +29,6 @@ import algolia.{AlgoliaClientException, AlgoliaTest}
 import algolia.AlgoliaDsl._
 import algolia.objects.Query
 
-import scala.concurrent.ExecutionContext.Implicits.global
-
 class AlgoliaClientIntegrationTest extends AlgoliaTest {
 
   describe("requests") {

diff --git a/src/test/scala/algolia/integration/AlgoliaSyncHelperTest.scala b/src/test/scala/algolia/integration/AlgoliaSyncHelperTest.scala
@@ -31,13 +31,12 @@ import algolia.objects.Query
 import algolia.responses._
 import algolia.{AlgoliaSyncHelper, AlgoliaTest}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class AlgoliaSyncHelperTest extends AlgoliaTest {
 
   val helper = AlgoliaSyncHelper(client)
-  val list = 1 to 100 map (i => Value(i, i.toString))
+  val list: Seq[Value] = 1 to 100 map (i => Value(i, i.toString))
 
   before {
     val insert = client.execute {

diff --git a/src/test/scala/algolia/integration/ApiKeyIntegrationTest.scala b/src/test/scala/algolia/integration/ApiKeyIntegrationTest.scala
@@ -30,7 +30,6 @@ import algolia.AlgoliaTest
 import algolia.objects.{Acl, ApiKey}
 import algolia.responses.{AllKeys, CreateUpdateKey}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class ApiKeyIntegrationTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/BrowseIntegrationTest.scala b/src/test/scala/algolia/integration/BrowseIntegrationTest.scala
@@ -30,7 +30,6 @@ import algolia.AlgoliaTest
 import algolia.objects.Query
 import algolia.responses.TasksMultipleIndex
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class BrowseIntegrationTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/GetObjectIntegrationTest.scala b/src/test/scala/algolia/integration/GetObjectIntegrationTest.scala
@@ -29,7 +29,6 @@ import algolia.AlgoliaDsl._
 import algolia.AlgoliaTest
 import algolia.responses.{GetObject, Results, TasksMultipleIndex}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class GetObjectIntegrationTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/IndexSettingsIntegrationTest.scala b/src/test/scala/algolia/integration/IndexSettingsIntegrationTest.scala
@@ -30,7 +30,6 @@ import algolia.AlgoliaTest
 import algolia.objects.{SearchableAttributes, IndexSettings}
 import algolia.responses._
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class IndexSettingsIntegrationTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/IndicesIntegrationTest.scala b/src/test/scala/algolia/integration/IndicesIntegrationTest.scala
@@ -30,7 +30,6 @@ import algolia.AlgoliaTest
 import algolia.objects.Query
 import algolia.responses._
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.language.postfixOps
 

diff --git a/src/test/scala/algolia/integration/LogIntegrationTest.scala b/src/test/scala/algolia/integration/LogIntegrationTest.scala
@@ -30,7 +30,6 @@ import algolia.AlgoliaTest
 import algolia.AlgoliaDsl._
 
 import scala.concurrent.Future
-import scala.concurrent.ExecutionContext.Implicits.global
 
 class LogIntegrationTest extends AlgoliaTest {
 

diff --git a/src/test/scala/algolia/integration/PartialUpdateIntegrationTest.scala b/src/test/scala/algolia/integration/PartialUpdateIntegrationTest.scala
@@ -29,7 +29,6 @@ import algolia.AlgoliaDsl._
 import algolia.AlgoliaTest
 import algolia.responses.{GetObject, Task, TaskIndexing, TasksMultipleIndex}
 
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 class PartialUpdateIntegrationTest extends AlgoliaTest {

diff --git a/src/test/scala/algolia/integration/SearchIntegrationTest.scala b/src/test/scala/algolia/integration/SearchIntegrationTest.scala
@@ -31,13 +31,13 @@ import algolia.objects.{IndexSettings, InsideBoundingBox, InsidePolygon, Query}
 import algolia.responses._
 import org.json4s._
 
-import scala.concurrent.ExecutionContext.Implicits.global
-
 class SearchIntegrationTest extends AlgoliaTest {
 
+  val indexName = s"indexToSearch_${util.Properties.versionNumberString}"
+
   after {
     clearIndices(
-      "indexToSearch",
+      indexName,
       "indexToSearch2",
       "indexToSearchFacet"
     )
@@ -46,10 +46,10 @@ class SearchIntegrationTest extends AlgoliaTest {
   before {
     val obj = Test("algolia", 10, alien = false)
     val insert1 = client.execute {
-      index into "indexToSearch" objectId "563481290" `object` obj
+      index into indexName objectId "563481290" `object` obj
     }
 
-    taskShouldBeCreatedAndWaitForIt(insert1, "indexToSearch")
+    taskShouldBeCreatedAndWaitForIt(insert1, indexName)
 
     val insert2 = client.execute {
       index into "indexToSearch2" `object` Test("algolia2", 10, alien = false)
@@ -62,7 +62,7 @@ class SearchIntegrationTest extends AlgoliaTest {
 
     it("should return generic object") {
       val s = client.execute {
-        search into "indexToSearch" query Query(query = Some("a"))
+        search into indexName query Query(query = Some("a"))
       }
 
       whenReady(s) { result =>
@@ -75,7 +75,7 @@ class SearchIntegrationTest extends AlgoliaTest {
 
     it("should return case class") {
       val s = client.execute {
-        search into "indexToSearch" query Query(query = Some("a"))
+        search into indexName query Query(query = Some("a"))
       }
 
       whenReady(s) { result =>
@@ -86,7 +86,7 @@ class SearchIntegrationTest extends AlgoliaTest {
 
     it("should return a hit") {
       val s = client.execute {
-        search into "indexToSearch" query Query(query = Some("a"))
+        search into indexName query Query(query = Some("a"))
       }
 
       whenReady(s) { result =>
@@ -105,7 +105,7 @@ class SearchIntegrationTest extends AlgoliaTest {
     it("should be able to search on insideBoundingBox") {
       val box = Seq(InsideBoundingBox("1", "2", "3", "4"), InsideBoundingBox("5", "6", "7", "8"))
       val s = client.execute {
-        search into "indexToSearch" query Query(query = Some("a"), insideBoundingBox = Some(box))
+        search into indexName query Query(query = Some("a"), insideBoundingBox = Some(box))
       }
 
       whenReady(s) { result =>
@@ -119,7 +119,7 @@ class SearchIntegrationTest extends AlgoliaTest {
         InsidePolygon("7", "8", "9", "10", "11", "12")
       )
       val s = client.execute {
-        search into "indexToSearch" query Query(query = Some("a"), insidePolygon = Some(polygon))
+        search into indexName query Query(query = Some("a"), insidePolygon = Some(polygon))
       }
 
       whenReady(s) { result =>
@@ -133,7 +133,7 @@ class SearchIntegrationTest extends AlgoliaTest {
     it("should return generic object") {
       val s = client.execute {
         multiQueries(
-          search into "indexToSearch" query Query(query = Some("a")),
+          search into indexName query Query(query = Some("a")),
           search into "indexToSearch2" query Query(query = Some("a"))
         )
       }
@@ -151,7 +151,7 @@ class SearchIntegrationTest extends AlgoliaTest {
     it("should return case class") {
       val s = client.execute {
         multiQueries(
-          search into "indexToSearch" query Query(query = Some("a")),
+          search into indexName query Query(query = Some("a")),
           search into "indexToSearch2" query Query(query = Some("a"))
         )
       }
@@ -168,7 +168,7 @@ class SearchIntegrationTest extends AlgoliaTest {
     it("should return a hit") {
       val s = client.execute {
         multiQueries(
-          search into "indexToSearch" query Query(query = Some("a")),
+          search into indexName query Query(query = Some("a")),
           search into "indexToSearch2" query Query(query = Some("a"))
         )
       }

diff --git a/src/test/scala/algolia/integration/SynonymIntegrationTest.scala b/src/test/scala/algolia/integration/SynonymIntegrationTest.scala
@@ -30,8 +30,6 @@ import algolia.objects.Synonym.{AltCorrection1, OneWaySynonym}
 import algolia.objects.{QuerySynonyms, Synonym, SynonymType}
 import algolia.{AlgoliaDsl, AlgoliaTest}
 
-import scala.concurrent.ExecutionContext.Implicits.global
-
 class SynonymIntegrationTest extends AlgoliaTest {
 
   after {