Merge branch '1.x'

# Conflicts: # .github/workflows/tests.yml # composer.json # src/resources/manifest.php
artkonekt · Mar 12, 2024 · ba219c4 · ba219c4
2 parents 791786d + 632263a
commit ba219c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         php: ['8.2', '8.3']
-        laravel: ['10.0', '10.30']
+        laravel: ['10.0', '10.48', '11.0']
     name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }}
     steps:
       - name: Checkout

diff --git a/Changelog.md b/Changelog.md
@@ -19,6 +19,18 @@
 
 # 1.x Series
 
+## 1.8.0
+##### 2024-02-17
+
+- Dropped Laravel 9 support
+- Dropped PHP 8.0 support
+- Added Laravel 11 support
+
+## 1.7.1
+##### 2023-11-17
+
+- Added PHP 8.3 support
+
 ## 1.7.0
 ##### 2023-02-17
 

diff --git a/composer.json b/composer.json
@@ -13,6 +13,8 @@
     ],
     "homepage": "https://github.com/artkonekt/acl",
     "license": "MIT",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "authors": [
         {
             "name": "Freek Van der Herten",
@@ -27,14 +29,14 @@
     ],
     "require": {
         "php" : "^8.2",
-        "illuminate/auth": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/database": "^10.0",
-        "konekt/concord": "^1.13.0"
+        "illuminate/auth": "^10.0|^11.0",
+        "illuminate/container": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/database": "^10.0|^11.0",
+        "konekt/concord": "^1.13"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "phpunit/phpunit" : "^10.0"
     },
     "autoload": {