Skip to content

Commit

Permalink
comment out spray driver
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelkaczor committed May 4, 2015
1 parent 9114413 commit 049ae91
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -11,7 +11,7 @@ scalaVersion := "2.11.5"

resolvers += "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/"

resolvers += "spray repo" at "http://repo.spray.io/"
//resolvers += "spray repo" at "http://repo.spray.io/"

publishMavenStyle := true

Expand Down
10 changes: 5 additions & 5 deletions project/dependencies.scala
Expand Up @@ -3,17 +3,17 @@ import sbt._
object Dependencies {
val jerseyVersion = "1.17.+"
val scalatestVersion = "2.2.4"
val sprayVersion = "1.3.2"
//val sprayVersion = "1.3.2"
val playVersion = "2.3.4"

val jersey = "com.sun.jersey" % "jersey-core" % jerseyVersion
val jerseyClient = "com.sun.jersey" % "jersey-client" % jerseyVersion
val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
val playJson = "com.typesafe.play" %% "play-json" % playVersion

val sprayCan = "io.spray" %% "spray-can" % sprayVersion
val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion
val sprayTestkit = "io.spray" %% "spray-testkit" % sprayVersion
//val sprayCan = "io.spray" %% "spray-can" % sprayVersion
//val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion
//val sprayTestkit = "io.spray" %% "spray-testkit" % sprayVersion

val resttestDependencies = Seq(jersey, jerseyClient, scalatest, playJson, sprayCan, sprayRouting, sprayTestkit)
val resttestDependencies = Seq(jersey, jerseyClient, scalatest, playJson/*, sprayCan, sprayRouting, sprayTestkit*/)
}
3 changes: 2 additions & 1 deletion src/main/scala/org/iainhull/resttest/driver/Spray.scala
@@ -1,5 +1,6 @@
package org.iainhull.resttest.driver

/*
import spray.testkit.ScalatestRouteTest
import org.iainhull.resttest.TestDriver
import org.scalatest.Suite
Expand Down Expand Up @@ -43,4 +44,4 @@ trait SprayUnitTestDriver extends TestDriver with ScalatestRouteTest {
def actorRefFactory = system
def myRoute: Route
}
}*/

0 comments on commit 049ae91

Please sign in to comment.