From 92a15ee97fb104ea5fe8b9019f54985b84a3d44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D0=B9=20=D0=9B=D0=B5?= =?UTF-8?q?=D0=B2=D0=B0=D1=88=D0=BE=D0=B2?= Date: Thu, 27 Oct 2016 15:56:39 +0300 Subject: [PATCH 1/2] Sorting JSON arrays by toString removed --- src/main/scala/com/twitter/diffy/lifter/JsonLifter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/twitter/diffy/lifter/JsonLifter.scala b/src/main/scala/com/twitter/diffy/lifter/JsonLifter.scala index fc789602d..8706e97c9 100644 --- a/src/main/scala/com/twitter/diffy/lifter/JsonLifter.scala +++ b/src/main/scala/com/twitter/diffy/lifter/JsonLifter.scala @@ -25,7 +25,7 @@ object JsonLifter { case JsonToken.START_ARRAY => node.elements.toSeq.map { element => lift(element) - } sortBy { _.toString } + } case JsonToken.START_OBJECT => { val fields = node.fieldNames.toSet if (fields.exists{ field => Try(toolbox.parse(s"object ${field}123")).isThrow}) { From 8d94b764219c810fb51d2b55a0f8ffeed6dd415f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D0=B9=20=D0=9B=D0=B5?= =?UTF-8?q?=D0=B2=D0=B0=D1=88=D0=BE=D0=B2?= Date: Mon, 7 Nov 2016 13:06:29 +0300 Subject: [PATCH 2/2] Added logback-classic dependency --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 77fef5631..795be06ee 100644 --- a/build.sbt +++ b/build.sbt @@ -50,6 +50,7 @@ lazy val baseSettings = Seq( ), scalacOptions in (Compile, console) := compilerOptions, libraryDependencies ++= Seq( + "ch.qos.logback" % "logback-classic" % "1.1.7", "com.twitter" %% "finagle-http" % "6.28.0", "com.twitter" %% "finagle-thriftmux" % "6.28.0", "com.twitter" %% "scrooge-generator" % "4.0.0",