Skip to content

Prefer FoundationEssentials when it's available #334

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

Open
nmcc24 wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −5
Open

Prefer FoundationEssentials when it's available #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Sources/TOMLDecoder/DateTime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,12 @@ extension String {
}
}

#if canImport(Foundation)
#if canImport(FoundationEssentials) || canImport(Foundation)
#if canImport(FoundationEssentials)
public import FoundationEssentials
#else
public import Foundation
#endif

extension DateComponents {
/// Create a new `Foundation.DateComponents` from an offset date-time.
Expand Down
4 changes: 4 additions & 0 deletions Sources/TOMLDecoder/Parsing/TOMLDocument.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif

struct TOMLDocument: Equatable, @unchecked Sendable {
let tables: [InternalTOMLTable]
Expand Down
4 changes: 4 additions & 0 deletions Sources/TOMLDecoder/TOMLDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#if canImport(FoundationEssentials)
public import FoundationEssentials
#else
public import Foundation
#endif

/// Convert data for a TOML document into `Codable` types.
///
Expand Down
8 changes: 6 additions & 2 deletions Sources/TOMLDecoder/TOMLKeyedDecodingContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#if canImport(Foundation)
#if canImport(FoundationEssentials) || canImport(Foundation)
#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif
#endif
struct TOMLKeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerProtocol {
private let decoder: _TOMLDecoder
private let table: TOMLTable
Expand Down Expand Up @@ -74,7 +78,7 @@ struct TOMLKeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerProtoco
decoder.codingPath.removeLast()
}
decoder.token = token
#if canImport(Foundation)
#if canImport(FoundationEssentials) || canImport(Foundation)
// have to intercept these here otherwise Foundation will try to decode it as a float
if type == Date.self {
return try decoder.decode(Date.self) as! T
Expand Down
4 changes: 4 additions & 0 deletions Sources/TOMLDecoder/TOMLSingleValueDecodingContainer.Generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// WARNING: This file is generated from TOMLSingleValueDecodingContainer.swift.gyb
// Do not edit TOMLSingleValueDecodingContainer.swift directly.

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

extension _TOMLDecoder: SingleValueDecodingContainer {
var context: TOMLKey {
Expand Down
8 changes: 6 additions & 2 deletions Sources/TOMLDecoder/TOMLUnkeyedDecodingContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#if canImport(Foundation)
#if canImport(FoundationEssentials) || canImport(Foundation)
#if canImport(FoundationEssentials)
import FoundationEssentials
#else
import Foundation
#endif
#endif

struct TOMLUnkeyedDecodingContainer: UnkeyedDecodingContainer {
private let decoder: _TOMLDecoder
Expand Down Expand Up @@ -89,7 +93,7 @@ struct TOMLUnkeyedDecodingContainer: UnkeyedDecodingContainer {
decoder.token = token

// have to intercept these here otherwise Foundation will try to decode it as a float
#if canImport(Foundation)
#if canImport(FoundationEssentials) || canImport(Foundation)
if type == Date.self {
return try decoder.decode(Date.self) as! T
} else if type == DateComponents.self {
Expand Down
4 changes: 4 additions & 0 deletions Sources/TOMLDecoder/gyb/TOMLSingleValueDecodingContainer.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ native_types = [
// WARNING: This file is generated from ${template_name}
// Do not edit ${generated_file} directly.

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

extension _TOMLDecoder: SingleValueDecodingContainer {
var context: TOMLKey {
Expand Down
Loading