Reinstate support for Scout 7 (#41)

pmatseykanets · Sep 24, 2020 · 12b1ff5 · 12b1ff5
1 parent 9e3995e
commit 12b1ff5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,11 +15,14 @@ jobs:
       matrix:
         php: [7.2, 7.3, 7.4]
         laravel: [^6.0, ^7.0, ^8.0]
+        scout: [^7.0, ^8.0]
         exclude:
           - php: 7.2
             laravel: ^8.0
+          - laravel: ^8.0
+            scout: ^7.0
 
-    name: Test with PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+    name: Test PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Scout ${{ matrix.scout }}
 
     steps:
       - name: Checkout code
@@ -38,6 +41,7 @@ jobs:
            composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
            composer require "illuminate/database=${{ matrix.laravel }}" --no-update
            composer require "illuminate/support=${{ matrix.laravel }}" --no-update
+           composer require "laravel/scout=${{ matrix.scout }}" --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Run tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [7.2.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v7.2.0) - 2020-09-24
+
+### Changed
+
+- Reinstated support for Scout 7
+
 ## [7.1.0](https://github.com/pmatseykanets/laravel-scout-postgres/releases/tag/v7.1.0) - 2020-09-14
 
 ### Added

diff --git a/README.md b/README.md
@@ -32,22 +32,8 @@ This package makes it easy to use native PostgreSQL Full Text Search capabilitie
 
 You can install the package via composer:
 
-**Scout 8**
-
-``` bash
-composer require pmatseykanets/laravel-scout-postgres:7
-```
-
-For Laravel 8 support use `7.1` an up.
-
-``` bash
-composer require pmatseykanets/laravel-scout-postgres:7.1
-```
-
-**Scout 7**
-
 ``` bash
-composer require pmatseykanets/laravel-scout-postgres:5
+composer require pmatseykanets/laravel-scout-postgres
 ```
 
 ### Laravel

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "illuminate/contracts": "~6.0|~7.0|~8.0",
         "illuminate/database": "~6.0|~7.0|~8.0",
         "illuminate/support": "~6.0|~7.0|~8.0",
-        "laravel/scout": "~8.0"
+        "laravel/scout": "~7.0|~8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.3",