Skip to content

Commit 3b90b60

Browse files
authored
Merge pull request #184 from nomisRev/renovate/all
Update all dependencies
2 parents 900bc8f + 837947c commit 3b90b60

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

Diff for: gradle/libs.versions.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
2-
kotest = "5.8.0"
3-
kafka = "3.6.1"
4-
kotlin = "1.9.22"
2+
kotest = "5.8.1"
3+
kafka = "3.7.0"
4+
kotlin = "1.9.23"
55
kotlinx-coroutines = "1.8.0"
6-
dokka = "1.9.10"
6+
dokka = "1.9.20"
77
knit = "0.5.0"
88
kover = "0.7.6"
9-
testcontainers-kafka = "1.19.6"
9+
testcontainers-kafka = "1.19.7"
1010
slf4j = "2.0.12"
1111
spotless="6.25.0"
12-
publish="0.27.0"
12+
publish="0.28.0"
1313
power-assert="0.13.0"
1414

1515
[libraries]

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

Diff for: src/main/kotlin/io/github/nomisRev/kafka/Consumer.kt

+7-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ import org.apache.kafka.clients.consumer.ConsumerRecords
6464
import org.apache.kafka.clients.consumer.KafkaConsumer
6565
import org.apache.kafka.clients.consumer.OffsetAndMetadata
6666
import org.apache.kafka.clients.consumer.RangeAssignor
67-
import org.apache.kafka.clients.consumer.internals.NoOpConsumerRebalanceListener
6867
import org.apache.kafka.common.metrics.Sensor
6968
import org.apache.kafka.common.serialization.Deserializer
7069
import org.apache.kafka.common.TopicPartition
@@ -195,7 +194,7 @@ public fun <K, V> List<ConsumerRecords<K, V>>.offsets(
195194
public fun <K, V> Flow<KafkaConsumer<K, V>>.subscribeTo(
196195
name: String,
197196
dispatcher: CoroutineDispatcher = IO,
198-
listener: ConsumerRebalanceListener = NoOpConsumerRebalanceListener(),
197+
listener: ConsumerRebalanceListener = NoOpConsumerRebalanceListener,
199198
timeout: kotlin.time.Duration = 500.milliseconds,
200199
): Flow<ConsumerRecord<K, V>> = flatMapConcat { consumer ->
201200
consumer.subscribeTo(name, dispatcher, listener, timeout)
@@ -212,7 +211,7 @@ public fun <K, V> Flow<KafkaConsumer<K, V>>.subscribeTo(
212211
public fun <K, V> KafkaConsumer<K, V>.subscribeTo(
213212
name: String,
214213
dispatcher: CoroutineDispatcher = IO,
215-
listener: ConsumerRebalanceListener = NoOpConsumerRebalanceListener(),
214+
listener: ConsumerRebalanceListener = NoOpConsumerRebalanceListener,
216215
timeout: kotlin.time.Duration = 500.milliseconds,
217216
): Flow<ConsumerRecord<K, V>> = flow {
218217
subscribe(listOf(name), listener)
@@ -365,3 +364,8 @@ public data class ConsumerSettings<K, V>(
365364
put(EXCLUDE_INTERNAL_TOPICS_CONFIG, excludeInternalTopics)
366365
}
367366
}
367+
368+
private object NoOpConsumerRebalanceListener : ConsumerRebalanceListener {
369+
override fun onPartitionsRevoked(partitions: MutableCollection<TopicPartition>?) {}
370+
override fun onPartitionsAssigned(partitions: MutableCollection<TopicPartition>?) {}
371+
}

Diff for: src/test/kotlin/io/github/nomisrev/kafka/KafkaSpec.kt

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import org.apache.kafka.common.Metric
3434
import org.apache.kafka.common.MetricName
3535
import org.apache.kafka.common.PartitionInfo
3636
import org.apache.kafka.common.TopicPartition
37+
import org.apache.kafka.common.Uuid
3738
import org.apache.kafka.common.serialization.StringDeserializer
3839
import org.apache.kafka.common.serialization.StringSerializer
3940
import org.junit.jupiter.api.AfterAll
@@ -295,6 +296,8 @@ abstract class KafkaSpec {
295296
{
296297
val producer = KafkaProducer(it.properties(), it.keySerializer, it.valueSerializer)
297298
object : Producer<String, String> {
299+
override fun clientInstanceId(p0: Duration?): Uuid =
300+
producer.clientInstanceId(p0)
298301
override fun close() {}
299302

300303
override fun close(timeout: Duration?) {}

0 commit comments

Comments
 (0)