Skip to content

Update scalafmt-core to 3.9.7 #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2025
Merged

Update scalafmt-core to 3.9.7 #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
862d2d2
Update scalafmt-core to 3.9.7
scala-steward Jun 1, 2025
a52d982
Reformat with scalafmt 3.9.7
scala-steward Jun 1, 2025
5265c7f
Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs
scala-steward Jun 1, 2025
6a8ac60
Merge branch 'master' into update/scalafmt-core-3.9.7
mergify[bot] Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.13
d466da5e1e78a36c65a0768db4cece34cbea1e86

# Scala Steward: Reformat with scalafmt 3.9.7
a52d982ac83272f05b4d197d05850777268dbe47
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.9.6
version = 3.9.7
preset = defaultWithAlign
docstrings.blankFirstLine = yes
newlines.implicitParamListModifierPrefer = before
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lazy val publishSettings = Seq(
),
licenses += ("MIT", url("https://opensource.org/licenses/MIT")),
Test / publishArtifact := false,
developers := List(
developers := List(
Developer(
"manub",
"Emanuele Blanco",
Expand Down Expand Up @@ -75,8 +75,8 @@ lazy val testSettings = Seq(
)

lazy val commonSettings = Seq(
organization := "io.github.embeddedkafka",
scalaVersion := Versions.Scala213,
organization := "io.github.embeddedkafka",
scalaVersion := Versions.Scala213,
crossScalaVersions := Seq(
Versions.Scala212,
Versions.Scala213,
Expand Down
6 changes: 3 additions & 3 deletions ...schema-registry/src/main/scala/io/github/embeddedkafka/schemaregistry/EmbeddedKafka.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ trait EmbeddedKafka
kafkaLogsDir
)
val actualKafkaPort = EmbeddedKafka.kafkaPort(broker)
val restApp = startSchemaRegistry(
val restApp = startSchemaRegistry(
config.schemaRegistryPort,
actualKafkaPort,
config.customSchemaRegistryProperties
Expand Down Expand Up @@ -81,15 +81,15 @@ object EmbeddedKafka
EmbeddedZ(startZooKeeper(config.zooKeeperPort, zkLogsDir), zkLogsDir)

val actualZookeeperPort = zookeeperPort(factory)
val kafkaBroker = startKafka(
val kafkaBroker = startKafka(
kafkaPort = config.kafkaPort,
zooKeeperPort = actualZookeeperPort,
customBrokerProperties = config.customBrokerProperties,
kafkaLogDir = kafkaLogsDir
)

val actualKafkaPort = EmbeddedKafka.kafkaPort(kafkaBroker)
val restApp = EmbeddedSR(
val restApp = EmbeddedSR(
startSchemaRegistry(
config.schemaRegistryPort,
actualKafkaPort,
Expand Down
8 changes: 4 additions & 4 deletions ...c/test/scala/io/github/embeddedkafka/schemaregistry/streams/ExampleKafkaStreamsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ExampleKafkaStreamsSpec

val (inTopic, outTopic) = ("in", "out")

val stringSerde: Serde[String] = Serdes.String
val stringSerde: Serde[String] = Serdes.String
val specificAvroSerde: Serde[TestAvroClass] = {
val props = Map(
AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG -> s"http://localhost:${config.schemaRegistryPort}",
Expand All @@ -67,7 +67,7 @@ class ExampleKafkaStreamsSpec

"A Kafka streams test using Schema Registry" should {
"support kafka streams and specific record" in {
val streamBuilder = new StreamsBuilder
val streamBuilder = new StreamsBuilder
val stream: KStream[String, TestAvroClass] =
streamBuilder.stream(
inTopic,
Expand Down Expand Up @@ -115,7 +115,7 @@ class ExampleKafkaStreamsSpec
.set("name", "yaz")
.build()

val streamBuilder = new StreamsBuilder
val streamBuilder = new StreamsBuilder
val stream: KStream[String, GenericRecord] =
streamBuilder.stream(
inTopic,
Expand Down Expand Up @@ -159,7 +159,7 @@ class ExampleKafkaStreamsSpec
implicit val avroDeserializer: Deserializer[TestAvroClass] =
specificAvroSerde.deserializer

val streamBuilder = new StreamsBuilder
val streamBuilder = new StreamsBuilder
val stream: KStream[String, TestAvroClass] =
streamBuilder.stream(
inTopic,
Expand Down