From f40646b5d9c89097cdc4c6cf549aae5da745db6e Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 1 Feb 2023 17:28:39 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 10 --- composer.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 4200b24..946799c 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { "name": "joelbutcher/laravel-archivable", "description": "An archivable trait package for Laravel Eloquent models", - "keywords": ["laravel", "laravel-archivable"], + "keywords": [ + "laravel", + "laravel-archivable" + ], "license": "MIT", "homepage": "https://github.com/joelbutcher/laravel-archivable", "type": "library", @@ -17,12 +20,12 @@ ], "require": { "php": "^7.3|^8.0", - "illuminate/support": "^7.0|^8.0|^9.0", - "illuminate/database": "^7.0|^8.0|^9.0" + "illuminate/support": "^7.0|^8.0|^9.0|^10.0", + "illuminate/database": "^7.0|^8.0|^9.0|^10.0" }, "require-dev": { - "illuminate/pagination": "^7.0|^8.0|^9.0", - "orchestra/testbench": "^6.3|^7.0", + "illuminate/pagination": "^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench": "^6.3|^7.0|^8.0", "phpunit/phpunit": "^8.4|^9.1" }, "autoload": { @@ -38,7 +41,6 @@ "scripts": { "test": "vendor/bin/phpunit --colors=always", "test-coverage": "vendor/bin/phpunit --coverage-html coverage" - }, "config": { "sort-packages": true From f3a2df9ef53ebf9a675e244a4d1b9462111eeb0d Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 1 Feb 2023 17:28:39 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 10 --- .github/workflows/tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 84164ec..f7fbcaf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,8 +14,14 @@ jobs: fail-fast: true matrix: php: [7.3, 7.4, 8.0, 8.1] - laravel: [6.0, 7.0, 8.0, 9.0] + laravel: [6.0, 7.0, 8.0, 9.0, 10.0] exclude: + - php: 7.3 + laravel: 10.0 + - php: 7.4 + laravel: 10.0 + - php: 8.0 + laravel: 10.0 - php: 7.3 laravel: 9 - php: 7.4