From 04fe468f36ab82f18df712b2f6edcd884d8f02b1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:32 +1300 Subject: [PATCH 1/5] MNT Update development dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7caa380..b47acd2 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "^4.10", - "silverstripe/cms": "^4.4@dev", - "silverstripe/admin": "^1.4@dev", - "silverstripe/asset-admin": "^1.4@dev", - "silverstripe/errorpage": "^1.4@dev", - "silverstripe/versioned": "^1.4@dev" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 5e823223d7300a862873e22b4d2ba2efd6ab9e8d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:38:42 +1300 Subject: [PATCH 2/5] MNT Update release dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b47acd2..7b84f42 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "4.13.0-beta1", + "silverstripe/cms": "4.13.0-beta1", + "silverstripe/admin": "1.13.0-beta1", + "silverstripe/asset-admin": "1.13.0-beta1", + "silverstripe/errorpage": "1.13.0-beta1", + "silverstripe/versioned": "1.13.0-beta1" }, "require-dev": { "phpunit/phpunit": "^9.5", From aa9797a5f153223f4d8b8ee739dbd46464910c18 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:38:46 +1300 Subject: [PATCH 3/5] MNT Update development dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7b84f42..b47acd2 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.0-beta1", - "silverstripe/cms": "4.13.0-beta1", - "silverstripe/admin": "1.13.0-beta1", - "silverstripe/asset-admin": "1.13.0-beta1", - "silverstripe/errorpage": "1.13.0-beta1", - "silverstripe/versioned": "1.13.0-beta1" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From a249d46dccbfe2ae3e1c89c2d288adcf55c75da2 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 28 Mar 2023 10:22:51 +1300 Subject: [PATCH 4/5] FIX Don't use deprecated API --- _config.php | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 _config.php diff --git a/_config.php b/_config.php deleted file mode 100644 index a3682d6..0000000 --- a/_config.php +++ /dev/null @@ -1,5 +0,0 @@ - Date: Tue, 28 Mar 2023 16:50:01 +1300 Subject: [PATCH 5/5] MNT Revert erroneous dependency changes (#519) --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b47acd2..7caa380 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "^4.10", + "silverstripe/cms": "^4.4@dev", + "silverstripe/admin": "^1.4@dev", + "silverstripe/asset-admin": "^1.4@dev", + "silverstripe/errorpage": "^1.4@dev", + "silverstripe/versioned": "^1.4@dev" }, "require-dev": { "phpunit/phpunit": "^9.5",