Permalink
Browse files

= project: upgrade dependencies

  • Loading branch information...
sirthias committed Jan 24, 2017
1 parent 0a377ae commit d32c6838e24e8421510b46894846eba2a3f8977e
View
@@ -7,7 +7,7 @@ import org.scalajs.sbtplugin.cross.CrossType
val commonSettings = Seq(
version := "2.1.4-SNAPSHOT",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8", "2.12.0"),
crossScalaVersions := Seq("2.11.8", "2.12.1"),
organization := "org.parboiled",
homepage := Some(new URL("http://parboiled.org")),
description := "Fast and elegant PEG parsing in Scala - lightweight, easy-to-use, powerful",
@@ -40,10 +40,10 @@ val formattingSettings = scalariformSettings ++ Seq(
val publishingSettings = Seq(
publishMavenStyle := true,
useGpg := true,
publishTo <<= version { v: String =>
publishTo := {
val nexus = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
pomIncludeRepository := { _ => false },
pomExtra :=
@@ -71,8 +71,8 @@ val noPublishingSettings = Seq(
def scalaReflect(v: String) = "org.scala-lang" % "scala-reflect" % v % "provided"
val shapeless = "com.chuusai" %% "shapeless" % "2.3.2" % "compile"
val specs2Core = "org.specs2" %% "specs2-core" % "3.8.6" % "test"
val specs2ScalaCheck = "org.specs2" %% "specs2-scalacheck" % "3.8.6" % "test"
val specs2Core = "org.specs2" %% "specs2-core" % "3.8.7" % "test"
val specs2ScalaCheck = "org.specs2" %% "specs2-scalacheck" % "3.8.7" % "test"
/////////////////////// PROJECTS /////////////////////////
@@ -86,7 +86,7 @@ lazy val examples = project
.dependsOn(parboiledJVM)
.settings(commonSettings: _*)
.settings(noPublishingSettings: _*)
.settings(libraryDependencies ++= Seq(specs2Core, "io.spray" %% "spray-json" % "1.3.2"))
.settings(libraryDependencies ++= Seq(specs2Core, "io.spray" %% "spray-json" % "1.3.3"))
lazy val bench = inputKey[Unit]("Runs the JSON parser benchmark with a simple standard config")
@@ -97,9 +97,9 @@ lazy val jsonBenchmark = project
.settings(noPublishingSettings: _*)
.settings(
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-native" % "3.4.1",
"org.json4s" %% "json4s-jackson" % "3.4.1",
"io.argonaut" %% "argonaut" % "6.1"),
"org.json4s" %% "json4s-native" % "3.5.0",
"org.json4s" %% "json4s-jackson" % "3.5.0",
"io.argonaut" %% "argonaut" % "6.2-RC2"),
bench := (run in Compile).partialInput(" -i 10 -wi 10 -f1 -t1").evaluated)
lazy val scalaParser = project
@@ -31,7 +31,7 @@ class JsonParserBenchmark {
def argonaut_(state: TestState) =
argonaut.Parse.parseOption(state.json).get
@Benchmark
def parserCombinators(state: TestState): Unit =
util.parsing.json.JSON.parseRaw(state.json).get
//@Benchmark
//def parserCombinators(state: TestState): Unit =
// util.parsing.json.JSON.parseRaw(state.json).get
}
View
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.13
View
@@ -1,7 +1,7 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.20")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")

0 comments on commit d32c683

Please sign in to comment.