From 2e8db9701bcc8a3564ce367c460ec764c33d6879 Mon Sep 17 00:00:00 2001 From: Michal Srutek Date: Fri, 27 May 2022 07:28:24 +0200 Subject: [PATCH] Fix deprecation warning on iOS 13+ --- EventSource/Event.swift | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/EventSource/Event.swift b/EventSource/Event.swift index 1427cbb..ce0b186 100644 --- a/EventSource/Event.swift +++ b/EventSource/Event.swift @@ -84,12 +84,26 @@ private extension Event { static func parseLine(_ line: String, newLineCharacters: [String]) -> (key: String?, value: String?) { var key: NSString?, value: NSString? let scanner = Scanner(string: line) - scanner.scanUpTo(":", into: &key) - scanner.scanString(":", into: nil) + if #available(iOS 13.0, *) { + if let scannedKey = scanner.scanUpToString(":") { + key = scannedKey as NSString + } + _ = scanner.scanString(":") + } else { + scanner.scanUpTo(":", into: &key) + scanner.scanString(":", into: nil) + } for newline in newLineCharacters { - if scanner.scanUpTo(newline, into: &value) { - break + if #available(iOS 13.0, *) { + if let scannedValue = scanner.scanUpToString(newline) { + value = scannedValue as NSString + break + } + } else { + if scanner.scanUpTo(newline, into: &value) { + break + } } }