Skip to content

test JJLISO8601DateFormatter 0.2.0 on Linux #3

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

Closed
vnixx wants to merge 1 commit into from
Closed

test JJLISO8601DateFormatter 0.2.0 on Linux #3

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: 3 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand All @@ -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
Expand All @@ -29,6 +33,10 @@ let targetDependencies: [Target.Dependency] = [
name: "yyjson",
package: "yyjson"
),
.product(
name: "JJLISO8601DateFormatter",
package: "JJLISO8601DateFormatter"
),
]
#else
let targetDependencies: [Target.Dependency] = [
Expand Down
21 changes: 10 additions & 11 deletions Sources/ReerJSON/Utilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
//
//===----------------------------------------------------------------------===//

#if os(Linux)
import Foundation
#else
//#if !os(Linux)
import JJLISO8601DateFormatter
#endif
//#endif

enum CodingPathNode: Sendable {
case root
Expand Down Expand Up @@ -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
Loading