diff --git a/.travis.yml b/.travis.yml index 1bd7c6b2..564e47b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ addons: env: global: - TRAVIS_NODE_VERSION="6" - - COMPOSER_ROOT_VERSION="4.0.x-dev" + - COMPOSER_ROOT_VERSION="4.x-dev" - DISPLAY=":99" - XVFBARGS=":99 -ac -screen 0 1024x768x16" - SS_BASE_URL="http://localhost:8080/" @@ -45,10 +45,10 @@ before_script: # Install composer dependencies - composer validate - composer install --prefer-dist - - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev + - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.1.x-dev - composer update - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi - - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --prefer-dist; fi + - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.1.x-dev --prefer-dist; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi # Install NPM dependencies diff --git a/composer.json b/composer.json index cbdabde9..c7a80c34 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,12 @@ } ], "require": { - "composer/installers": "*", - "silverstripe/admin": "^1@dev", - "silverstripe/campaign-admin": "^1@dev", - "silverstripe/framework": "^4@dev", - "silverstripe/reports": "^4@dev", - "silverstripe/siteconfig": "^4@dev", - "silverstripe/versioned": "^1@dev", + "silverstripe/admin": "^1.1@dev", + "silverstripe/campaign-admin": "^1.1@dev", + "silverstripe/framework": "^4.1@dev", + "silverstripe/reports": "^4.1@dev", + "silverstripe/siteconfig": "^4.1@dev", + "silverstripe/versioned": "^1.1@dev", "silverstripe/vendor-plugin": "^1.0" }, "require-dev": {