Skip to content
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.

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

Merge Apollo PR: "Update for compatibility with Swift5" #167

Merged
merged 1 commit into from
Jan 30, 2019
Merged
Changes from all commits
Commits
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
16 changes: 1 addition & 15 deletions AWSAppSyncClient/Apollo/Sources/Apollo/Collections.swift
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
extension Dictionary {
subscript(key: Key, withDefault value: @autoclosure () -> Value) -> Value {
mutating get {
if self[key] == nil {
self[key] = value()
}
return self[key]!
}
set {
self[key] = newValue
}
}
}

public extension Dictionary {
static func += (lhs: inout Dictionary, rhs: Dictionary) {
#if swift(>=3.2)
Expand Down Expand Up @@ -58,7 +44,7 @@ extension GroupedSequence: Sequence {
struct GroupedSequenceIterator<Key: Equatable, Value>: IteratorProtocol {
private var base: GroupedSequence<Key, Value>

private var keyIterator: EnumeratedIterator<IndexingIterator<Array<Key>>>
private var keyIterator: EnumeratedSequence<Array<Key>>.Iterator

init(base: GroupedSequence<Key, Value>) {
self.base = base
Expand Down