From 6a99b4b39ac2693e07be6702285a99b209c1640c Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 25 Jul 2017 11:13:12 +1200 Subject: [PATCH 1/4] Fix plugin version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 551774f..c396bcb 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage": "http://silverstripe.org", "license": "BSD-3-Clause", "require": { - "silverstripe/recipe-plugin": "^0.1", + "silverstripe/recipe-plugin": ">=0.1@dev <1.0", "silverstripe/recipe-core": "1.0.x-dev", "silverstripe/admin": "1.0.x-dev", "silverstripe/asset-admin": "1.0.x-dev", From b616717e56fede50faea89a18a0009bf0ef6044f Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 11 Oct 2017 17:31:49 +1300 Subject: [PATCH 2/4] Remove obsolete branch-alias --- composer.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index c396bcb..3374f65 100644 --- a/composer.json +++ b/composer.json @@ -23,15 +23,11 @@ "extra": { "project-files": [ "mysite/code/*" - ], - "branch-alias": { - "1.x-dev": "1.0.x-dev", - "dev-master": "2.x-dev" - } + ] }, "config": { "process-timeout": 600 }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From db04f72872bbbcc919cd765e249aae0056b8e449 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 12 Oct 2017 09:57:38 +1300 Subject: [PATCH 3/4] Bump branch alias to 1.1.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c396bcb..5424f42 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "mysite/code/*" ], "branch-alias": { - "1.x-dev": "1.0.x-dev", + "1.x-dev": "1.1.x-dev", "dev-master": "2.x-dev" } }, From f97a8f5c9ceb59274bf7885a8b41a2374f03eb57 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 12 Oct 2017 10:31:18 +1300 Subject: [PATCH 4/4] Update dependencies --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 5424f42..3b85417 100644 --- a/composer.json +++ b/composer.json @@ -6,16 +6,16 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": ">=0.1@dev <1.0", - "silverstripe/recipe-core": "1.0.x-dev", - "silverstripe/admin": "1.0.x-dev", - "silverstripe/asset-admin": "1.0.x-dev", - "silverstripe/campaign-admin": "1.0.x-dev", - "silverstripe/cms": "4.0.x-dev", - "silverstripe/errorpage": "1.0.x-dev", + "silverstripe/recipe-core": "1.1.x-dev", + "silverstripe/admin": "1.1.x-dev", + "silverstripe/asset-admin": "1.1.x-dev", + "silverstripe/campaign-admin": "1.1.x-dev", + "silverstripe/cms": "4.1.x-dev", + "silverstripe/errorpage": "1.1.x-dev", "silverstripe/graphql": "0.2.x-dev", - "silverstripe/reports": "4.0.x-dev", - "silverstripe/siteconfig": "4.0.x-dev", - "silverstripe/versioned": "1.0.x-dev" + "silverstripe/reports": "4.1.x-dev", + "silverstripe/siteconfig": "4.1.x-dev", + "silverstripe/versioned": "1.1.x-dev" }, "require-dev": { "phpunit/PHPUnit": "^5.7"