New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulls AF 4.8.1 changes into master for AF 5 #2689

Merged
merged 1 commit into from Jan 29, 2019

Conversation

Projects
None yet
2 participants
@cnoon
Copy link
Member

cnoon commented Jan 15, 2019

Goals ⚽️

To keep AF 5.x in sync with AF 4.x.

Implementation Details 🚧

This PR pulls in all the AF 4.8.1 changes and removes the conflicting ones. It also fixes a couple things called out individually in comments.

Testing Details 🔍

No need.

@cnoon cnoon self-assigned this Jan 15, 2019

@cnoon cnoon requested a review from jshier Jan 15, 2019

Show resolved Hide resolved Alamofire.podspec
Show resolved Hide resolved CHANGELOG.md
@@ -37,7 +37,8 @@ All notable changes to this project will be documented in this file.
- `1.0.x` Releases - [1.0.0](#100) | [1.0.1](#101)

---
## [5.0.0.beta.1](https://github.com/Alamofire/Alamofire/releases/tag/5.0.0.beta.1)

## [5.0.0-beta.1](https://github.com/Alamofire/Alamofire/releases/tag/5.0.0-beta.1)

This comment has been minimized.

@cnoon

cnoon Jan 15, 2019

Author Member

Updated as well to be consistent.

Show resolved Hide resolved Source/Info.plist
@jshier

jshier approved these changes Jan 16, 2019

Copy link
Contributor

jshier left a comment

Looks good with a minor comment, as well as our previous copyright discussion.

Show resolved Hide resolved Documentation/AdvancedUsage.md

@cnoon cnoon force-pushed the cherrypick/4.8.1-hotfix-to-master branch from 88fa339 to fd83161 Jan 23, 2019

@cnoon

This comment has been minimized.

Copy link
Member Author

cnoon commented Jan 23, 2019

I removed all the copyright header changes in fd83161. We can re-assess what date strategy we want to use prior to releasing AF5.

@cnoon cnoon merged commit 4a0aca4 into master Jan 29, 2019

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

@cnoon cnoon deleted the cherrypick/4.8.1-hotfix-to-master branch Feb 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment