Skip to content

Commit

Permalink
= Upgrade SBT and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sirthias committed Sep 22, 2014
1 parent e49bcf8 commit 7c88d76
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ val noPublishingSettings = Seq(

val scalaReflect = "org.scala-lang" % "scala-reflect" % "2.11.2" % "provided"
val shapeless = "com.chuusai" %% "shapeless" % "2.0.0" % "compile"
val specs2Core = "org.specs2" %% "specs2-core" % "2.4.2" % "test"
val specs2ScalaCheck = "org.specs2" %% "specs2-scalacheck" % "2.4.2" % "test"
val specs2Core = "org.specs2" %% "specs2-core" % "2.4.4" % "test"
val specs2ScalaCheck = "org.specs2" %% "specs2-scalacheck" % "2.4.4" % "test"

/////////////////////// PROJECTS /////////////////////////

Expand All @@ -82,7 +82,7 @@ lazy val examples = project
.dependsOn(parboiled)
.settings(commonSettings: _*)
.settings(noPublishingSettings: _*)
.settings(libraryDependencies ++= Seq(specs2Core, "io.spray" %% "spray-json" % "1.2.6"))
.settings(libraryDependencies ++= Seq(specs2Core, "io.spray" %% "spray-json" % "1.3.0"))

lazy val bench = inputKey[Unit]("Runs the JSON parser benchmark with a simple standard config")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package org.parboiled2.examples

import scala.annotation.switch
import org.parboiled2._
import spray.json._
import spray.json.{ParserInput => _, _}

/**
* This is a feature-complete JSON parser implementation that almost directly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class TestState {
class JsonParserBenchmark {

@Benchmark
def parboiled1JsonParser(state: TestState) =
spray.json.JsonParser(state.json) // the spray-json parser is implemented with parboiled 1.x
def sprayJsonParser(state: TestState) =
spray.json.JsonParser(state.json)

@Benchmark
def parboiled2JsonParser(state: TestState) =
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.6

0 comments on commit 7c88d76

Please sign in to comment.