Prepares for 1.0.0 release

- Updates branch aliases:
  - dev-master => 1.0.x-dev
  - dev-develop => 1.1.x-dev (to be created)
  - Removes dev-release-1.0.0 entry
- Merges alpha changelogs into a single 1.0.0 changelog

Author: weierophinney

CHANGELOG.md

@@ -4,14 +4,20 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions 0.3.0 and prior were released as "weierophinney/problem-details".
 
-## 1.0.0alpha2 - 2018-02-26
+## 1.0.0 - 2018-03-15
 
 ### Added
 
-- Nothing.
+- [#30](https://github.com/zendframework/zend-problem-details/pull/30)
+  adds PSR-15 support.
 
 ### Changed
 
+- [#24](https://github.com/zendframework/zend-problem-details/pull/24)
+  updates all classes to use scalar and return type hints, including nullable
+  and void types. If you were extending classes within an earlier release, you
+  may need to update signatures of any methods you override.
+
 - [#35](https://github.com/zendframework/zend-problem-details/pull/35)
   modifies the constructor of `Zend\ProblemDetails\ProblemDetailsResponseFactory`
   such that it now has the following signature:
@@ -62,32 +68,6 @@ Versions 0.3.0 and prior were released as "weierophinney/problem-details".
 
 ### Removed
 
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 1.0.0alpha1 - 2018-02-07
-
-### Added
-
-- [#30](https://github.com/zendframework/zend-problem-details/pull/30)
-  adds PSR-15 support.
-
-### Changed
-
-- [#24](https://github.com/zendframework/zend-problem-details/pull/24)
-  updates all classes to use scalar and return type hints, including nullable
-  and void types. If you were extending classes within an earlier release, you
-  may need to update signatures of any methods you override.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
 - [#22](https://github.com/zendframework/zend-problem-details/pull/22) and
   [#30](https://github.com/zendframework/zend-problem-details/pull/30)
   remove support for both `http-interop/http-middleware` and

composer.json

@@ -49,8 +49,8 @@
             "config-provider": "Zend\\ProblemDetails\\ConfigProvider"
         },
         "branch-alias": {
-            "dev-master": "0.5.x-dev",
-            "dev-release-1.0.0": "1.0.x-dev"
+            "dev-master": "1.0.x-dev",
+            "dev-develop": "1.1.x-dev"
         }
     },
     "scripts": {