Skip to content
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.

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

Update scalafmt-core to 3.8.5 #277

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ d12fb4427a1ccff4660b6c559b858adfe4eebaf0

# Scala Steward: Reformat with scalafmt 3.8.3
3f4adc5fafe17c8de66876d3a93a8eb54e1d65d3

# Scala Steward: Reformat with scalafmt 3.8.5
1561c4c81d5e6f12c6025b46fd7d9faca352693a
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.5
runner.dialect = scala213
project.git = true
style = defaultWithAlign
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object PerfFixtureHelpers {
private[benchmarks] trait PerfFixtureHelpers extends LazyLogging {
import PerfFixtureHelpers._

val producerTimeout = 6 minutes
val producerTimeout = 6.minutes
val logPercentStep = 25
val adminClientCloseTimeout = Duration.ofSeconds(5)
val producerCloseTimeout = adminClientCloseTimeout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import scala.language.postfixOps
import scala.util.Success

object ReactiveKafkaConsumerBenchmarks extends LazyLogging with InflightMetrics {
val streamingTimeout: FiniteDuration = 30 minutes
val streamingTimeout: FiniteDuration = 30.minutes
type NonCommittableFixture = ReactiveKafkaConsumerTestFixture[ConsumerRecord[Array[Byte], String]]
type CommittableFixture = ReactiveKafkaConsumerTestFixture[CommittableMessage[Array[Byte], String]]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import scala.concurrent.duration._
import scala.language.postfixOps

object ReactiveKafkaProducerBenchmarks extends LazyLogging {
val streamingTimeout = 30 minutes
val streamingTimeout = 30.minutes
val logStep = 100000

type Fixture = ReactiveKafkaConsumerTestFixture[CommittableMessage[Array[Byte], String]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import scala.language.postfixOps
import scala.util.Success

object ReactiveKafkaTransactionBenchmarks extends LazyLogging {
val streamingTimeout: FiniteDuration = 30 minutes
val streamingTimeout: FiniteDuration = 30.minutes
type TransactionFixture = ReactiveKafkaTransactionTestFixture[KTransactionMessage, KProducerMessage, KResult]

/**
Expand Down
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ lazy val docs = project
Preprocess / siteSubdirName := s"api/pekko-connectors-kafka/${projectInfoVersion.value}",
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
Preprocess / preprocessRules := Seq(
("\\.java\\.scala".r, _ => ".java"),
("https://javadoc\\.io/page/".r, _ => "https://javadoc\\.io/static/"),
("\\.java\\.scala".r, _ => ".java"), ("https://javadoc\\.io/page/".r, _ => "https://javadoc\\.io/static/"),
// bug in Scaladoc
("https://docs\\.oracle\\.com/en/java/javase/11/docs/api/java.base/java/time/Duration\\$.html".r,
_ => "https://docs\\.oracle\\.com/en/java/javase/11/docs/api/java.base/java/time/Duration.html"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val partition0 = new TopicPartition(topic1, 0)
val consumerSettings = consumerDefaults.withGroupId(group1)

val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic1, 1 to 10))

Expand All @@ -49,7 +49,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val nonExistingPartition = new TopicPartition("non-existing topic", 0)
val consumerSettings = consumerDefaults.withGroupId(group1)

val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

val beginningOffsetsFuture = metadataClient
.getBeginningOffsets(Set(nonExistingPartition))
Expand All @@ -65,7 +65,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val partition0 = new TopicPartition(topic1, 0)
val consumerSettings = consumerDefaults.withGroupId(group1)

val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic1, 1 to 10))

Expand All @@ -83,7 +83,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val group1 = createGroupId(1)
val partition0 = new TopicPartition(topic1, 0)
val consumerSettings = consumerDefaults.withGroupId(group1)
val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic1, 1 to 10))

Expand All @@ -98,7 +98,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val group1 = createGroupId(1)
val nonExistingPartition = new TopicPartition("non-existing topic", 0)
val consumerSettings = consumerDefaults.withGroupId(group1)
val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

val endOffsetsFuture = metadataClient.getEndOffsets(Set(nonExistingPartition))

Expand All @@ -112,7 +112,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val group1 = createGroupId(1)
val partition0 = new TopicPartition(topic1, 0)
val consumerSettings = consumerDefaults.withGroupId(group1)
val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic1, 1 to 10))

Expand All @@ -128,7 +128,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val topic1 = createTopic(suffix = 1, partitions = 2)
val topic2 = createTopic(suffix = 2, partitions = 1)
val consumerSettings = consumerDefaults.withGroupId(group)
val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic1, 1 to 10, partition = 0))
awaitProduce(produce(topic1, 1 to 10, partition = 1))
Expand All @@ -148,7 +148,7 @@ class MetadataClientSpec extends SpecBase with TestcontainersKafkaLike {
val group = createGroupId(1)
val topic = createTopic(suffix = 1, partitions = 2)
val consumerSettings = consumerDefaults.withGroupId(group)
val metadataClient = MetadataClient.create(consumerSettings, 1 second)
val metadataClient = MetadataClient.create(consumerSettings, 1.second)

awaitProduce(produce(topic, 1 to 10, partition = 0))
awaitProduce(produce(topic, 1 to 10, partition = 1))
Expand Down