Merge branch 'update-for-xcode7-beta6'

Author: yoichitgy

Podfile

@@ -2,14 +2,14 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 use_frameworks!
 
-pod 'Alamofire', :git => 'https://github.com/Alamofire/Alamofire.git', :commit => '1b7b1f1aa'
-pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git', :commit => '45ca854ce'
-pod 'Swinject', '~> 0.2'
+pod 'Alamofire', '2.0.0-beta.3'
+pod 'SwiftyJSON', :git => 'https://github.com/SwiftyJSON/SwiftyJSON.git', :commit => 'f269523ac572979245baa99c8475eab73caf1e9b'
+pod 'Swinject', '~> 0.2.1'
 
 
 def testing_pods
-    pod 'Quick', '~> 0.5.0'
-    pod 'Nimble', '2.0.0-rc.2'
+    pod 'Quick', :git => 'https://github.com/Quick/Quick.git', :commit => '1fbcd8a05f6e896e2db66a2e82527b7f24766ef8'
+    pod 'Nimble', :git => 'https://github.com/Quick/Nimble.git', :commit => 'e3e3978ef610927d70eafd333e162855ad7b6f77'
 end
 
 target 'SwinjectSimpleExampleTests' do

Podfile.lock

@@ -1,38 +1,44 @@
 PODS:
-  - Alamofire (1.3.0)
+  - Alamofire (2.0.0-beta.3)
   - Nimble (2.0.0-rc.2)
   - Quick (0.5.1)
   - SwiftyJSON (2.2.1)
-  - Swinject (0.2)
+  - Swinject (0.2.1)
 
 DEPENDENCIES:
-  - Alamofire (from `https://github.com/Alamofire/Alamofire.git`, commit `1b7b1f1aa`)
-  - Nimble (= 2.0.0-rc.2)
-  - Quick (~> 0.5.0)
-  - SwiftyJSON (from `https://github.com/SwiftyJSON/SwiftyJSON.git`, commit `45ca854ce`)
-  - Swinject (~> 0.2)
+  - Alamofire (= 2.0.0-beta.3)
+  - Nimble (from `https://github.com/Quick/Nimble.git`, commit `e3e3978ef610927d70eafd333e162855ad7b6f77`)
+  - Quick (from `https://github.com/Quick/Quick.git`, commit `1fbcd8a05f6e896e2db66a2e82527b7f24766ef8`)
+  - SwiftyJSON (from `https://github.com/SwiftyJSON/SwiftyJSON.git`, commit `f269523ac572979245baa99c8475eab73caf1e9b`)
+  - Swinject (~> 0.2.1)
 
 EXTERNAL SOURCES:
-  Alamofire:
-    :commit: 1b7b1f1aa
-    :git: https://github.com/Alamofire/Alamofire.git
+  Nimble:
+    :commit: e3e3978ef610927d70eafd333e162855ad7b6f77
+    :git: https://github.com/Quick/Nimble.git
+  Quick:
+    :commit: 1fbcd8a05f6e896e2db66a2e82527b7f24766ef8
+    :git: https://github.com/Quick/Quick.git
   SwiftyJSON:
-    :commit: 45ca854ce
+    :commit: f269523ac572979245baa99c8475eab73caf1e9b
     :git: https://github.com/SwiftyJSON/SwiftyJSON.git
 
 CHECKOUT OPTIONS:
-  Alamofire:
-    :commit: 1b7b1f1aa
-    :git: https://github.com/Alamofire/Alamofire.git
+  Nimble:
+    :commit: e3e3978ef610927d70eafd333e162855ad7b6f77
+    :git: https://github.com/Quick/Nimble.git
+  Quick:
+    :commit: 1fbcd8a05f6e896e2db66a2e82527b7f24766ef8
+    :git: https://github.com/Quick/Quick.git
   SwiftyJSON:
-    :commit: 45ca854ce
+    :commit: f269523ac572979245baa99c8475eab73caf1e9b
     :git: https://github.com/SwiftyJSON/SwiftyJSON.git
 
 SPEC CHECKSUMS:
-  Alamofire: e57db85401895fda01783b3b9bda5b32d9f347ff
+  Alamofire: 39dddb7d3725d1771b1d2f7099c8bd45bd83ffbb
   Nimble: e3cf5e73a491daf21c2bc88783dbfc55ce8b8e02
   Quick: 7426537a99e75076d6930c5b6da58006e4a9f38a
   SwiftyJSON: ae2d0a3d68025d136602a33c4ee215091ced3e33
-  Swinject: 08c22f85e8f073257befa6847485e348c8f13825
+  Swinject: 771e1128fa66773c302bc1d877dd42cf33a95d81
 
 COCOAPODS: 0.38.2

README.md

@@ -6,7 +6,7 @@ This is an example project to demonstrate [dependency injection](https://en.wiki
 
 ## Requirements
 
-- Xcode 7 beta 5
+- Xcode 7 beta 6
 - [CocoaPods](https://cocoapods.org) 0.38 or later
 
 ## Installation

SwinjectSimpleExample/OpenWeatherMap.swift

@@ -22,7 +22,7 @@ struct OpenWeatherMap {
     static var parameters: [String: String] {
         return [
             "APPID": apiKey,
-            "id": ",".join(cityIds.map { String($0) })
+            "id": cityIds.map { String($0) }.joinWithSeparator(",")
         ]
     }
 }