Merge pull request #66 from scala-exercises/enrique-2-12-10-update

Evaluator Update to Scala 2.12.10

Author: kiroco12

.travis.yml

@@ -3,10 +3,9 @@ sudo: required
 services:
 - docker
 scala:
-- 2.11.11
-- 2.12.3
+- 2.12.10
 jdk:
-- oraclejdk8
+- openjdk8
 cache:
   directories:
   - $HOME/.coursier/cache
@@ -23,20 +22,13 @@ before_install:
   fi
 
 after_success:
-- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.11.11" ]; then
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.10" ]; then
      sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
      echo "Deploying to Heroku";
      docker login [email protected] --password=$heroku_token registry.heroku.com;
      sbt ++$TRAVIS_SCALA_VERSION dockerBuildAndPush;
      sbt ++$TRAVIS_SCALA_VERSION smoketests/test;
   fi
-- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.3" ]; then
-     sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
-     echo "Deploying to Heroku";
-     docker login [email protected] --password=$heroku_token registry.heroku.com;
-     sbt ++$TRAVIS_SCALA_VERSION -Devaluator.heroku.name=scala-evaluator-212 dockerBuildAndPush;
-     sbt ++$TRAVIS_SCALA_VERSION smoketests/test;
-  fi
 - if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
      echo "Not in master branch, skipping deploy and release";
-  fi
+  fi

build.sbt

@@ -1,92 +1,34 @@
-lazy val root = (project in file("."))
-  .settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
-  .settings(stage <<= (stage in Universal in `evaluator-server`))
-  .settings(noPublishSettings: _*)
-  .aggregate(
-    `evaluator-server`,
-    `evaluator-shared-jvm`,
-    `evaluator-shared-js`,
-    `evaluator-client-jvm`,
-    `evaluator-client-js`)
-
-lazy val `evaluator-shared` = (crossProject in file("shared"))
-  .enablePlugins(AutomateHeaderPlugin)
-  .settings(name := "evaluator-shared")
-
-lazy val `evaluator-shared-jvm` = `evaluator-shared`.jvm
-lazy val `evaluator-shared-js`  = `evaluator-shared`.js
-
-lazy val `evaluator-client` = (crossProject in file("client"))
-  .dependsOn(`evaluator-shared`)
-  .enablePlugins(AutomateHeaderPlugin)
-  .settings(
-    name := "evaluator-client",
-    libraryDependencies ++= Seq(
-      %%("roshttp"),
-      %%("cats-free"),
-      %%("circe-core"),
-      %%("circe-generic"),
-      %%("circe-parser"),
-      %%("log4s"),
-      %("slf4j-simple"),
-      %%("scalatest") % "test"
-    )
-  )
-  .jsSettings(sharedJsSettings: _*)
-
-lazy val `evaluator-client-jvm` = `evaluator-client`.jvm
-lazy val `evaluator-client-js`  = `evaluator-client`.js
-
 lazy val `evaluator-server` = (project in file("server"))
-  .dependsOn(`evaluator-shared-jvm`)
   .enablePlugins(JavaAppPackaging)
   .enablePlugins(AutomateHeaderPlugin)
   .enablePlugins(sbtdocker.DockerPlugin)
   .enablePlugins(BuildInfoPlugin)
   .settings(noPublishSettings: _*)
   .settings(
     name := "evaluator-server",
-    libraryDependencies ++= Seq(
-      %%("monix"),
-      %%("circe-core"),
-      %%("circe-generic"),
-      %%("circe-parser"),
-      %%("log4s"),
-      %("slf4j-simple"),
-      %%("http4s-dsl", http4sV),
-      %%("http4s-blaze-server", http4sV),
-      %%("http4s-blaze-client", http4sV),
-      %%("http4s-circe", http4sV),
-      %("config"),
-      %%("jwt-core"),
-      "io.get-coursier" %% "coursier" % "1.0.0-M15-3",
-      "io.get-coursier" %% "coursier-cache" % "1.0.0-M15-3",
-      %%("scalatest")   % "test"
-    ),
+    serverHttpDependencies,
     assemblyJarName in assembly := "evaluator-server.jar"
   )
   .settings(dockerSettings: _*)
   .settings(buildInfoSettings: _*)
   .settings(serverScalaMacroDependencies: _*)
 
 lazy val `smoketests` = (project in file("smoketests"))
-  .dependsOn(`evaluator-server` % "compile->compile;test->test")
+  .dependsOn(`evaluator-server`)
   .enablePlugins(BuildInfoPlugin)
   .settings(noPublishSettings: _*)
   .settings(
     name := "evaluator-server-smoke-tests",
-    libraryDependencies ++= Seq(
-      %%("circe-core"),
-      %%("circe-generic"),
-      %%("circe-parser"),
-      %%("http4s-blaze-client", http4sV),
-      %%("http4s-circe", http4sV),
-      %%("jwt-core"),
-      %%("scalatest") % "test"
-    )
+    smoketestDependencies
   )
   .settings(buildInfoSettings: _*)
 
+lazy val root = (project in file("."))
+  .settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
+  .settings(stage := (stage in Universal in `evaluator-server`).value)
+  .settings(noPublishSettings: _*)
+  .aggregate(`evaluator-server`)
+
 addCommandAlias(
   "publishSignedAll",
   ";evaluator-sharedJS/publishSigned;evaluator-sharedJVM/publishSigned;evaluator-clientJS/publishSigned;evaluator-clientJVM/publishSigned"