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

apollographql/apollo-ios#427
awslabs · Jan 30, 2019 · 509ab84 · 509ab84
1 parent da40e48
commit 509ab84
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/AWSAppSyncClient/Apollo/Sources/Apollo/Collections.swift b/AWSAppSyncClient/Apollo/Sources/Apollo/Collections.swift
@@ -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)
@@ -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