Skip to content

Commit

Permalink
Merge pull request #127 from laravel-shift/l10-compatibility
Browse files Browse the repository at this point in the history
Laravel 10.x Compatibility
  • Loading branch information
colinhall17 authored Feb 14, 2023
2 parents c50090a + 65cef04 commit 106ecd4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.0, 7.4]
laravel: [8.*, 7.*]
php: [8.0, 7.4, 8.1]
laravel: [8.*, 7.*, 10.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 8.*
testbench: 6.*
- laravel: 7.*
Expand Down
17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
"name": "macsidigital/laravel-zoom",
"description": "Laravel Zoom package",
"homepage": "https://github.com/MacsiDigital/laravel-zoom",
"keywords": ["macsidigital", "laravel-zoom", "zoom", "laravel", "api", "client"],
"keywords": [
"macsidigital",
"laravel-zoom",
"zoom",
"laravel",
"api",
"client"
],
"license": "MIT",
"type": "library",
"authors": [
Expand All @@ -14,12 +21,12 @@
],
"require": {
"php": "^8.0|^8.1",
"illuminate/support": "^8.0|^9.0",
"illuminate/support": "^8.0|^9.0|^10.0",
"macsidigital/laravel-api-client": "^4.0.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16",
"orchestra/testbench": "^6.0|^7.0",
"friendsofphp/php-cs-fixer": "^2.16|^3.14",
"orchestra/testbench": "^6.0|^7.0|^8.0",
"phpunit/phpunit": "^9.0"
},
"autoload": {
Expand Down Expand Up @@ -50,6 +57,6 @@
}
}
},
"minimum-stability" : "dev",
"minimum-stability": "dev",
"prefer-stable": true
}

0 comments on commit 106ecd4

Please sign in to comment.