From c8ef2037dc41c7ee322d26a488ae7938c9454c04 Mon Sep 17 00:00:00 2001 From: Luca Critelli Date: Thu, 17 Oct 2019 03:45:01 -0400 Subject: [PATCH 1/2] Update composer to work with Laravel 5 and Laravel 6 (#10) Update composer to work with Laravel 5 and Laravel 6 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 68453e1..12a861d 100644 --- a/composer.json +++ b/composer.json @@ -10,8 +10,8 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.3", - "illuminate/routing": "^5.3", + "illuminate/support": "^5.3 || ^6.0", + "illuminate/routing": "^5.3 || ^6.0", "jimdo/prometheus_client_php": "^0.9.0" }, "autoload": { From c1cd48549fb5270120d4c529e6dad739383843fc Mon Sep 17 00:00:00 2001 From: Nic Appleby Date: Thu, 17 Oct 2019 09:46:09 +0200 Subject: [PATCH 2/2] Update changelog for release --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index c80ceda..c728e12 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.4 - 2019-10-17 + +* Enable Laravel 6.0 compatability + ## 1.0.3 - 2019-02-11 * Enable package discovery for laravel 5.5+