Skip to content

Commit a4004ef

Browse files
committed
Merge branch 'release/4.2.0'
2 parents 01a37ec + 8b05592 commit a4004ef

3 files changed

Lines changed: 21 additions & 10 deletions

File tree

.github/workflows/tests.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@ jobs:
1818
strategy:
1919
fail-fast: true
2020
matrix:
21-
php: [ 8.2, 8.3, 8.4 ]
22-
laravel: [ 11, 12 ]
21+
php: [ 8.2, 8.3, 8.4, 8.5 ]
22+
laravel: [ 11, 12, 13 ]
23+
exclude:
24+
- php: 8.5
25+
laravel: 11
26+
- php: 8.2
27+
laravel: 13
2328

2429
steps:
2530
- name: Checkout Code
26-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
2732

2833
- name: Setup PHP
2934
uses: shivammathur/setup-php@v2
@@ -38,7 +43,7 @@ jobs:
3843
run: composer require "illuminate/database:^${{ matrix.laravel }}" --no-update
3944

4045
- name: Install dependencies
41-
uses: nick-fields/retry@v3
46+
uses: nick-fields/retry@v4
4247
with:
4348
timeout_minutes: 5
4449
max_attempts: 5

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
55

66
## Unreleased
77

8+
## [4.2.0] - 2026-03-28
9+
10+
### Added
11+
12+
- Package now supports Laravel 13.
13+
814
## [4.1.0] - 2025-02-24
915

1016
### Added

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
},
2020
{
2121
"name": "Christopher Gammie",
22-
"email": "contact@gammie.co.uk"
22+
"email": "chris@cloudcreativity.co.uk"
2323
}
2424
],
2525
"require": {
2626
"php": "^8.2",
2727
"ext-json": "*",
28-
"illuminate/database": "^11.0|^12.0",
29-
"illuminate/pagination": "^11.0|^12.0",
30-
"illuminate/support": "^11.0|^12.0",
31-
"laravel-json-api/eloquent": "^4.5"
28+
"illuminate/database": "^11.0|^12.0|^13.0",
29+
"illuminate/pagination": "^11.0|^12.0|^13.0",
30+
"illuminate/support": "^11.0|^12.0|^13.0",
31+
"laravel-json-api/eloquent": "^4.7"
3232
},
3333
"require-dev": {
34-
"orchestra/testbench": "^9.0|^10.0",
34+
"orchestra/testbench": "^9.0|^10.0|^11.0",
3535
"phpunit/phpunit": "^10.5|^11.0"
3636
},
3737
"autoload": {

0 commit comments

Comments
 (0)