|
@@ -1,4 +1,4 @@
|
|
-val scaleneUri = uri("https://github.com/DanSimon/Scalene.git#0.1.2")
|
|
|
|
|
|
+val scaleneUri = uri("https://github.com/DanSimon/Scalene.git#0.1.3")
|
|
|
|
|
|
lazy val scaleneRouting = ProjectRef(scaleneUri,"scalene-routing")
|
|
lazy val scaleneRouting = ProjectRef(scaleneUri,"scalene-routing")
|
|
lazy val scaleneSQL = ProjectRef(scaleneUri,"scalene-sql")
|
|
lazy val scaleneSQL = ProjectRef(scaleneUri,"scalene-sql")
|
|
@@ -7,12 +7,18 @@ lazy val `scalene-benchmark` = (project in file("."))
|
|
.dependsOn(scaleneRouting)
|
|
.dependsOn(scaleneRouting)
|
|
.dependsOn(scaleneSQL)
|
|
.dependsOn(scaleneSQL)
|
|
|
|
|
|
-scalaVersion := "2.12.10"
|
|
|
|
|
|
+
|
|
|
|
+assemblyMergeStrategy in assembly := {
|
|
|
|
+ case PathList("META-INF", xs @ _*) => MergeStrategy.discard
|
|
|
|
+ case x => MergeStrategy.first
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+scalaVersion := "2.13.1"
|
|
version := "0.1.0-SNAPSHOT"
|
|
version := "0.1.0-SNAPSHOT"
|
|
|
|
|
|
libraryDependencies ++= Seq(
|
|
libraryDependencies ++= Seq(
|
|
"org.postgresql" % "postgresql" % "42.2.0",
|
|
"org.postgresql" % "postgresql" % "42.2.0",
|
|
- "org.json4s" %% "json4s-jackson" % "3.5.3",
|
|
|
|
- "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2"
|
|
|
|
|
|
+ "org.json4s" %% "json4s-jackson" % "3.6.7",
|
|
|
|
+ "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.10.2"
|
|
)
|
|
)
|
|
|
|
|