Merge pull request #592 from apollographql/update/swift-5-no-really

Swift 5: No, seriously
apollographql · Jul 2, 2019 · d2e19e9 · d2e19e9
2 parents 606e2c0 + c0a1163
commit d2e19e9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 22 deletions.
diff --git a/Apollo.podspec b/Apollo.podspec
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 
   s.default_subspecs = 'Core'
 

diff --git a/Configuration/Shared/Project-Version.xcconfig b/Configuration/Shared/Project-Version.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 0.10.1
+CURRENT_PROJECT_VERSION = 0.10.2
diff --git a/Sources/Apollo/Collections.swift b/Sources/Apollo/Collections.swift
@@ -1,12 +1,6 @@
 public extension Dictionary {
   static func += (lhs: inout Dictionary, rhs: Dictionary) {
-    #if swift(>=3.2)
     lhs.merge(rhs) { (_, new) in new }
-    #else
-    for (key, value) in rhs {
-      lhs[key] = value
-    }
-    #endif
   }
 }
 

diff --git a/Sources/ApolloWebSocket/SplitNetworkTransport.swift b/Sources/ApolloWebSocket/SplitNetworkTransport.swift
@@ -1,4 +1,7 @@
+#if !COCOAPODS
 import Apollo
+#endif
+
 
 public class SplitNetworkTransport: NetworkTransport {
   private let httpNetworkTransport: NetworkTransport

diff --git a/Sources/ApolloWebSocket/WebSocketTransport.swift b/Sources/ApolloWebSocket/WebSocketTransport.swift
@@ -1,4 +1,6 @@
+#if !COCOAPODS
 import Apollo
+#endif
 import Starscream
 
 // To allow for alternative implementations supporting the same WebSocketClient protocol

diff --git a/Tests/ApolloWebsocketTests/StarWarsSubscriptionTests.swift b/Tests/ApolloWebsocketTests/StarWarsSubscriptionTests.swift
@@ -149,7 +149,7 @@ class StarWarsSubscriptionTests: XCTestCase {
 
     for i in 1...count {
       let review = ReviewInput(stars: i, commentary: "The greatest movie ever!")
-      let episode = episodes.sample()
+      let episode = episodes.randomElement()
       _ = client.perform(mutation: CreateReviewForEpisodeMutation(episode: episode!, review: review))
     }
 
@@ -160,16 +160,3 @@ class StarWarsSubscriptionTests: XCTestCase {
     subNewHope.cancel()
   }
 }
-
-// MARK: - Helpers
-
-extension Collection where Index == Int {
-  /**
-   Picks a random element of the collection.
-
-   - returns: A random element of the collection.
-   */
-  func sample() -> Iterator.Element? {
-    return isEmpty ? nil : self[Int(arc4random_uniform(UInt32(endIndex)))]
-  }
-}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 0.10.1
		CURRENT_PROJECT_VERSION = 0.10.2