Merge branch 'master' into round-14

frameworks/Scala/fintrospect/build.sbt

@@ -1,8 +1,12 @@
 name := """techempower-benchmarks-fintrospect"""
 
-version := "0.0.1"
+version := "0.0.2"
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
+
+scalacOptions += "-deprecation"
+
+scalacOptions += "-feature"
 
 resolvers += "JCenter" at "https://jcenter.bintray.com"
 
@@ -11,11 +15,11 @@ com.github.retronym.SbtOneJar.oneJarSettings
 mainClass in(Compile, run) := Some("FintrospectBenchmarkServer")
 
 libraryDependencies ++= Seq(
-  "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"
+  "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"
 )
 
 resolvers += Resolver.sonatypeRepo("snapshots")

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

@@ -9,13 +9,8 @@ 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 {
@@ -29,8 +24,11 @@ object FintrospectBenchmarkServer extends App {
 
   case class Message(message: String)
 
-  val jsonHelloWorld = Service.mk { r: Request => Ok(encode(Message("Hello, World!")))
-    .withHeaders("Server" -> "Example", "Date" -> RFC_1123_DATE_TIME.format(now()))
+  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 module = ModuleSpec(Root)

frameworks/Scala/spray/build.sbt

@@ -1,27 +1,19 @@
-import spray.revolver.RevolverPlugin
-
 name := "spray-benchmark"
 
 organization := "io.spray"
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
 
 version := "1.0"
 
 resolvers ++= Seq(
-  "spray repo" at "http://repo.spray.io/",
-  "spray nightly repo" at "http://nightlies.spray.io/"
+  "spray repo" at "http://repo.spray.io/"
 )
 
 libraryDependencies ++= Seq(
-  "io.spray" %% "spray-json" % "1.3.2",
-  "io.spray" % "spray-can" % "1.1-20130619",
-  "com.typesafe.akka" %%  "akka-actor" % "2.4.1",
-  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.1",
-  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime",
-  "org.scala-lang" % "scala-xml" % "2.11.0-M4"
+  "io.spray" %% "spray-json" % "1.3.1",
+  "io.spray" %% "spray-can" % "1.3.1",
+  "com.typesafe.akka" %%  "akka-actor" % "2.4.7",
+  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.7",
+  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime"
 )
-
-RevolverPlugin.settings
-
-sbtassembly.AssemblyPlugin.assemblySettings

frameworks/Scala/spray/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.11

frameworks/Scala/spray/project/plugins.sbt

@@ -1,5 +1,3 @@
-resolvers += "spray repo" at "http://repo.spray.io"
-
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")

frameworks/Scala/spray/src/main/resources/logback.xml

@@ -12,4 +12,4 @@
         <appender-ref ref="CONSOLE"/>
     </root>
 
-</configuration>
+</configuration>

frameworks/Scala/spray/src/main/scala/spray/examples/BenchmarkService.scala

@@ -35,21 +35,21 @@ class BenchmarkService extends Actor {
     // when a new connection comes in we register ourselves as the connection handler
     case _: Http.Connected => sender ! Http.Register(self, fastPath = fastPath)
 
-    case HttpRequest(GET, Path("/"), _, _, _) => sender ! HttpResponse(
-      entity = HttpEntity(MediaTypes.`text/html`,
-        <html>
-          <body>
-            <h1>Tiny <i>spray-can</i> benchmark server</h1>
-            <p>Defined resources:</p>
-            <ul>
-              <li><a href="/json">/json</a></li>
-              <li><a href="/plaintext">/plaintext</a></li>
-              <li><a href="/stop">/stop</a></li>
-            </ul>
-          </body>
-        </html>.toString()
-      )
-    )
+    // case HttpRequest(GET, Path("/"), _, _, _) => sender ! HttpResponse(
+    //   entity = HttpEntity(MediaTypes.`text/html`,
+    //     <html>
+    //       <body>
+    //         <h1>Tiny <i>spray-can</i> benchmark server</h1>
+    //         <p>Defined resources:</p>
+    //         <ul>
+    //           <li><a href="/json">/json</a></li>
+    //           <li><a href="/plaintext">/plaintext</a></li>
+    //           <li><a href="/stop">/stop</a></li>
+    //         </ul>
+    //       </body>
+    //     </html>.toString()
+    //   )
+    // )
 
     case _: HttpRequest => sender ! unknownResource
   }