diff --git a/Package.swift b/Package.swift index 1b658ae..c89db5d 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let approachableConcurrency: [SwiftSetting] = [ let package = Package( name: "SimpleHTTP", - platforms: [.iOS(.v13), .macOS(.v13)], + platforms: [.iOS(.v14), .macOS(.v13)], products: [ .library(name: "SimpleHTTPFoundation", targets: ["SimpleHTTPFoundation"]), .library(name: "SimpleHTTP", targets: ["SimpleHTTP"]) diff --git a/Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift b/Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift index 0e91bdb..6947ab5 100644 --- a/Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift +++ b/Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift @@ -1,12 +1,6 @@ import Foundation import UniformTypeIdentifiers -#if os(iOS) || os(watchOS) || os(tvOS) -import MobileCoreServices -#elseif os(macOS) -import CoreServices -#endif - struct Header: Hashable, Sendable { let name: HTTPHeader let value: String @@ -157,27 +151,11 @@ public struct MultipartFormData: Sendable { } private func mimeType(from url: URL) -> String { - if #available(iOS 14.0, *), #available(macOS 11.0, *) { - guard let type = UTType(filenameExtension: url.pathExtension), let mime = type.preferredMIMEType else { - return HTTPContentType.octetStream.value - } - - return mime - } - - let contentType = UTTypeCreatePreferredIdentifierForTag( - kUTTagClassFilenameExtension, - url.pathExtension as CFString, - nil - ) - .flatMap { UTTypeCopyPreferredTagWithClass($0.takeRetainedValue(), kUTTagClassMIMEType) } - .map { $0.takeRetainedValue() } - - if let contentType = contentType { - return contentType as String + guard let type = UTType(filenameExtension: url.pathExtension), let mime = type.preferredMIMEType else { + return HTTPContentType.octetStream.value } - return HTTPContentType.octetStream.value + return mime } }