Merge branch 'develop'

dotkernel · May 14, 2018 · 01e8346 · 01e8346
2 parents 50f124f + 1efbdbd
commit 01e8346
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 1.0.0 - 2018-05-14
+
+Migration to Zend Expressive 3
+
+### Changed
+* updated dependencies
+
+### Added
+* Nothing
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* Nothing
+
+
 ## 0.2.1 - 2017-04-21
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -5,17 +5,17 @@
   "license": "MIT",
   "authors": [
     {
-      "name": "n3vrax",
-      "email": "tibi@apidemia.com"
+      "name": "DotKernel Team",
+      "email": "team@dotkernel.com"
     }
   ],
   "require": {
     "php": "^7.1",
-    "zendframework/zend-servicemanager": "^3.3.0",
+    "zendframework/zend-servicemanager": "^3.3",
 
-    "dotkernel/dot-controller": "^0.3",
-    "dotkernel/dot-flashmessenger": "^0.2",
-    "dotkernel/dot-form": "^1.1"
+    "dotkernel/dot-controller": "^1.0",
+    "dotkernel/dot-flashmessenger": "^1.0",
+    "dotkernel/dot-form": "^1.1.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
@@ -33,8 +33,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev",
-      "dev-develop": "0.3-dev"
+      "dev-master": "1.0-dev",
+      "dev-develop": "1.1-dev"
     }
   }
 }