From b4ae2e084f73fc115af736908a8205acf22bea4e Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 14 Jun 2018 13:21:04 +1200 Subject: [PATCH 1/2] Update recipe to use new 4.x naming --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 96f75ed..027e791 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "1.2.x-dev", + "silverstripe/recipe-core": "4.2.x-dev", "silverstripe/admin": "1.2.x-dev", "silverstripe/asset-admin": "1.2.x-dev", "silverstripe/campaign-admin": "1.2.x-dev", @@ -25,7 +25,7 @@ "app/src/*" ], "branch-alias": { - "1.x-dev": "1.2.x-dev" + "4.x-dev": "4.2.x-dev" } }, "config": { From d24e50c52e0efacd25b40fb047d7e402675ea97a Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 15 Jun 2018 15:30:03 +1200 Subject: [PATCH 2/2] Remove obsolete branch-alias --- composer.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 027e791..77d15f2 100644 --- a/composer.json +++ b/composer.json @@ -23,14 +23,11 @@ "extra": { "project-files": [ "app/src/*" - ], - "branch-alias": { - "4.x-dev": "4.2.x-dev" - } + ] }, "config": { "process-timeout": 600 }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file