From 5046b8432cb32ada9fe969b9a3124fd5f49e8289 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 11 Jan 2018 11:01:20 -0200 Subject: [PATCH 1/2] Fix cross build to sbt 1.1.0 --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index ab830c6..0d4e6be 100644 --- a/build.sbt +++ b/build.sbt @@ -5,6 +5,7 @@ version := "2.6.x" inThisBuild( List( scalaVersion := "2.12.4", + crossScalaVersions := Seq("2.11.12", "2.12.4"), dependencyOverrides := Seq( "org.codehaus.plexus" % "plexus-utils" % "3.0.18", "com.google.code.findbugs" % "jsr305" % "3.0.1", From a4f0ac19029729f75b531d124db6bd440a6dc8f4 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Thu, 11 Jan 2018 19:06:15 -0200 Subject: [PATCH 2/2] Fix gatling dependency --- build.sbt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0d4e6be..f63f98b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,11 @@ name := """play-java-rest-api-example""" version := "2.6.x" +def gatlingVersion(scalaBinVer: String): String = scalaBinVer match { + case "2.11" => "2.2.5" + case "2.12" => "2.3.0" +} + inThisBuild( List( scalaVersion := "2.12.4", @@ -32,8 +37,8 @@ libraryDependencies += "io.dropwizard.metrics" % "metrics-core" % "3.2.1" libraryDependencies += "com.palominolabs.http" % "url-builder" % "1.1.0" libraryDependencies += "net.jodah" % "failsafe" % "1.0.3" -libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % "2.3.0" % Test -libraryDependencies += "io.gatling" % "gatling-test-framework" % "2.3.0" % Test +libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % gatlingVersion(scalaBinaryVersion.value) % Test +libraryDependencies += "io.gatling" % "gatling-test-framework" % gatlingVersion(scalaBinaryVersion.value) % Test PlayKeys.externalizeResources := false