diff --git a/Alamofire.podspec b/Alamofire.podspec
index bd9823562..3c4c5729d 100644
--- a/Alamofire.podspec
+++ b/Alamofire.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Alamofire'
- s.version = '5.0.0-beta.4'
+ s.version = '5.0.0-beta.5'
s.license = 'MIT'
s.summary = 'Elegant HTTP Networking in Swift'
s.homepage = 'https://github.com/Alamofire/Alamofire'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21e50b125..705b5440d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
`Alamofire` adheres to [Semantic Versioning](https://semver.org/).
#### 5.x Releases
-- `5.0.0` Betas - [5.0.0-beta.1](#500-beta1) | [5.0.0-beta.2](#500-beta2) | [5.0.0-beta.3](#500-beta3) | [5.0.0-beta.4](#500-beta4)
+- `5.0.0` Betas - [5.0.0-beta.1](#500-beta1) | [5.0.0-beta.2](#500-beta2) | [5.0.0-beta.3](#500-beta3) | [5.0.0-beta.4](#500-beta4) | [5.0.0-beta.5](#500-beta5)
#### 4.x Releases
- `4.8.x` Releases - [4.8.0](#480) | [4.8.1](#481)
@@ -38,6 +38,39 @@ All notable changes to this project will be documented in this file.
---
+## [5.0.0-beta.5](https://github.com/Alamofire/Alamofire/releases/tag/5.0.0-beta.5)
+Released on 2019-04-12. All issues associated with this milestone can be found using this [filter](https://github.com/Alamofire/Alamofire/milestone/55). **Note:** Alamofire will not be following semantic versioning during the beta process. There may be breaking changes until 5.0.0 is released.
+
+#### Added
+- `Request.didResumeTaskNotification`, `Request.didSuspendTaskNotification`, `Request.didCancelTaskNotification`, and `Request.didCompleteTaskNotification` notifications.
+ - Added by [Christian Noon](https://github.com/cnoon) in Pull Request [#2803](https://github.com/Alamofire/Alamofire/pull/2803).
+- Separate `URLSessionTask` lifetime events to `EventMonitor`.
+ - Added by [Jon Shier](https://github.com/jshier) in Pull Request [#2796](https://github.com/Alamofire/Alamofire/pull/2796).
+
+#### Updated
+- `SessionStateProvider` to no longer be `public` and renamed the file it lives in.
+ - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request [#2801](https://github.com/Alamofire/Alamofire/pull/2801).
+- `MultipartUpload` to no longer be `public`.
+ - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request [#2805](https://github.com/Alamofire/Alamofire/pull/2805).
+- `Request`, `DataRequest`, `UploadRequest`, and `DownloadRequest` to longer be `open`, as Alamofire does not support subclassing these types.
+ - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request [#2804](https://github.com/Alamofire/Alamofire/pull/2804).
+- Names of the notifications posted by `Request` to include `Notification`.
+ - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request [#2803](https://github.com/Alamofire/Alamofire/pull/2803).
+- `httpHeaders` extensions on `URLRequest`, `HTTPURLResponse`, and `URLSessionConfiguration` to be `headers` instead.
+ - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request [#2802](https://github.com/Alamofire/Alamofire/pull/2802).
+
+#### Fixed
+- Issue in `Request` where calling `cancel()` inside a response serializer would result in the serializer running again.
+ - Fixed by [Christian Noon](https://github.com/cnoon) in Pull Request [#2778](https://github.com/Alamofire/Alamofire/pull/2778).
+- Issue in `Session` where the delegate `precondition` would be triggered when running with a swizzled `URLSessionDelegate`.
+ - Fixed by [Christian Noon](https://github.com/cnoon) in Pull Request [#2783](https://github.com/Alamofire/Alamofire/pull/2783).
+- Compiler error in the example app.
+ - Fixed by [Christian Noon](https://github.com/cnoon) in Pull Request [#2786](https://github.com/Alamofire/Alamofire/pull/2786).
+- Issues `Request` where certain lifetime events could be triggered more than once by repeatedly calling `resume()`, `suspend()`, or `cancel()`.
+ - Fixed by [Jon Shier](https://github.com/jshier) in Pull Request [#2796](https://github.com/Alamofire/Alamofire/pull/2796) in Regards to Issue [#2759](https://github.com/Alamofire/Alamofire/issues/2759).
+- Framework version string to be compatible with TestFlight and AppStore releases.
+ - Fixed by [Christian Noon](https://github.com/cnoon) in Pull Request [#2799](https://github.com/Alamofire/Alamofire/pull/2799) in Regards to Issue [#2797](https://github.com/Alamofire/Alamofire/issues/2797).
+
## [5.0.0-beta.4](https://github.com/Alamofire/Alamofire/releases/tag/5.0.0-beta.4)
Released on 2019-03-29. All issues associated with this milestone can be found using this [filter](https://github.com/Alamofire/Alamofire/issues?utf8=✓&q=milestone%3A5.0.0-beta.4). **Note:** Alamofire will not be following semantic versioning during the beta process. There may be breaking changes until 5.0.0 is released.
diff --git a/Gemfile.lock b/Gemfile.lock
index c1eaa8647..20d5968a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
redcarpet (3.4.0)
rouge (2.0.7)
ruby-macho (1.4.0)
- sass (3.7.3)
+ sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -85,7 +85,7 @@ GEM
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
- xcodeproj (1.8.1)
+ xcodeproj (1.8.2)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -103,4 +103,4 @@ DEPENDENCIES
xcpretty
BUNDLED WITH
- 1.17.1
+ 1.17.3
diff --git a/README.md b/README.md
index 3d7683ccd..48f9a521b 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,8 @@ In order to keep Alamofire focused specifically on core networking implementatio
## Requirements
- iOS 10.0+ / macOS 10.12+ / tvOS 10.0+ / watchOS 3.0+
-- Xcode 10.1+
-- Swift 4.2+
+- Xcode 10.2+
+- Swift 5+
## Migration Guides
@@ -72,12 +72,12 @@ In order to keep Alamofire focused specifically on core networking implementatio
- [Alamofire 2.0 Migration Guide](https://github.com/Alamofire/Alamofire/blob/master/Documentation/Alamofire%202.0%20Migration%20Guide.md)
## Communication
-- If you **need help with making network requests**, use [Stack Overflow](https://stackoverflow.com/questions/tagged/alamofire) and tag `alamofire`.
+- If you **need help with making network requests** using Alamofire, use [Stack Overflow](https://stackoverflow.com/questions/tagged/alamofire) and tag `alamofire`.
- If you need to **find or understand an API**, check [our documentation](http://alamofire.github.io/Alamofire/) or [Apple's documentation for `URLSession`](https://developer.apple.com/documentation/foundation/url_loading_system), on top of which Alamofire is built.
- If you need **help with an Alamofire feature**, use [our forum on swift.org](https://forums.swift.org/c/related-projects/alamofire).
- If you'd like to **discuss Alamofire best practices**, use [our forum on swift.org](https://forums.swift.org/c/related-projects/alamofire).
- If you'd like to **discuss a feature request**, use [our forum on swift.org](https://forums.swift.org/c/related-projects/alamofire).
-- If you **found a bug**, open an issue and follow the guide. The more detail the better!
+- If you **found a bug**, open an issue here on GitHub and follow the guide. The more detail the better!
- If you **want to contribute**, submit a pull request.
## Installation
@@ -87,7 +87,7 @@ In order to keep Alamofire focused specifically on core networking implementatio
[CocoaPods](https://cocoapods.org) is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate Alamofire into your Xcode project using CocoaPods, specify it in your `Podfile`:
```ruby
-pod 'Alamofire', '~> 5.0.0-beta.3'
+pod 'Alamofire', '~> 5.0.0-beta.5'
```
### Carthage
@@ -95,7 +95,7 @@ pod 'Alamofire', '~> 5.0.0-beta.3'
[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. To integrate Alamofire into your Xcode project using Carthage, specify it in your `Cartfile`:
```ogdl
-github "Alamofire/Alamofire" "5.0.0-beta.3"
+github "Alamofire/Alamofire" "5.0.0-beta.5"
```
### Swift Package Manager
@@ -108,7 +108,7 @@ Once you have your Swift package set up, adding Alamofire as a dependency is as
```swift
dependencies: [
- .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0-beta.3")
+ .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0-beta.5")
]
```
@@ -142,7 +142,7 @@ If you prefer not to use any of the aforementioned dependency managers, you can
> It does not matter which `Products` folder you choose from, but it does matter whether you choose the top or bottom `Alamofire.framework`.
-- Select the top `Alamofire.framework` for iOS and the bottom one for OS X.
+- Select the top `Alamofire.framework` for iOS and the bottom one for macOS.
> You can verify which one you selected by inspecting the build log for your project. The build target for `Alamofire` will be listed as either `Alamofire iOS`, `Alamofire macOS`, `Alamofire tvOS` or `Alamofire watchOS`.
@@ -172,12 +172,6 @@ The following radars have been resolved over time after being filed against the
Alamofire is named after the [Alamo Fire flower](https://aggie-horticulture.tamu.edu/wildseed/alamofire.html), a hybrid variant of the Bluebonnet, the official state flower of Texas.
-### What logic belongs in a Router vs. a Request Adapter?
-
-Simple, static data such as paths, HTTP methods, and common headers belong in the `Router`. Dynamic data such as an `Authorization` header whose value can changed based on an authentication system belongs in a `RequestAdapter`.
-
-The reason the dynamic data MUST be placed into the `RequestAdapter` is to support retry operations. When a `Request` is retried, the original request is not rebuilt meaning the `Router` will not be called again. The `RequestAdapter` is called again allowing the dynamic data to be updated on the original request before retrying the `Request`.
-
## Credits
Alamofire is owned and maintained by the [Alamofire Software Foundation](http://alamofire.org). You can follow them on Twitter at [@AlamofireSF](https://twitter.com/AlamofireSF) for project updates and releases.
diff --git a/Source/Info.plist b/Source/Info.plist
index 073856ada..b3e29faba 100644
--- a/Source/Info.plist
+++ b/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 5.0.0.beta.4
+ 5.0.0.beta.5
CFBundleSignature
????
CFBundleVersion
diff --git a/docs/Classes.html b/docs/Classes.html
index 43c852286..94749fa1f 100644
--- a/docs/Classes.html
+++ b/docs/Classes.html
@@ -23,7 +23,7 @@
- (75% documented)
+ (77% documented)
MultipartFormData
-
- MultipartUpload
-
NetworkReachabilityManager
@@ -319,9 +316,6 @@
ServerTrustEvaluating
-
- SessionStateProvider
-
URLConvertible
@@ -522,38 +516,6 @@ Declaration
-
-
- -
-
-
-
-
-
-
-
-
Declaration
-
-
Swift
-
open class MultipartUpload
-
-
-
-
-
-
-
@@ -615,7 +577,7 @@
Declaration
Declaration
Swift
-
open class Request
+
public class Request
@@ -801,7 +763,7 @@ DataRequest
Declaration
Swift
-
open class DataRequest : Request
+
public class DataRequest : Request
@@ -829,7 +791,7 @@ Declaration
Declaration
Swift
-
open class DownloadRequest : Request
+
public class DownloadRequest : Request
@@ -857,7 +819,7 @@ Declaration
Declaration
@@ -1492,7 +1454,7 @@ Declaration
diff --git a/docs/Classes/Adapter.html b/docs/Classes/Adapter.html
index de30793a4..bd5b12383 100644
--- a/docs/Classes/Adapter.html
+++ b/docs/Classes/Adapter.html
@@ -23,7 +23,7 @@