Merge pull request #12 from schulzefelix/laravel-6-update

Add Laravel 6 Support
schulzefelix · Sep 15, 2019 · be44804 · be44804
2 parents 7ae17e6 + 7903a61
commit be44804
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -16,8 +16,3 @@ checks:
         fix_line_ending: true
         fix_identation_4spaces: true
         fix_doc_comments: true
-
-tools:
-    external_code_coverage:
-        timeout: 120
-        runs: 4
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,4 @@ before_script:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
-
-after_script:
-  - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+  - phpunit --coverage-text --coverage-clover=coverage.clover
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 All Notable changes to `Laravel AdWords Targeting Idea Service` will be documented in this file.
+## [1.5.0] - 2019-09-15
+- add support for Laravel 6
 
 ## [1.4.1] - 2019-03-10
 - fix dependencies for carbon v2 

diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
-        "laravel/framework": "~5.8.0",
-        "googleads/googleads-php-lib": "^40.0",
-        "schulzefelix/laravel-data-transfer-object": "^1.1.0"
+        "php": "^7.2",
+        "laravel/framework": "^6.0",
+        "googleads/googleads-php-lib": "^43.0",
+        "schulzefelix/laravel-data-transfer-object": "^1.2.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench" : "~3.8.0",
+        "orchestra/testbench": "^4.0",
         "phpunit/phpunit" : "^8.0"
     },
     "autoload": {