Skip to content

Commit

Permalink
feat: update gatling 3.10.5 (#3)
Browse files Browse the repository at this point in the history
* feat: update gatling 3.10.5
  • Loading branch information
jigarkhwar authored May 22, 2024
1 parent 40c5d27 commit be1f106
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runner.dialect = "scala213"
version = 3.7.3
version = 3.8.1
binPack.parentConstructors = true
maxColumn = 128
includeCurlyBraceInSelectChains = false
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Dependencies._
import Dependencies.*

def UtilsModule(id: String) = Project(id, file(id))

lazy val root = (project in file("."))
.enablePlugins(GitVersioning)
.settings(
name := "gatling-picatinny",
scalaVersion := "2.13.10",
scalaVersion := "2.13.14",
libraryDependencies ++= gatlingCore,
libraryDependencies ++= gatling,
libraryDependencies ++= fastUUID,
Expand Down
28 changes: 14 additions & 14 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sbt._
import sbt.*

object Dependencies {
lazy val gatlingCore: Seq[ModuleID] = Seq(
Expand All @@ -9,38 +9,38 @@ object Dependencies {
"io.gatling" % "gatling-redis",
"io.gatling" % "gatling-core-java",
"io.gatling" % "gatling-redis-java",
).map(_ % "3.9.5" % Provided)
).map(_ % "3.10.5" % Provided)

lazy val fastUUID = Seq(
lazy val fastUUID: Seq[ModuleID] = Seq(
"com.eatthepath" % "fast-uuid" % "0.2.0" % Provided,
)

lazy val gatling: Seq[ModuleID] = Seq(
"io.gatling.highcharts" % "gatling-charts-highcharts",
"io.gatling" % "gatling-test-framework",
).map(_ % "3.9.5" % Test)
).map(_ % "3.10.5" % Test)

lazy val json4s: Seq[ModuleID] = Seq(
"org.json4s" %% "json4s-native" % "4.1.0-M3",
"org.json4s" %% "json4s-jackson" % "4.1.0-M3",
"org.json4s" %% "json4s-native" % "4.1.0-M5",
"org.json4s" %% "json4s-jackson" % "4.1.0-M5",
)

lazy val pureConfig: Seq[ModuleID] = Seq(
"com.github.pureconfig" %% "pureconfig" % "0.17.4",
"com.github.pureconfig" %% "pureconfig-yaml" % "0.17.4",
"com.github.pureconfig" %% "pureconfig" % "0.17.6",
"com.github.pureconfig" %% "pureconfig-yaml" % "0.17.6",
)

lazy val jackson: Seq[ModuleID] = Seq(
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.15.1",
"com.fasterxml.jackson.core" % "jackson-core" % "2.15.1",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.17.0",
"com.fasterxml.jackson.core" % "jackson-core" % "2.17.0",
)

lazy val scalaTest: Seq[ModuleID] = Seq(
"org.scalatest" %% "scalatest" % "3.2.15" % "test",
"org.scalatest" %% "scalatest" % "3.2.18" % "test",
)

lazy val scalaCheck: Seq[ModuleID] = Seq(
"org.scalacheck" %% "scalacheck" % "1.17.0" % "test",
"org.scalacheck" %% "scalacheck" % "1.18.0" % "test",
)

lazy val scalaTestPlus: Seq[ModuleID] = Seq(
Expand All @@ -56,7 +56,7 @@ object Dependencies {
)

lazy val jwt: Seq[ModuleID] = Seq(
"com.github.jwt-scala" %% "jwt-core" % "9.2.0",
"com.github.jwt-scala" %% "jwt-core" % "10.0.1",
)

lazy val circeDeps: Seq[ModuleID] = Seq(
Expand Down Expand Up @@ -85,6 +85,6 @@ object Dependencies {
),
)

lazy val junit: Seq[ModuleID] = Seq("org.junit.jupiter" % "junit-jupiter-engine" % "5.9.3" % Test)
lazy val junit: Seq[ModuleID] = Seq("org.junit.jupiter" % "junit-jupiter-engine" % "5.10.2" % Test)

}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# suppress inspection "UnusedProperty"
sbt.version=1.8.2
sbt.version=1.9.9
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.3.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("io.gatling" % "gatling-sbt" % "4.9.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
2 changes: 2 additions & 0 deletions publish.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ ThisBuild / scmInfo := Some(
),
)

ThisBuild / scalaVersion := "2.13.14"

ThisBuild / developers := List(
Developer(
id = "jigarkhwar",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public ScenarioBuilder toRandomScenario() {

List<Choice.WithWeight> prepRequests = requests
.stream()
.map(request -> Choice.withWeight(100 * request._1 / intensitySum, request._2))
.map(request -> CoreDsl.percent(100 * request._1 / intensitySum).then(request._2))
.toList();

return scenario(oneProfile.name()).randomSwitch().on(prepRequests);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.galaxio.gatling.assertions

import io.gatling.commons.shared.unstable.model.stats.assertion.AssertionPathParts
import io.gatling.commons.stats.assertion.Assertion
import io.gatling.core.Predef._
import pureconfig.module.yaml.YamlConfigSource
import pureconfig.generic.auto._
import io.gatling.core.Predef.configuration
import io.gatling.core.assertion.AssertionPathParts

object AssertionsBuilder {

Expand Down

0 comments on commit be1f106

Please sign in to comment.