Skip to content

Commit

Permalink
Merge pull request #51 from scala-steward/update/scalafmt-core-3.7.10
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.7.10
  • Loading branch information
Maksimall89 authored Jul 17, 2023
2 parents ffc3b31 + 3149237 commit 5e19cde
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.10
6b554b7d7f25ed6f5a00329be1d0368b36920061
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.7.10
binPack.parentConstructors = true
maxColumn = 128
includeCurlyBraceInSelectChains = false
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/.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.7.10
binPack.parentConstructors = true
maxColumn = 128
includeCurlyBraceInSelectChains = false
Expand Down
36 changes: 18 additions & 18 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@ lazy val root = (project in file("."))
libraryDependencies ++= gelf,
libraryDependencies ++= gatlingPicatinny,
libraryDependencies ++= janino,
$if(amqpPlugin.truthy)$
libraryDependencies ++= amqpPlugin,
$if(amqpPlugin.truthy) $
libraryDependencies ++= amqpPlugin,
$endif$
$if(kafkaPlugin.truthy)$
libraryDependencies ++= kafkaPlugin,
$if (kafkaPlugin.truthy) $
libraryDependencies ++= kafkaPlugin,
libraryDependencies ++= kafkaSerializer,
libraryDependencies ++= avro4s,
$endif$
$if(jdbcPlugin.truthy)$
libraryDependencies ++= jdbcPlugin,
$if (jdbcPlugin.truthy) $
libraryDependencies ++= jdbcPlugin,
libraryDependencies ++= postgresJdbc,
$endif$
scalacOptions ++= Seq(
"-encoding",
"UTF-8",
"-Xfatal-warnings",
"-deprecation",
"-feature",
"-unchecked",
"-language:implicitConversions",
"-language:higherKinds",
"-language:existentials",
"-language:postfixOps",
),
scalacOptions ++= Seq (
"-encoding",
"UTF-8",
"-Xfatal-warnings",
"-deprecation",
"-feature",
"-unchecked",
"-language:implicitConversions",
"-language:higherKinds",
"-language:existentials",
"-language:postfixOps"
),
)
6 changes: 3 additions & 3 deletions src/main/g8/project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ object Dependencies {
lazy val gelf: Seq[ModuleID] = Seq("de.siegmar" % "logback-gelf" % "4.0.2")
lazy val gatlingPicatinny: Seq[ModuleID] = Seq("ru.tinkoff" %% "gatling-picatinny" % "$gatling_picatinny_version$")
lazy val janino: Seq[ModuleID] = Seq("org.codehaus.janino" % "janino" % "3.1.8")
$if(amqpPlugin.truthy)$
$if(amqpPlugin.truthy) $
lazy val amqpPlugin: Seq[ModuleID] = Seq("ru.tinkoff" %% "gatling-amqp-plugin" % "0.8.0")
$endif$
$if(kafkaPlugin.truthy)$
$if(kafkaPlugin.truthy) $
lazy val kafkaPlugin: Seq[ModuleID] = Seq("ru.tinkoff" %% "gatling-kafka-plugin" % "0.9.0")
lazy val kafkaSerializer: Seq[ModuleID] = Seq("io.confluent" % "kafka-avro-serializer" % "5.3.0")
lazy val avro4s: Seq[ModuleID] = Seq("com.sksamuel.avro4s" %% "avro4s-core" % "4.0.4")
$endif$
$if(jdbcPlugin.truthy)$
$if(jdbcPlugin.truthy) $
lazy val jdbcPlugin: Seq[ModuleID] = Seq("ru.tinkoff" %% "gatling-jdbc-plugin" % "0.7.0")
lazy val postgresJdbc: Seq[ModuleID] = Seq("org.postgresql" % "postgresql" % "42.3.3")
$endif$
Expand Down
5 changes: 2 additions & 3 deletions src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
addSbtPlugin("io.gatling" % "gatling-sbt" % "$sbt_gatling_version$")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "$sbt_scalafmt_version$")

addSbtPlugin("io.gatling" % "gatling-sbt" % "$sbt_gatling_version$")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "$sbt_scalafmt_version$")
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@ package $package$

import io.gatling.core.Predef._
import io.gatling.http.Predef._
$if(kafkaPlugin.truthy)$
$if(kafkaPlugin.truthy) $
import org.apache.kafka.clients.producer.ProducerConfig
$endif$
$if(amqpPlugin.truthy)$
$if(amqpPlugin.truthy) $
import ru.tinkoff.gatling.amqp.Predef._
import ru.tinkoff.gatling.amqp.protocol.AmqpProtocolBuilder
$endif$
import ru.tinkoff.gatling.config.SimulationConfig._
$if(kafkaPlugin.truthy)$
$if(kafkaPlugin.truthy) $
import ru.tinkoff.gatling.kafka.Predef.kafka
import ru.tinkoff.gatling.kafka.protocol.KafkaProtocolBuilder
$endif$
$if(jdbcPlugin.truthy)$
$if(jdbcPlugin.truthy) $
import ru.tinkoff.load.jdbc.Predef._
import ru.tinkoff.load.jdbc.protocol.JdbcProtocolBuilder

import scala.concurrent.duration.DurationInt
$endif$

package object $name;format="word"$ {
package object $name;
format = "word" $ {

$if(http.truthy)$
$if(http.truthy) $
// common http protocol params (eg headers, checks)
val httpProtocol = http
.baseUrl(
Expand All @@ -36,15 +37,15 @@ package object $name;format="word"$ {
.disableFollowRedirect
$endif$

$if(jdbcPlugin.truthy)$
$if(jdbcPlugin.truthy) $
val jdbcProtocol: JdbcProtocolBuilder = DB
.url(getStringParam("dbUrl"))
.username(getStringParam("dbUser"))
.password(getStringParam("dbPassword"))
.connectionTimeout(2.minute)
$endif$

$if(amqpPlugin.truthy)$
$if(amqpPlugin.truthy) $
val amqpHost: String = getStringParam("amqpHost")
val amqpPort: Int = getIntParam("amqpPort")
val amqpLogin: String = getStringParam("amqpLogin")
Expand All @@ -63,7 +64,7 @@ package object $name;format="word"$ {
.consumerThreadsCount(8)
.usePersistentDeliveryMode
$endif$
$if(kafkaPlugin.truthy)$
$if(kafkaPlugin.truthy) $
val kafkaProtocol: KafkaProtocolBuilder = kafka
.topic("myTopic")
.properties(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package $package$.$name;format="word"$
package $package$.$name; format = "word" $

import io.gatling.app.Gatling
import io.gatling.core.config.GatlingPropertiesBuilder
Expand Down

0 comments on commit 5e19cde

Please sign in to comment.