Skip to content

[Swift 6] Fix mutable state error in FirebaseDataEncoder.swift #14556

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
merged 8 commits into from
Mar 11, 2025
Merged

[Swift 6] Fix mutable state error in FirebaseDataEncoder.swift #14556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
883d4d9
[Swift 6] Fix mutable state error in FirebaseDataEncoder.swift
ncooke3 Mar 10, 2025
cc71dca
Update FirebaseSharedSwift/Sources/third_party/FirebaseDataEncoder/Fi…
ncooke3 Mar 10, 2025
3612f13
review
ncooke3 Mar 11, 2025
e9e43e6
approach 1
ncooke3 Mar 11, 2025
58e9dfa
Merge remote-tracking branch 'origin/main' into nc/shared-swift
ncooke3 Mar 11, 2025
2c7af59
Merge remote-tracking branch 'origin/main' into nc/shared-swift
ncooke3 Mar 11, 2025
4e1ee93
enable swift 6 tests
ncooke3 Mar 11, 2025
4c79c01
spacing
ncooke3 Mar 11, 2025
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 .github/workflows/shared-swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
- os: macos-15
xcode: Xcode_16.2
swift_version: 5.9
# - os: macos-15
# xcode: Xcode_16.2
# swift_version: 6.0
- os: macos-15
xcode: Xcode_16.2
swift_version: 6.0
runs-on: ${{ matrix.build-env.os }}
steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 8 additions & 0 deletions FirebaseSharedSwift/Sources/third_party/FirebaseDataEncoder/FirebaseDataEncoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2611,11 +2611,19 @@ fileprivate struct _JSONKey : CodingKey {
//===----------------------------------------------------------------------===//

// NOTE: This value is implicitly lazy and _must_ be lazy. We're compiled against the latest SDK (w/ ISO8601DateFormatter), but linked against whichever Foundation the user has. ISO8601DateFormatter might not exist, so we better not hit this code path on an older OS.
#if compiler(>=6)
nonisolated(unsafe) fileprivate var _iso8601Formatter: ISO8601DateFormatter = {
let formatter = ISO8601DateFormatter()
formatter.formatOptions = .withInternetDateTime
return formatter
}()
#else
fileprivate var _iso8601Formatter: ISO8601DateFormatter = {
let formatter = ISO8601DateFormatter()
formatter.formatOptions = .withInternetDateTime
return formatter
}()
#endif

//===----------------------------------------------------------------------===//
// Error Utilities
Expand Down
Loading