Merge pull request #75 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility
spatie · Jan 25, 2023 · 73c6f1d · 73c6f1d
2 parents 36ea48d + f6ee7ac
commit 73c6f1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,12 +9,17 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2, 8.0]
-                laravel: [9.*]
+                php: [8.2, 8.0, 8.1]
+                laravel: [9.*, 10.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    -   laravel: 10.*
+                        testbench: 8.*
                     -   laravel: 9.*
                         testbench: 7.*
+                exclude:
+                    -   laravel: 10.*
+                        php: 8.0                
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -24,17 +24,17 @@
         "php": "^8.0",
         "ext-json": "*",
         "ext-zip": "*",
-        "illuminate/filesystem": "^9.0",
-        "illuminate/queue": "^9.0",
-        "illuminate/support": "^9.0",
+        "illuminate/filesystem": "^9.0|^10.0",
+        "illuminate/queue": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
         "nesbot/carbon": "^2.63",
         "spatie/laravel-package-tools": "^1.9",
         "spatie/temporary-directory": "^2.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0.4",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "spatie/invade": "^1.0"
     },
     "autoload": {