Merge pull request #2097 from TechEmpower/master

Merging master changes into round-14

README.md

@@ -74,4 +74,4 @@ can be found in the [TFB documentation](http://frameworkbenchmarks.readthedocs.o
 
 Join in the conversation at our 
 [Google Group](https://groups.google.com/forum/?fromgroups=#!forum/framework-benchmarks), 
-or chat with us on [Freenode](https://freenode.net/faq.shtml#whatwhy) at `#techempower-fwbm`. 
+or chat with us on [Freenode](https://webchat.freenode.net/) at `#techempower-fwbm`. 

frameworks/Scala/fintrospect/build.sbt

@@ -1,12 +1,8 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.0.2"
+version := "0.0.1"
 
-scalaVersion := "2.11.8"
-
-scalacOptions += "-deprecation"
-
-scalacOptions += "-feature"
+scalaVersion := "2.11.7"
 
 resolvers += "JCenter" at "https://jcenter.bintray.com"
 
@@ -15,11 +11,11 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finagle-http" % "6.35.0",
-  "io.github.daviddenton" %% "fintrospect" % "12.20.1",
-  "io.circe" %% "circe-core" % "0.4.1",
-  "io.circe" %% "circe-parser" % "0.4.1",
-  "io.circe" %% "circe-generic" % "0.4.1"
+  "com.twitter" %% "finagle-http" % "6.34.0",
+  "io.github.daviddenton" %% "fintrospect" % "12.8.0",
+  "io.circe" %% "circe-core" % "0.3.0",
+  "io.circe" %% "circe-parser" % "0.3.0",
+  "io.circe" %% "circe-generic" % "0.3.0"
 )
 
 resolvers += Resolver.sonatypeRepo("snapshots")

frameworks/Scala/fintrospect/src/main/scala/FintrospectBenchmarkServer.scala

@@ -9,8 +9,13 @@ import com.twitter.finagle.stats.NullStatsReceiver
 import com.twitter.finagle.tracing.NullTracer
 import com.twitter.finagle.{Http, Service}
 import com.twitter.util.Await
+import io.circe._
 import io.circe.generic.auto._
+import io.circe.parser._
+import io.circe.syntax._
+import io.fintrospect.formats.json.Circe.ResponseBuilder._
 import io.fintrospect.formats.json.Circe.JsonFormat._
+import io.fintrospect.formats.json.Circe.ResponseBuilder._
 import io.fintrospect.{ModuleSpec, RouteSpec}
 
 object FintrospectBenchmarkServer extends App {
@@ -24,11 +29,8 @@ object FintrospectBenchmarkServer extends App {
 
   case class Message(message: String)
 
-  val jsonHelloWorld = {
-    import io.fintrospect.formats.json.Circe.ResponseBuilder.implicits._
-    Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
-      .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
-    }
+  val jsonHelloWorld = Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
+    .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
   }
 
   val module = ModuleSpec(Root)