Merge branch 'hotfix/update-deps'

Close #22

Author: weierophinney

.gitignore

@@ -1,2 +1 @@
 vendor/
-composer.lock

.travis.yml

@@ -7,28 +7,65 @@ cache:
     - $HOME/.composer/cache
     - vendor
 
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+
 matrix:
   fast_finish: true
   include:
     - php: 5.5
+      env:
+        - DEPS=lowest
+    - php: 5.5
+      env:
+        - DEPS=locked
+    - php: 5.5
+      env:
+        - DEPS=latest
     - php: 5.6
       env:
-        - EXECUTE_CS_CHECK=true
+        - DEPS=lowest
+    - php: 5.6
+      env:
+        - DEPS=locked
+    - php: 5.6
+      env:
+        - DEPS=latest
     - php: 7
-    - php: hhvm 
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CHECK_CS=true
+    - php: 7
+      env:
+        - DEPS=latest
+    - php: hhvm
+      env:
+        - DEPS=lowest
+    - php: hhvm
+      env:
+        - DEPS=locked
+    - php: hhvm
+      env:
+        - DEPS=latest
   allow_failures:
     - php: hhvm
 
 before_install:
-  - composer self-update
+  - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
-  - composer info -i
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
+  - composer info
 
 script:
   - composer test
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
+  - if [[ $CHECK_CS == 'true' ]]; then composer cs ; fi
 
 notifications:
   email: true

CHANGELOG.md

@@ -2,11 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.0.2 - TBD
+## 1.1.0 - 2016-03-23
 
 ### Added
 
-- Nothing.
+- [#22](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/22)
+  adds support for the zend-eventmanager and zend-servicemanager v3 releases.
 
 ### Deprecated
 

composer.json

@@ -23,10 +23,10 @@
         "psr/http-message": "^1.0",
         "zendframework/zend-expressive-helpers": "^1.1 || ^2.0",
         "zendframework/zend-expressive-template": "^1.0.1",
-        "zendframework/zend-filter": "^2.5",
-        "zendframework/zend-i18n": "^2.5",
-        "zendframework/zend-servicemanager": "^2.5",
-        "zendframework/zend-view": "^2.5"
+        "zendframework/zend-filter": "^2.6.1",
+        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-view": "^2.6.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.7",