Adds scala-compiler as assembly dep for Docker

Author: juanpedromoreno

build.sbt

@@ -68,7 +68,7 @@ lazy val `evaluator-server` = (project in file("server"))
     buildInfoPackage := "org.scalaexercises.evaluator"
   )
   .settings(dockerSettings)
-  .settings(scalaMacroDependencies: _*)
+  .settings(serverScalaMacroDependencies: _*)
 
 lazy val `smoketests` = (project in file("smoketests"))
   .dependsOn(`evaluator-server`)

project/ProjectPlugin.scala

@@ -40,6 +40,25 @@ object ProjectPlugin extends AutoPlugin {
         s"registry.heroku.com/${sys.props.getOrElse("evaluator.heroku.name", "scala-evaluator")}/web"))
     )
 
+    lazy val serverScalaMacroDependencies: Seq[Setting[_]] = {
+      Seq(
+        libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value,
+        libraryDependencies += "org.scala-lang" % "scala-reflect"  % scalaVersion.value,
+        libraryDependencies += compilerPlugin(%%("paradise") cross CrossVersion.full),
+        libraryDependencies ++= {
+          CrossVersion.partialVersion(scalaVersion.value) match {
+            // if scala 2.11+ is used, quasiquotes are merged into scala-reflect
+            case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq()
+            // in Scala 2.10, quasiquotes are provided by macro paradise
+            case Some((2, 10)) =>
+              Seq(
+                %%("quasiquotes") cross CrossVersion.binary
+              )
+          }
+        }
+      )
+    }
+
   }
 
   override def projectSettings: Seq[Def.Setting[_]] =

smoketests/src/test/scala/org/scalaexercises/evaluator/Smoketests.scala

@@ -1,40 +1,43 @@
+/*
+ * scala-exercises - evaluator-server-smoke-tests
+ * Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ */
+
 package org.scalaexercises.evaluator
 
+import io.circe.Printer
 import org.scalatest._
 import org.http4s._
 import org.http4s.client.blaze._
 import org.http4s.circe._
 import io.circe.generic.auto._
-import scalaz.concurrent.Task
-import scala.concurrent.duration._
 
+import scala.concurrent.duration._
 import pdi.jwt.{Jwt, JwtAlgorithm}
 
 class Smoketests extends FunSpec with Matchers with CirceInstances {
 
-  case class EvaluatorResponse(msg: String,
-                               value: String,
-                               valueType: String,
-                               compilationInfos: Map[String, String])
+  case class EvaluatorResponse(
+      msg: String,
+      value: String,
+      valueType: String,
+      compilationInfos: Map[String, String])
 
   implicit val decoder: EntityDecoder[EvaluatorResponse] =
     jsonOf[EvaluatorResponse]
 
-  val validToken = Jwt.encode(
-    """{"user": "scala-exercises"}""",
-    auth.secretKey,
-    JwtAlgorithm.HS256)
+  val validToken =
+    Jwt.encode("""{"user": "scala-exercises"}""", auth.secretKey, JwtAlgorithm.HS256)
 
   def makeRequest(code: String)(
-    expectation: EvaluatorResponse => Unit,
-    failExpectation: Throwable => Unit = fail(_)): Unit = {
+      expectation: EvaluatorResponse => Unit,
+      failExpectation: Throwable => Unit = fail(_)): Unit = {
 
     val request = new Request(
       method = Method.POST,
-      uri = Uri.uri("http://scala-evaluator.herokuapp.com/eval"),
+      uri = Uri.uri("https://scala-evaluator.herokuapp.com/eval"),
       headers = Headers(headers)
-    ).withBody(
-      s"""{"resolvers" : [], "dependencies" : [], "code" : "$code"}""")
+    ).withBody(s"""{"resolvers" : [], "dependencies" : [], "code" : "$code"}""")
 
     val task = client.expect[EvaluatorResponse](request)
 
@@ -70,10 +73,11 @@ class Smoketests extends FunSpec with Matchers with CirceInstances {
     it("should not expose sensitive details by calling sys.env") {
       val keywords = List("password", "key", "api")
       makeRequest("sys.env") { evaluatorResponse =>
-        keywords.foreach(kw =>
-            evaluatorResponse.value.contains(kw) shouldBe false)
+        keywords.foreach(kw => evaluatorResponse.value.contains(kw) shouldBe false)
       }
 
     }
   }
+
+  override protected def defaultPrinter: Printer = Printer.noSpaces.copy(dropNullKeys = true)
 }