Merge pull request #78 from scala-exercises/enrique-2-13-1-update

Update evaluator to Scala 2.13.1

Author: kiroco12

.sbtopts

@@ -0,0 +1 @@
+-Dscala.classpath.closeZip=true

.scalafmt.conf

@@ -1,3 +1,4 @@
+version = 2.3.2
 style = defaultWithAlign
 maxColumn = 100
 

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 services:
 - docker
 scala:
-- 2.12.10
+- 2.13.1
 jdk:
 - openjdk8
 cache:
@@ -22,7 +22,7 @@ before_install:
   fi
 
 after_success:
-- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.10" ]; then
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.13.1" ]; then
      sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
      echo "Deploying to Heroku";
      docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com;

build.sbt

@@ -1,3 +1,5 @@
+Universal / javaOptions += "-Dscala.classpath.closeZip=true"
+
 lazy val `evaluator-server` = (project in file("server"))
   .enablePlugins(JavaAppPackaging)
   .enablePlugins(AutomateHeaderPlugin)

project/ProjectPlugin.scala

@@ -19,7 +19,8 @@ object ProjectPlugin extends AutoPlugin {
   object autoImport {
 
     object V {
-      lazy val http4s      = "0.20.15"
+      lazy val cats        = "2.1.0"
+      lazy val http4s      = "0.21.0-M6"
       lazy val circe       = "0.12.3"
       lazy val log4s       = "1.7.0"
       lazy val scalatest   = "3.1.0"
@@ -44,33 +45,27 @@ object ProjectPlugin extends AutoPlugin {
           .user("evaluator")
           .add(artifact, artifactTargetPath)
           .cmdRaw(
-            s"java -Dhttp.port=$$PORT -Deval.auth.secretKey=$$EVAL_SECRET_KEY -jar $artifactTargetPath")
+            s"java -Dhttp.port=$$PORT -Deval.auth.secretKey=$$EVAL_SECRET_KEY -jar $artifactTargetPath"
+          )
       },
-      imageNames in docker := Seq(ImageName(repository =
-        s"registry.heroku.com/${sys.props.getOrElse("evaluator.heroku.name", "scala-evaluator")}/web"))
+      imageNames in docker := Seq(
+        ImageName(repository =
+          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
-              )
-          }
-        }
+        libraryDependencies += "org.scala-lang" % "scala-reflect"  % scalaVersion.value
       )
     }
 
     lazy val serverHttpDependencies = Seq(
       libraryDependencies ++= Seq(
+        %%("cats-core", V.cats),
+        %%("cats-effect", V.cats),
         %%("circe-core", V.circe),
         %%("circe-generic", V.circe),
         %("slf4j-simple", V.slf4jSimple),
@@ -93,6 +88,8 @@ object ProjectPlugin extends AutoPlugin {
 
     lazy val smoketestDependencies = Seq(
       libraryDependencies ++= Seq(
+        %%("cats-core", V.cats),
+        %%("cats-effect", V.cats),
         %%("circe-core", V.circe),
         %%("circe-generic", V.circe),
         %%("circe-parser", V.circe),
@@ -113,7 +110,8 @@ object ProjectPlugin extends AutoPlugin {
       resolvers ++= Seq(
         Resolver.mavenLocal,
         Resolver.sonatypeRepo("snapshots"),
-        Resolver.sonatypeRepo("releases")),
+        Resolver.sonatypeRepo("releases")
+      ),
       orgGithubSetting := GitHubSettings(
         organization = "scala-exercises",
         project = name.value,
@@ -123,11 +121,11 @@ object ProjectPlugin extends AutoPlugin {
         organizationEmail = "hello@47deg.com"
       ),
       orgLicenseSetting := ApacheLicense,
-      scalaVersion := "2.12.10",
+      scalaVersion := "2.13.1",
       scalaOrganization := "org.scala-lang",
+      scalacOptions ~= (_ filterNot (_ == "-Xfuture")),
+      scalacOptions += "-Ymacro-annotations",
       javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
-      scalacOptions += "-Ypartial-unification",
-      fork in Test := false,
       parallelExecution in Test := false,
       cancelable in Global := true,
       headerLicense := Some(
@@ -137,6 +135,7 @@ object ProjectPlugin extends AutoPlugin {
               | Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
               |
               |""".stripMargin
-        ))
+        )
+      )
     ) ++ shellPromptSettings
 }

project/plugins.sbt

@@ -3,5 +3,5 @@ addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % "1.6.1")
 addSbtPlugin("com.eed3si9n"      % "sbt-assembly"        % "0.14.10")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"       % "0.9.0")
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker"          % "1.5.0")
-addSbtPlugin("com.47deg"         % "sbt-org-policies"    % "0.12.0-M3")
+addSbtPlugin("com.47deg"         % "sbt-org-policies"    % "0.12.3")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"          % "3.0.2")

server/src/main/scala/org/scalaexercises/evaluator/auth.scala

@@ -10,7 +10,7 @@ package org.scalaexercises.evaluator
 import cats.effect.Sync
 import com.typesafe.config._
 import org.http4s._
-import org.http4s.syntax.kleisli.http4sKleisliResponseSyntax
+import org.http4s.syntax.kleisli._
 import org.http4s.util._
 import org.log4s.getLogger
 import pdi.jwt.{Jwt, JwtAlgorithm}
@@ -29,7 +29,8 @@ object auth {
     config.getString(SecretKeyPath)
   } else {
     throw new IllegalStateException(
-      "Missing -Deval.auth.secretKey=[YOUR_KEY_HERE] or env var [EVAL_SECRET_KEY] ")
+      "Missing -Deval.auth.secretKey=[YOUR_KEY_HERE] or env var [EVAL_SECRET_KEY] "
+    )
   }
 
   def generateToken(value: String = "{}") =