Skip to content

Fixes compile issue w/ throws using String:Error conformance. #90

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 3 commits into from
Nov 2, 2021
Merged

Fixes compile issue w/ throws using String:Error conformance. #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc3b60b
Updated Sovran to remove string:error conformance.
Nov 2, 2021
a832a3d
Package resolution
Nov 2, 2021
1539520
Fixed throw calls that were using string:error.
Nov 2, 2021
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
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
.package(
name: "Sovran",
url: "https://github.com/segmentio/Sovran-Swift.git",
from: "1.0.2"
from: "1.0.3"
)
],
targets: [
Expand Down
4 changes: 2 additions & 2 deletions Segment.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

7 changes: 4 additions & 3 deletions Sources/Segment/Utilities/JSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public enum JSON: Equatable {
private enum JSONError: Error {
case unknown
case nonJSONType(type: String)
case incorrectType
}

public init(_ object: [String: Any]) throws {
Expand Down Expand Up @@ -302,7 +303,7 @@ extension JSON {
newArray.append(value)
result = try JSON(newArray)
default:
throw "This JSON object is not an array type."
throw JSONError.incorrectType
}
return result
}
Expand All @@ -325,7 +326,7 @@ extension JSON {
newObject[key] = value
result = try JSON(newObject)
default:
throw "This JSON object is not an array type."
throw JSONError.incorrectType
}
return result
}
Expand All @@ -347,7 +348,7 @@ extension JSON {
newObject.removeValue(forKey: key)
result = try JSON(newObject)
default:
throw "This JSON object is not an array type."
throw JSONError.incorrectType
}
return result

Expand Down