Skip to content

Import FoundationEssentials instead of Foundation when available #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adam-fowler merged 2 commits into from
Oct 9, 2024
Merged

Import FoundationEssentials instead of Foundation when available #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992158a
Import FoundationEssentials instead of Foundation when available
Cyberbeni Oct 8, 2024
e826c91
Fix import order
Cyberbeni Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Sources/MQTTNIO/AsyncAwaitSupport/MQTTClient+async.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
//
//===----------------------------------------------------------------------===//

#if canImport(FoundationEssentials)
import Dispatch
import FoundationEssentials
#else
import Foundation
#endif
import NIOCore

@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
Expand Down
4 changes: 4 additions & 0 deletions Sources/MQTTNIO/AsyncAwaitSupport/MQTTClientV5+async.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
//
//===----------------------------------------------------------------------===//

#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif
import NIOCore

@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
Expand Down
4 changes: 4 additions & 0 deletions Sources/MQTTNIO/MQTTConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
//
//===----------------------------------------------------------------------===//

#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif
#if canImport(Network)
import Network
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/MQTTNIO/MQTTPacket.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ struct MQTTAuthPacket: MQTTPacket {

/// MQTT incoming packet parameters.
struct MQTTIncomingPacket: MQTTPacket {
var description: String { "Incoming Packet 0x\(String(format: "%x", self.type.rawValue))" }
var description: String { "Incoming Packet 0x\(String(self.type.rawValue, radix: 16))" }

/// Type of incoming MQTT packet.
let type: MQTTPacketType
Expand Down