Merge pull request #81 from DanielaSfregola/#54_scala_212

#54 Added Scala 2.12 support
DanielaSfregola · Jan 5, 2017 · bd555ad · bd555ad
2 parents 8d0a149 + 97237af
commit bd555ad
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,14 +18,12 @@ after_script:
   - sbt coverageReport coveralls
 
 scala:
+  - 2.12.1
   - 2.11.8
 
 jdk:
   - oraclejdk8
 
-env:
-  - SBT_OPTS="-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:PermSize=256M -XX:MaxPermSize=512M"
-
 # whitelist
 branches:
   only:

diff --git a/build.sbt b/build.sbt
@@ -1,10 +1,9 @@
 import com.typesafe.sbt.SbtGit.{GitKeys => git}
-import scoverage.ScoverageSbtPlugin.ScoverageKeys._
 
 name := "twitter4s"
 version := "3.1-SNAPSHOT"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.1"
 
 resolvers ++= Seq(
   "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/",
@@ -13,17 +12,17 @@ resolvers ++= Seq(
 
 libraryDependencies ++= {
 
-  val Typesafe = "1.3.0"
-  val Akka = "2.4.11"
+  val Typesafe = "1.3.1"
+  val Akka = "2.4.16"
+  val AkkaHttp = "10.0.1"
   val AkkaHttpJson4s = "1.11.0"
   val Json4s = "3.5.0"
-  val Spec2Version = "2.3.13"
-  val ScalaLogging = "3.4.0"
+  val Spec2Version = "3.8.6"
+  val ScalaLogging = "3.5.0"
 
   Seq(
     "com.typesafe" % "config" % Typesafe,
-    "com.typesafe.akka" %% "akka-actor" % Akka,
-    "com.typesafe.akka" %% "akka-http-experimental" % Akka,
+    "com.typesafe.akka" %% "akka-http" % AkkaHttp,
     "de.heikoseeberger" %% "akka-http-json4s" % AkkaHttpJson4s,
     "org.json4s" %% "json4s-native" % Json4s,
     "org.json4s" %% "json4s-ext" % Json4s,
@@ -33,8 +32,11 @@ libraryDependencies ++= {
   )
 }
 
-coverageExcludedPackages := "com.danielasfregola.twitter4s.processors.*;com.danielasfregola.twitter4s.Twitter*Client"
-coverageMinimum := 85
+scalacOptions in ThisBuild ++= Seq("-language:postfixOps",
+  "-language:implicitConversions",
+  "-language:existentials",
+  "-feature",
+  "-deprecation")
 
 lazy val standardSettings = Seq(
   organization := "com.danielasfregola",
@@ -44,6 +46,7 @@ lazy val standardSettings = Seq(
     ScmInfo(url("https://github.com/DanielaSfregola/twitter4s"),
             "scm:git:git@github.com:DanielaSfregola/twitter4s.git")),
   apiURL := Some(url("http://DanielaSfregola.github.io/twitter4s/latest/api/")),
+  crossScalaVersions := Seq("2.12.1", "2.11.8"),
   pomExtra := (
     <developers>
     <developer>
@@ -77,8 +80,13 @@ lazy val standardSettings = Seq(
   }
 )
 
+lazy val coverageSettings = Seq(
+  coverageExcludedPackages := "com.danielasfregola.twitter4s.processors.*;com.danielasfregola.twitter4s.Twitter*Client",
+  coverageMinimum := 85
+)
+
 lazy val root = Project(
   id = "twitter4s",
   base = file("."),
-  settings = standardSettings ++ site.settings ++ site.includeScaladoc(version + "/api")
+  settings = standardSettings ++ coverageSettings ++ site.settings ++ site.includeScaladoc(version + "/api")
       ++ site.includeScaladoc("latest/api") ++ ghpages.settings)
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
 
 resolvers += Classpaths.sbtPluginReleases
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0")
 
@@ -17,3 +17,5 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.0")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+
+parallelExecution in Test := false
diff --git a/src/test/resources/application.conf b/src/test/resources/application.conf
@@ -0,0 +1,4 @@
+akka.test {
+  single-expect-default = 60s
+  default-timeout = 60s
+}
diff --git a/src/test/scala/com/danielasfregola/twitter4s/http/clients/rest/RestClientSpec.scala b/src/test/scala/com/danielasfregola/twitter4s/http/clients/rest/RestClientSpec.scala
@@ -25,7 +25,7 @@ class RestClientSpec extends ClientSpec {
       val result = when(exampleRequest).expectRequest(identity(_)).respondWith(response)
       val expectedTwitterException = TwitterException(code = StatusCodes.NotFound,
                                        errors = Errors(TwitterError("Sorry, that page does not exist", 34)))
-      result should throwAn(expectedTwitterException).await
+      result.await should throwAn(expectedTwitterException)
     }
 
     "throw twitter exception to generic failure http response" in new RestClientSpecContext {
@@ -34,7 +34,7 @@ class RestClientSpec extends ClientSpec {
       val result = when(exampleRequest).expectRequest(identity(_)).respondWith(response)
       val expectedTwitterException = TwitterException(code = StatusCodes.RequestTimeout, errors = Errors(body))
 
-      result should throwAn(expectedTwitterException).await
+      result.await should throwAn(expectedTwitterException)
     }
 
   }

diff --git a/...tter4s/http/oauth/OAuthProviderSpec.scala → ...ter4s/http/oauth/OAuth2ProviderSpec.scala b/...tter4s/http/oauth/OAuthProviderSpec.scala → ...ter4s/http/oauth/OAuth2ProviderSpec.scala
@@ -3,11 +3,10 @@ package com.danielasfregola.twitter4s.http.oauth
 import akka.http.scaladsl.model.headers.RawHeader
 import akka.http.scaladsl.model.{HttpCharsets, _}
 import com.danielasfregola.twitter4s.entities.{AccessToken, ConsumerToken}
-import com.danielasfregola.twitter4s.util.{AwaitableFuture, TestActorSystem}
+import com.danielasfregola.twitter4s.util.{AwaitableFuture, TestActorSystem, TestExecutionContext}
 import org.specs2.mutable.SpecificationLike
 
-
-class OAuthProviderSpec extends TestActorSystem with SpecificationLike with AwaitableFuture {
+class OAuth2ProviderSpec extends TestActorSystem with SpecificationLike with AwaitableFuture with TestExecutionContext {
 
   implicit val consumerToken = ConsumerToken("xvz1evFS4wEEPTGEFPHBog", "kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw")
   implicit val accessToken = AccessToken("370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb", "LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE")

diff --git a/src/test/scala/com/danielasfregola/twitter4s/util/Spec.scala b/src/test/scala/com/danielasfregola/twitter4s/util/Spec.scala
@@ -2,14 +2,14 @@ package com.danielasfregola.twitter4s.util
 
 import akka.http.scaladsl.model.{HttpCharsets, MediaTypes}
 import com.danielasfregola.twitter4s.entities.{AccessToken, ConsumerToken}
-import org.specs2.matcher.{NoConcurrentExecutionContext, Scope, ThrownExpectations}
+import org.specs2.matcher.Scope
 import org.specs2.mutable.SpecificationLike
 
-trait Spec extends ThrownExpectations with SpecificationLike {
+trait Spec extends SpecificationLike {
 
   val `application/x-www-form-urlencoded` = MediaTypes.`application/x-www-form-urlencoded` withCharset HttpCharsets.`UTF-8`
 
-  trait SpecContext extends FixturesSupport with AwaitableFuture with NoConcurrentExecutionContext with Scope {
+  trait SpecContext extends FixturesSupport with AwaitableFuture with Scope {
 
     val consumerToken = ConsumerToken("consumer-key", "consumer-secret")
     val accessToken = AccessToken("access-key", "access-secret")

diff --git a/src/test/scala/com/danielasfregola/twitter4s/util/TestExecutionContext.scala b/src/test/scala/com/danielasfregola/twitter4s/util/TestExecutionContext.scala
@@ -0,0 +1,5 @@
+package com.danielasfregola.twitter4s.util
+
+trait TestExecutionContext {
+  implicit val executionContext = scala.concurrent.ExecutionContext.Implicits.global
+}
diff --git a/src/test/scala/com/danielasfregola/twitter4s/util/rest/ClientSpec.scala b/src/test/scala/com/danielasfregola/twitter4s/util/rest/ClientSpec.scala
@@ -10,7 +10,7 @@ import com.danielasfregola.twitter4s.util.{RequestDSL, Spec}
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 
-class ClientSpec extends Spec {
+abstract class ClientSpec extends Spec {
 
   abstract class ClientSpecContext extends RequestDSL with RestClient with SpecContext {
 

diff --git a/src/test/scala/com/danielasfregola/twitter4s/util/streaming/ClientSpec.scala b/src/test/scala/com/danielasfregola/twitter4s/util/streaming/ClientSpec.scala
@@ -11,7 +11,7 @@ import com.danielasfregola.twitter4s.util.{RequestDSL, Spec}
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 
-class ClientSpec extends Spec {
+abstract class ClientSpec extends Spec {
 
   def dummyProcessing: PartialFunction[StreamingMessage, Unit] = { case _ => }