From adb0d9813f2a5bbf11e077305394a7a0d7cac26b Mon Sep 17 00:00:00 2001 From: John Date: Tue, 15 Feb 2022 17:40:22 +0300 Subject: [PATCH] feat: bump gatling 3.7.5 version (#68) * feat: bump gatling 3.7.5 version Co-authored-by: i.akhaltsev --- .scalafmt.conf | 2 +- project/Dependencies.scala | 6 +++--- project/build.properties | 2 +- .../gatling/feeders/SeparatedValuesFeeder.scala | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 09a5f4b..ca30f2c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ runner.dialect = "scala213" -version = 3.0.8 +version = 3.4.0 binPack.parentConstructors = true maxColumn = 128 includeCurlyBraceInSelectChains = false diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d4e2949..73ef519 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ object Dependencies { "io.gatling" % "gatling-core", "io.gatling" % "gatling-http", "io.gatling" % "gatling-redis", - ).map(_ % "3.7.4" % Provided) + ).map(_ % "3.7.5" % Provided) lazy val fastUUID = Seq( "com.eatthepath" % "fast-uuid" % "0.2.0" % Provided, @@ -17,8 +17,8 @@ object Dependencies { ).map(_ % "3.7.4" % Test) lazy val json4s: Seq[ModuleID] = Seq( - "org.json4s" %% "json4s-native" % "4.0.2", - "org.json4s" %% "json4s-jackson" % "4.0.2", + "org.json4s" %% "json4s-native" % "4.0.4", + "org.json4s" %% "json4s-jackson" % "4.0.4", ) lazy val pureConfig: Seq[ModuleID] = Seq( diff --git a/project/build.properties b/project/build.properties index 83b2dbb..679d19c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.6.1 +sbt.version=1.6.2 diff --git a/src/main/scala/ru/tinkoff/gatling/feeders/SeparatedValuesFeeder.scala b/src/main/scala/ru/tinkoff/gatling/feeders/SeparatedValuesFeeder.scala index 0d62549..5b78ac1 100644 --- a/src/main/scala/ru/tinkoff/gatling/feeders/SeparatedValuesFeeder.scala +++ b/src/main/scala/ru/tinkoff/gatling/feeders/SeparatedValuesFeeder.scala @@ -24,11 +24,11 @@ object SeparatedValuesFeeder { * @return * a new feeder * @example - * {{{ + * {{{ * val sourceString = "v21;v22;v23" * val separatedValuesFeeder: FeederBuilderBase[String] = * SeparatedValuesFeeder("someValues", sourceString, ';') // this will return Vector(Map(someValues -> v21), Map(someValues -> v22), Map(someValues -> v23)) - * }}} + * }}} */ def apply(paramName: String, source: String, separator: Char): IndexedSeq[Record[String]] = { @@ -50,11 +50,11 @@ object SeparatedValuesFeeder { * @return * a new feeder * @example - * {{{ + * {{{ * val sourceSeq = Seq("1,two", "3,4") * val separatedValuesFeeder: FeederBuilderBase[String] = * SeparatedValuesFeeder.csv("someValues", sourceSeq) // this will return Vector(Map(someValues -> 1), Map(someValues -> two), Map(someValues -> 3), Map(someValues -> 4)) - * }}} + * }}} */ def apply(paramName: String, source: Seq[String], separator: Char)(implicit configuration: GatlingConfiguration, @@ -78,7 +78,7 @@ object SeparatedValuesFeeder { * @return * a new feeder * @example - * {{{ + * {{{ * val vaultFeeder: FeederBuilderBase[String] = Vector( * Map( * "HOSTS" -> "host11,host12", @@ -92,7 +92,7 @@ object SeparatedValuesFeeder { * val mapFee: FeederBuilderBase[String] = SeparatedValuesFeeder(None, vaultFeeder.readRecords, ',') * val separatedValuesFeeder: FeederBuilderBase[String] = * SeparatedValuesFeeder("prefix", sourceSeq, ',') // this will return Vector(Map(HOSTS -> host11), Map(HOSTS -> host12), Map(USERS -> user11), Map(HOSTS -> host21), Map(HOSTS -> host22), Map(USERS -> user21), Map(USERS -> user22), Map(USERS -> user23)) - * }}} + * }}} */ def apply(paramPrefix: Option[String], source: Seq[Map[String, Any]], separator: Char)(implicit configuration: GatlingConfiguration,