diff --git a/.travis.yml b/.travis.yml index fd0107d..c05bbc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: env: global: - - COMPOSER_ROOT_VERSION=4.6.x-dev + - COMPOSER_ROOT_VERSION=4.x-dev matrix: include: @@ -27,7 +27,7 @@ before_script: - composer validate - composer require --no-update silverstripe-themes/simple:~3.2.0 - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Validate cow schema diff --git a/composer.json b/composer.json index 8e36f0f..8a7898e 100644 --- a/composer.json +++ b/composer.json @@ -6,25 +6,22 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.6.x-dev", - "silverstripe/admin": "1.6.x-dev", - "silverstripe/asset-admin": "1.6.x-dev", - "silverstripe/campaign-admin": "1.6.x-dev", - "silverstripe/versioned-admin": "1.4.x-dev", - "silverstripe/cms": "4.6.x-dev", - "silverstripe/errorpage": "1.6.x-dev", - "silverstripe/graphql": "3.3.x-dev", - "silverstripe/reports": "4.6.x-dev", - "silverstripe/siteconfig": "4.6.x-dev", - "silverstripe/versioned": "1.6.x-dev" + "silverstripe/recipe-core": "4.x-dev", + "silverstripe/admin": "1.x-dev", + "silverstripe/asset-admin": "1.x-dev", + "silverstripe/campaign-admin": "1.x-dev", + "silverstripe/versioned-admin": "1.x-dev", + "silverstripe/cms": "4.x-dev", + "silverstripe/errorpage": "1.x-dev", + "silverstripe/graphql": "3.x-dev", + "silverstripe/reports": "4.x-dev", + "silverstripe/siteconfig": "4.x-dev", + "silverstripe/versioned": "1.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7" }, "extra": { - "branch-alias": { - "4.x-dev": "4.6.x-dev" - }, "project-files": [ "app/src/*" ],