From 07dcd7f2a6f3f765a1f36bbbb32bc7a94287fbb9 Mon Sep 17 00:00:00 2001 From: Martin Kiesel Date: Sun, 6 Oct 2019 20:22:15 +0200 Subject: [PATCH] Support Laravel 6.1 --- .travis.yml | 3 +++ README.md | 2 +- composer.json | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32b25a4..995a6f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ git: env: - version=L5-8 - version=L6-0 + - version=L6-1 sudo: false @@ -24,6 +25,7 @@ install: - travis_retry composer install --no-interaction --prefer-dist --no-suggest; - if [[ $version = 'L5-8' ]]; then travis_retry composer require --dev --update-with-dependencies --no-suggest --no-interaction orchestra/testbench:"3.8.*" phpunit/phpunit:"^7.0"; fi - if [[ $version = 'L6-0' ]]; then travis_retry composer require --dev --update-with-dependencies --no-suggest --no-interaction orchestra/testbench:"4.0.*" phpunit/phpunit:"^8.0"; fi + - if [[ $version = 'L6-1' ]]; then travis_retry composer require --dev --update-with-dependencies --no-suggest --no-interaction orchestra/testbench:"4.1.*" phpunit/phpunit:"^8.0"; fi script: vendor/bin/phpunit @@ -32,4 +34,5 @@ branches: - master - L5.8 - L6.0 + - L6.1 diff --git a/README.md b/README.md index ac3e5fe..7bea5d4 100755 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Pull this package in through Composer (development/latest version `dev-master`) ```json { "require": { - "kyslik/column-sortable": "6.0.*" + "kyslik/column-sortable": "6.1.*" } } ``` diff --git a/composer.json b/composer.json index 552fb49..03f1faa 100755 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "kyslik/column-sortable", - "description": "Package for handling column sorting in Laravel 5.x", + "description": "Package for handling column sorting in Laravel 6.x", "keywords": [ "sortable", "sorting", @@ -19,12 +19,12 @@ ], "require": { "php": ">=7.2", - "illuminate/support": "5.8.*|6.0.*", - "illuminate/database": "5.8.*|6.0.*" + "illuminate/support": "5.8.*|6.0.*|6.1.*", + "illuminate/database": "5.8.*|6.0.*|6.1.*" }, "require-dev": { "phpunit/phpunit": "^7.0|^8.0", - "orchestra/testbench": "3.8.*|4.0.*" + "orchestra/testbench": "3.8.*|4.*" }, "autoload": { "psr-4": {