Merge pull request #6 from acelaya-forks/feature/common-2

Added support for shlink-common v2
shlinkio · Sep 11, 2019 · 60ff264 · 60ff264
2 parents d9d64de + a180df8
commit 60ff264
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 1.0.1 - 2019-09-11
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#5](https://github.com/shlinkio/shlink-ip-geolocation/issues/5) Added support for [shlink-common](https://github.com/shlinkio/shlink-common) v2.0.0.
+
+
 ## 1.0.0 - 2019-08-12
 
 #### Added

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.2",
         "geoip2/geoip2": "^2.9",
-        "shlinkio/shlink-common": "^1.0"
+        "shlinkio/shlink-common": "^1.0 || ^2.0"
     },
     "require-dev": {
         "infection/infection": "^0.13.4",
@@ -45,9 +45,9 @@
         "cs:fix": "phpcbf",
         "stan": "phpstan analyse src config --level=6",
 
-        "test": "phpdbg -qrr vendor/bin/phpunit --order-by=random --testdox",
-        "test:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml --testdox",
-        "test:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-html build/coverage-html --testdox",
+        "test": "phpdbg -qrr vendor/bin/phpunit --order-by=random --testdox --colors=always",
+        "test:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml --testdox --colors=always",
+        "test:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-html build/coverage-html --testdox --colors=always",
 
         "infect": "infection --threads=4 --min-msi=60 --log-verbosity=default --only-covered",
         "infect:ci": "infection --threads=4 --min-msi=60 --log-verbosity=default --only-covered --coverage=build",