Update for 2.6 (#15)

* Update for 2.6 * Fix typo Co-authored-by: Maxime Rainville <maxime@silverstripe.com>
silverstripe · Jun 15, 2020 · e550db2 · e550db2
1 parent d44c82a
commit e550db2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ services:
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="2.x-dev" DB=MYSQL
+    - COMPOSER_ROOT_VERSION="2.6.x-dev" DB=MYSQL
 
 php:
   - 7.1

diff --git a/composer.json b/composer.json
@@ -6,11 +6,11 @@
     "license": "BSD-3-Clause",
     "require": {
         "silverstripe/recipe-plugin": "^1",
-        "silverstripe/recipe-cms": "4.x-dev",
-        "cwp/cwp-recipe-core": "2.x-dev",
-        "cwp/cwp": "2.x-dev",
-        "cwp/cwp-pdfexport": "1.x-dev",
-        "silverstripe/html5": "2.x-dev"
+        "silverstripe/recipe-cms": "4.6.x-dev",
+        "cwp/cwp-recipe-core": "2.6.x-dev",
+        "cwp/cwp": "2.6.x-dev",
+        "cwp/cwp-pdfexport": "1.1.x-dev",
+        "silverstripe/html5": "2.0.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7"