diff --git a/.travis.yml b/.travis.yml index 4c84eacf..1ccb0457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,11 @@ language: php -dist: trusty +dist: xenial + +services: + - mysql + - postgresql + - xvfb cache: directories: @@ -20,6 +25,8 @@ matrix: env: DB=MYSQL PHPUNIT_TEST=1 - php: 7.3 env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1 + - php: 7.4 + env: DB=MYSQL PHPUNIT_TEST=1 before_script: # Init PHP diff --git a/composer.json b/composer.json index 0bb29571..f09c958d 100644 --- a/composer.json +++ b/composer.json @@ -20,12 +20,12 @@ } ], "require": { - "silverstripe/framework": "^4.0@dev", - "silverstripe/admin": "^1.0@dev", - "silverstripe/versioned": "^1.0@dev", + "silverstripe/framework": "^4.6@dev", + "silverstripe/admin": "^1.6@dev", + "silverstripe/versioned": "^1.6@dev", "silverstripe/config": "^1.0@dev", - "silverstripe/assets": "^1.0@dev", - "silverstripe/vendor-plugin": "^1.0" + "silverstripe/assets": "^1.6@dev", + "silverstripe/vendor-plugin": "^1" }, "require-dev": { "phpunit/phpunit": "^5.7"