Enable Swift 6 support

mimischi · mimischi · commit 1c17cfd8afec · 2024-11-13T21:32:20.000Z
Enable Swift 6 support. `String.init(validatingUTF8:)` is deprecated, and we use `String.init(validatingCString:)` instead. Closes swift-server#169
diff --git a/Sources/Kafka/KafkaAcknowledgedMessage.swift b/Sources/Kafka/KafkaAcknowledgedMessage.swift
@@ -40,9 +40,16 @@ public struct KafkaAcknowledgedMessage {
             throw KafkaError.rdKafkaError(wrapping: rdKafkaMessage.err)
         }
 
+        #if swift(<6.0)
         guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
             fatalError("Received topic name that is non-valid UTF-8")
         }
+        #else
+        guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
+            fatalError("Received topic name that is non-valid UTF-8")
+        }
+        #endif
+
         self.topic = topic
 
         self.partition = KafkaPartition(rawValue: Int(rdKafkaMessage.partition))
diff --git a/Sources/Kafka/KafkaConsumerMessage.swift b/Sources/Kafka/KafkaConsumerMessage.swift
@@ -52,9 +52,16 @@ public struct KafkaConsumerMessage {
             }
         }
 
+        #if swift(<6.0)
         guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
             fatalError("Received topic name that is non-valid UTF-8")
         }
+        #else
+        guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {
+            fatalError("Received topic name that is non-valid UTF-8")
+        }
+        #endif
+
         self.topic = topic
 
         self.partition = KafkaPartition(rawValue: Int(rdKafkaMessage.partition))

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,16 @@ public struct KafkaConsumerMessage {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ #if swift(<6.0)`
`55`	`56`	`guard let topic = String(validatingUTF8: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
`56`	`57`	`fatalError("Received topic name that is non-valid UTF-8")`
`57`	`58`	`}`
	`59`	`+ #else`
	`60`	`+ guard let topic = String(validatingCString: rd_kafka_topic_name(rdKafkaMessage.rkt)) else {`
	`61`	`+ fatalError("Received topic name that is non-valid UTF-8")`
	`62`	`+ }`
	`63`	`+ #endif`
	`64`	`+`
`58`	`65`	`self.topic = topic`
`59`	`66`
`60`	`67`	`self.partition = KafkaPartition(rawValue: Int(rdKafkaMessage.partition))`