Browse Source

Spray fixed and updated.

mfirry 9 years ago
parent
commit
c0085fda9f

+ 6 - 13
frameworks/Scala/spray/build.sbt

@@ -1,26 +1,19 @@
-import spray.revolver.RevolverPlugin.Revolver
-
 name := "spray-benchmark"
 
 organization := "io.spray"
 
-scalaVersion := "2.10.1"
+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.2.4",
-  "io.spray" % "spray-can" % "1.1-20130619",
-  "com.typesafe.akka" %%  "akka-actor" % "2.1.2",
-  "com.typesafe.akka" %%  "akka-slf4j" % "2.1.2",
+  "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"
 )
-
-Revolver.settings
-
-sbtassembly.Plugin.assemblySettings

+ 1 - 1
frameworks/Scala/spray/project/build.properties

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

+ 2 - 4
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("io.spray" % "sbt-revolver" % "0.6.2")
-
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.8")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")

+ 1 - 1
frameworks/Scala/spray/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7 scala sbt
+fw_depends java8 scala sbt
 
 sbt assembly
 

+ 15 - 15
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
   }