Skip to content

Commit

Permalink
Try latest jline version
Browse files Browse the repository at this point in the history
  • Loading branch information
Piyush Narang committed Mar 21, 2017
1 parent d973d45 commit a77be5e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ val slf4jVersion = "1.6.6"
val thriftVersion = "0.5.0"
val junitVersion = "4.10"
val macroCompatVersion = "1.1.1"
val jlineVersion = "2.14.3"

def scrooge(scalaVersion: String) = "com.twitter" %% "scrooge-serializer" % scroogeVersion

Expand Down Expand Up @@ -163,6 +164,7 @@ val sharedSettings = assemblySettings ++ scalariformSettings ++ Seq(
case s if s.endsWith("pom.xml") => MergeStrategy.last
case s if s.endsWith(".jnilib") => MergeStrategy.rename
case s if s.endsWith("jansi.dll") => MergeStrategy.rename
case s if s.endsWith("libjansi.so") => MergeStrategy.rename
case s if s.endsWith("properties") => MergeStrategy.filterDistinctLines
case x => (mergeStrategy in assembly).value(x)
},
Expand Down Expand Up @@ -458,7 +460,7 @@ lazy val scaldingRepl = module("repl")
import com.twitter.scalding.ReplImplicitContext._
""",
libraryDependencies ++= Seq(
"jline" % "jline" % scalaVersion.value.take(4),
"jline" % "jline" % jlineVersion,
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.apache.hadoop" % "hadoop-client" % hadoopVersion % "provided",
Expand Down

0 comments on commit a77be5e

Please sign in to comment.