diff --git a/Package.resolved b/Package.resolved index 9bcdf7d..9110e82 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "fb0697fbc4412c87ed2cfc6f45cc95cff81c22ada5d6600fc74c6faf707f78cb", + "originHash" : "964ba52f829bb58fb4b43448757fcca80c913ab20421daf38960b43ef5193aec", "pins" : [ { "identity" : "jjliso8601dateformatter", "kind" : "remoteSourceControl", "location" : "https://github.com/michaeleisel/JJLISO8601DateFormatter.git", "state" : { - "revision" : "741a9e45db01148a8ac60c5e12f7c978181a22d3", - "version" : "0.1.8" + "revision" : "50d5ea26ffd3f82e3db8516d939d80b745e168cf", + "version" : "0.2.0" } }, { diff --git a/Package.swift b/Package.swift index cf9b405..1721b49 100644 --- a/Package.swift +++ b/Package.swift @@ -9,6 +9,10 @@ let packageDependencies: [Package.Dependency] = [ url: "https://github.com/ibireme/yyjson.git", from: "0.12.0" ), + .package( + url: "https://github.com/michaeleisel/JJLISO8601DateFormatter.git", + from: "0.2.0" + ), ] #else let packageDependencies: [Package.Dependency] = [ @@ -18,7 +22,7 @@ let packageDependencies: [Package.Dependency] = [ ), .package( url: "https://github.com/michaeleisel/JJLISO8601DateFormatter.git", - from: "0.1.8" + from: "0.2.0" ), ] #endif @@ -29,6 +33,10 @@ let targetDependencies: [Target.Dependency] = [ name: "yyjson", package: "yyjson" ), + .product( + name: "JJLISO8601DateFormatter", + package: "JJLISO8601DateFormatter" + ), ] #else let targetDependencies: [Target.Dependency] = [ diff --git a/Sources/ReerJSON/Utilities.swift b/Sources/ReerJSON/Utilities.swift index 2a56e38..015ae52 100644 --- a/Sources/ReerJSON/Utilities.swift +++ b/Sources/ReerJSON/Utilities.swift @@ -10,11 +10,10 @@ // //===----------------------------------------------------------------------===// -#if os(Linux) import Foundation -#else +//#if !os(Linux) import JJLISO8601DateFormatter -#endif +//#endif enum CodingPathNode: Sendable { case root @@ -147,16 +146,16 @@ extension Optional { } } -#if os(Linux) -nonisolated(unsafe) let _iso8601Formatter: ISO8601DateFormatter = { - let formatter = ISO8601DateFormatter() - formatter.formatOptions = .withInternetDateTime - return formatter -}() -#else +//#if os(Linux) +//nonisolated(unsafe) let _iso8601Formatter: ISO8601DateFormatter = { +// let formatter = ISO8601DateFormatter() +// formatter.formatOptions = .withInternetDateTime +// return formatter +//}() +//#else nonisolated(unsafe) let _iso8601Formatter: JJLISO8601DateFormatter = { let formatter = JJLISO8601DateFormatter() formatter.formatOptions = .withInternetDateTime return formatter }() -#endif +//#endif