Migrate to Swift 6

mimischi · mimischi · commit 6b78e74ae318 · 2024-11-13T19:41:57.000Z
Migrate project to Swift 6. `String.init(validatingUTF8:)` is deprecated, and we now use `String.init(validatingCString:)` instead. Closes #169
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the swift-kafka-client open source project
diff --git a/Sources/Kafka/KafkaAcknowledgedMessage.swift b/Sources/Kafka/KafkaAcknowledgedMessage.swift
@@ -40,7 +40,7 @@ public struct KafkaAcknowledgedMessage {
             throw KafkaError.rdKafkaError(wrapping: rdKafkaMessage.err)
         }
 
-        guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
+        guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
             fatalError("Received topic name that is non-valid UTF-8")
         }
         self.topic = topic
diff --git a/Sources/Kafka/KafkaConsumerMessage.swift b/Sources/Kafka/KafkaConsumerMessage.swift
@@ -52,7 +52,7 @@ public struct KafkaConsumerMessage {
             }
         }
 
-        guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
+        guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
             fatalError("Received topic name that is non-valid UTF-8")
         }
         self.topic = topic

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version: 5.9`
	`1`	`+// swift-tools-version: 6.0`
`2`	`2`	`//===----------------------------------------------------------------------===//`
`3`	`3`	`//`
`4`	`4`	`// This source file is part of the swift-kafka-client open source project`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public struct KafkaAcknowledgedMessage {`
`40`	`40`	`throw KafkaError.rdKafkaError(wrapping: rdKafkaMessage.err)`
`41`	`41`	`}`
`42`	`42`
`43`		`- guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
	`43`	`+ guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
`44`	`44`	`fatalError("Received topic name that is non-valid UTF-8")`
`45`	`45`	`}`
`46`	`46`	`self.topic = topic`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public struct KafkaConsumerMessage {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
	`55`	`+ guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
`56`	`56`	`fatalError("Received topic name that is non-valid UTF-8")`
`57`	`57`	`}`
`58`	`58`	`self.topic = topic`