Skip to content

Bump ABI.CurrentVersion to 6.3 and ensure minor variances in JSON version numbers are permitted. #1438

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
grynspan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump ABI.CurrentVersion to 6.3 and ensure minor variances in JSON version numbers are permitted. #1438

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
15 changes: 13 additions & 2 deletions Sources/Testing/ABI/ABI.Record.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,26 @@ extension ABI.Record: Codable {
init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)

let versionNumber = try container.decode(VersionNumber.self, forKey: .version)
if versionNumber != V.versionNumber {
func validateVersionNumber(_ versionNumber: VersionNumber) throws {
if versionNumber == V.versionNumber {
return
}
#if !hasFeature(Embedded)
// Allow for alternate version numbers if they correspond to the expected
// record version (e.g. "1.2.3" might map to `v1_2_0` without a problem.)
if ABI.version(forVersionNumber: versionNumber) == V.self {
return
}
#endif
throw DecodingError.dataCorrupted(
DecodingError.Context(
codingPath: decoder.codingPath + CollectionOfOne(CodingKeys.version as any CodingKey),
debugDescription: "Unexpected record version \(versionNumber) (expected \(V.versionNumber))."
)
)
}
let versionNumber = try container.decode(VersionNumber.self, forKey: .version)
try validateVersionNumber(versionNumber)

switch try container.decode(String.self, forKey: .kind) {
case "test":
Expand Down