Skip to content
This repository has been archived by the owner on Mar 11, 2020. It is now read-only.

Commit

Permalink
Merge pull request #109 from oncue/wip-bump-dependencies
Browse files Browse the repository at this point in the history
build: bump dependencies
  • Loading branch information
timperrett committed May 31, 2016
2 parents d9eb5c9 + bb07eba commit dc793f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions core/build.sbt
Expand Up @@ -21,9 +21,9 @@ libraryDependencies ++= Seq(
"org.scodec" %% "scodec-scalaz" % "1.1.0",
"org.scalaz" %% "scalaz-core" % "7.1.3",
"org.scalaz.stream" %% "scalaz-stream" % "0.7.3a",
"org.apache.commons" % "commons-pool2" % "2.2",
"io.netty" % "netty-handler" % "4.0.32.Final",
"io.netty" % "netty-codec" % "4.0.32.Final"
"org.apache.commons" % "commons-pool2" % "2.4.2",
"io.netty" % "netty-handler" % "4.1.0.Final",
"io.netty" % "netty-codec" % "4.1.0.Final"
)

common.macrosSettings
Expand Down
4 changes: 2 additions & 2 deletions project/common.scala
Expand Up @@ -42,12 +42,12 @@ object common {
)

def macrosSettings = Seq(
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0-M5" cross CrossVersion.full),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
) ++ (
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, scalaMajor)) if scalaMajor == 10 => Seq("org.scalamacros" %% "quasiquotes" % "2.1.0-M5")
case Some((2, scalaMajor)) if scalaMajor == 10 => Seq("org.scalamacros" %% "quasiquotes" % "2.1.0")
case _ => Nil
}
),
Expand Down

0 comments on commit dc793f2

Please sign in to comment.