提交 7af78746 编写于 作者: C Christian Noon

Merge branch 'master' into tvOS

......@@ -33,5 +33,5 @@ script:
-configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
fi
- if [ $POD_LINT == "YES" ]; then
pod lib lint --quick;
pod lib lint;
fi
Pod::Spec.new do |s|
s.name = 'Alamofire'
s.version = '3.0.0-beta.3'
s.version = '3.0.0'
s.license = 'MIT'
s.summary = 'Elegant HTTP Networking in Swift'
s.homepage = 'https://github.com/Alamofire/Alamofire'
......
......@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
`Alamofire` adheres to [Semantic Versioning](http://semver.org/).
#### 3.x Releases
- `3.0.x` Releases - [3.0.0](#300)
- `3.0.0` Betas - [3.0.0-beta.1](#300-beta1) | [3.0.0-beta.2](#300-beta2) | [3.0.0-beta.3](#300-beta3)
#### 2.x Releases
......@@ -17,6 +18,34 @@ All notable changes to this project will be documented in this file.
---
## [3.0.0](https://github.com/Alamofire/Alamofire/releases/tag/3.0.0)
Released on 2015-10-10. All issues associated with this milestone can be found using this
[filter](https://github.com/Alamofire/Alamofire/issues?utf8=✓&q=milestone%3A3.0.0).
#### Updated
- `Downloading a File` code sample in the README to compile against Swift 2.0.
- Updated by [Screon](https://github.com/Screon) in Pull Request
[#827](https://github.com/Alamofire/Alamofire/pull/827).
- Download code samples in the README to use `response` serializer.
- Updated by [Christian Noon](https://github.com/cnoon).
- CocoaPods and Carthage installation instructions for 3.0.
- Updated by [Christian Noon](https://github.com/cnoon).
- Carthage description and installation instructions in the README.
- Updated by [Ashton Williams](https://github.com/Ashton-W) in Pull Request
[#843](https://github.com/Alamofire/Alamofire/pull/843).
- URL encoding internals to leverage the dictionary keys lazy evaluation.
- Updated by [Christian Noon](https://github.com/cnoon).
#### Fixed
- Small typo in the Alamofire 3.0 Migration Guide `Response` section.
- Fixed by [neugartf](https://github.com/neugartf) in Pull Request
[#826](https://github.com/Alamofire/Alamofire/pull/826).
- User defined `BITCODE_GENERATION_MODE` setting for Carthage builds.
- Fixed by [Christian Noon](https://github.com/cnoon) in regards to Issue
[#835](https://github.com/Alamofire/Alamofire/issues/835).
---
## [3.0.0-beta.3](https://github.com/Alamofire/Alamofire/releases/tag/3.0.0-beta.3)
Released on 2015-09-27. All issues associated with this milestone can be found using this
[filter](https://github.com/Alamofire/Alamofire/issues?utf8=✓&q=milestone%3A3.0.0-beta.3).
......
......@@ -48,14 +48,14 @@ Alamofire is an HTTP networking library written in Swift.
### CocoaPods
[CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects.
CocoaPods 0.38.2 is required to build Alamofire on the `swift-2.0` branch. It adds support for Xcode 7, Swift 2.0 and embedded frameworks. You can install it with the following command:
[CocoaPods](http://cocoapods.org) is a dependency manager for Cocoa projects. You can install it with the following command:
```bash
$ gem install cocoapods
```
> CocoaPods 0.39.0+ is required to build Alamofire 3.0.0+.
To integrate Alamofire into your Xcode project using CocoaPods, specify it in your `Podfile`:
```ruby
......@@ -74,7 +74,7 @@ $ pod install
### Carthage
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that automates the process of adding frameworks to your Cocoa application.
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
......@@ -89,6 +89,8 @@ To integrate Alamofire into your Xcode project using Carthage, specify it in you
github "Alamofire/Alamofire" ~> 3.0
```
Run `carthage` to build the framework and drag the built `Alamofire.framework` into your Xcode project.
### Manually
If you prefer not to use either of the aforementioned dependency managers, you can integrate Alamofire into your project manually.
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0-beta.3</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -92,7 +92,8 @@ public enum ParameterEncoding {
case .URL, .URLEncodedInURL:
func query(parameters: [String: AnyObject]) -> String {
var components: [(String, String)] = []
for key in Array(parameters.keys).sort(<) {
for key in parameters.keys.sort(<) {
let value = parameters[key]!
components += queryComponents(key, value)
}
......@@ -174,6 +175,7 @@ public enum ParameterEncoding {
*/
public func queryComponents(key: String, _ value: AnyObject) -> [(String, String)] {
var components: [(String, String)] = []
if let dictionary = value as? [String: AnyObject] {
for (nestedKey, value) in dictionary {
components += queryComponents("\(key)[\(nestedKey)]", value)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册