Skip to content

Commit

Permalink
Merge pull request #7 from gpibarra/l11
Browse files Browse the repository at this point in the history
support Laravel 11
  • Loading branch information
stephenjude committed Apr 16, 2024
2 parents b42d439 + cd4aab3 commit 6e8d0b3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2, 8.1]
laravel: [10.*]
php: [8.3, 8.2, 8.1]
laravel: [11.*, 10.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
testbench: ^8.14
carbon: ^2.63
- laravel: 11.*
testbench: ^9.0
carbon: ^3.0
exclude:
- laravel: 11.*
php: 8.1

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
"require": {
"php": "^8.1",
"filament/filament": "^3.0",
"laravel/jetstream": "^4.2",
"illuminate/contracts": "^10.0",
"laravel/jetstream": "^4.2|^5.0",
"illuminate/contracts": "^10.0|^11.0",
"spatie/laravel-package-tools": "^1.15.0"
},
"require-dev": {
"larastan/larastan": "^2.9",
"laravel/pint": "^1.0",
"nunomaduro/collision": "^7.9",
"nunomaduro/larastan": "^2.0.1",
"orchestra/testbench": "^8.0",
"nunomaduro/collision": "^7.9|^8.0",
"orchestra/testbench": "^8.14|^9.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-arch": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/FilamentJetstreamCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function installFilamentPackage(): bool
protected function installJetstreamPackage(): bool
{
if (! $this->hasComposerPackage('laravel/jetstream')) {
return $this->requireComposerPackages('laravel/jetstream:^4.2');
return $this->requireComposerPackages('laravel/jetstream:^4.2|^5.0');
}

return true;
Expand Down

0 comments on commit 6e8d0b3

Please sign in to comment.