From a95ddb1319cf1e2e4d4c83598d1c0312f75caab2 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 13:53:35 +0200 Subject: [PATCH 1/2] Remove obsolete branch alias --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 976bfaf..80f5d6f 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,7 @@ "extra": { "project-files": [ "app/*" - ], - "branch-alias": { - "dev-master": "2.x-dev" - } + ] }, "config": { "process-timeout": 600 From 8e50f39805a8a8d22c8ee1faf9fe0e892c86bf9c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 7 Nov 2018 17:36:26 +0200 Subject: [PATCH 2/2] Tighten constraints on dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 80f5d6f..1746ab9 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,10 @@ "require": { "silverstripe/recipe-plugin": "^1", "silverstripe/recipe-cms": "^4.3@dev", - "silverstripe/versioned-admin": "^1@dev", - "dnadesign/silverstripe-elemental": "4.x-dev", - "silverstripe/elemental-fileblock": "2.x-dev", - "silverstripe/elemental-bannerblock": "2.x-dev" + "silverstripe/versioned-admin": "^1.1@dev", + "dnadesign/silverstripe-elemental": "4.0.x-dev", + "silverstripe/elemental-fileblock": "2.0.x-dev", + "silverstripe/elemental-bannerblock": "2.0.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7"