Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import class Foundation.ProcessInfo

var swiftSettings: [SwiftSetting] {
[
.unsafeFlags([
"-Xfrontend", "-define-availability",
"-Xfrontend", "SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0",
]),

.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("InternalImportsByDefault"),
.enableUpcomingFeature("MemberImportVisibility"),
Expand Down
5 changes: 5 additions & 0 deletions Package@swift-6.0.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import class Foundation.ProcessInfo

var swiftSettings: [SwiftSetting] {
[
.unsafeFlags([
"-Xfrontend", "-define-availability",
"-Xfrontend", "SwiftStdlib 5.9:macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0",
]),

.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("InternalImportsByDefault"),
.enableUpcomingFeature("MemberImportVisibility"),
Expand Down
3 changes: 1 addition & 2 deletions Sources/JSONCodable/Double+toJSONEncodable.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ extension Double {
}
#endif

// @available(SwiftStdlib 5.9, *)
@available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *)
@available(SwiftStdlib 5.9, *)
func toJSONEncodable() -> Double {
self
}
Expand Down
4 changes: 1 addition & 3 deletions Sources/JSONCodable/JSONValue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ extension JSONValue: CustomDebugStringConvertible {
public var debugDescription: String {
let encoder = JSONEncoder()
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *) {
encoder.outputFormatting.insert(.withoutEscapingSlashes)
}
encoder.outputFormatting.insert(.withoutEscapingSlashes)

do {
guard let json = String(data: try encoder.encode(self), encoding: .utf8) else {
Expand Down
Loading