Skip to content

Commit

Permalink
Merge pull request #386 from smacker/update_bblfsh_client
Browse files Browse the repository at this point in the history
Update bblfsh client
  • Loading branch information
ajnavarro authored Apr 26, 2018
2 parents d765bb7 + 31a5d58 commit 1cb91cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ logBuffered in Test := false
// Shade everything but tech.sourced.engine so the user does not have conflicts
assemblyShadeRules in assembly := Seq(
ShadeRule.rename("com.google.common.**" -> "com.google.shadedcommon.@1").inAll,
ShadeRule.rename("com.google.protobuf.**" -> "shaded.com.google.protobuf.@1").inAll,
ShadeRule.rename("io.netty.**" -> "io.shadednetty.@1").inAll
)

Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ object Dependencies {
lazy val scoverage = "org.scoverage" %% "scalac-scoverage-plugin" % "1.3.1"
lazy val sparkSql = "org.apache.spark" %% "spark-sql" % "2.2.1"
lazy val newerHadoopClient = "org.apache.hadoop" % "hadoop-client" % "2.7.2"
lazy val fixNettyForGrpc = "io.netty" % "netty-all" % "4.1.11.Final"
lazy val fixNettyForGrpc = "io.netty" % "netty-all" % "4.1.17.Final"
lazy val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "4.9.0.201710071750-r"
lazy val siva = "tech.sourced" % "siva-java" % "0.1.3"
lazy val bblfsh = "org.bblfsh" % "bblfsh-client" % "1.3.3"
lazy val bblfsh = "org.bblfsh" % "bblfsh-client" % "1.8.2"
lazy val enry = "tech.sourced" % "enry-java" % "1.6.3"
lazy val commonsIO = "commons-io" % "commons-io" % "2.5"
lazy val commonsPool = "org.apache.commons" % "commons-pool2" % "2.4.3"
Expand Down

0 comments on commit 1cb91cb

Please sign in to comment.