diff --git a/composer.json b/composer.json index 8e78d4b..68ded1d 100644 --- a/composer.json +++ b/composer.json @@ -10,26 +10,30 @@ "homepage": "https://github.com/aryehraber/statamic-color-extractor", "license": "MIT", "require": { - "league/color-extractor": "0.3.*", - "statamic/cms": "^3.0", + "jonaskohl/color-extractor": "^0.4", "davidgorges/color-contrast": "^1.0" }, + "require-dev": { + "statamic/cms": "^3.0" + }, "autoload": { "psr-4": { "AryehRaber\\ColorExtractor\\": "src" } }, - "authors": [{ - "name": "Aryeh Raber", - "email": "aryeh.raber@gmail.com", - "homepage": "https://aryeh.dev", - "role": "Developer" - }], + "authors": [ + { + "name": "Aryeh Raber", + "email": "aryeh.raber@gmail.com", + "homepage": "https://aryeh.dev", + "role": "Developer" + } + ], "extra": { "statamic": { "name": "ColorExtractor", "description": "Extract colors from images.", - "version": "1.1.1" + "version": "1.2.0" }, "laravel": { "providers": [ @@ -38,5 +42,10 @@ } }, "minimum-stability": "dev", - "prefer-stable": true + "prefer-stable": true, + "config": { + "allow-plugins": { + "pixelfear/composer-dist-plugin": true + } + } } diff --git a/src/ColorExtractorModifier.php b/src/ColorExtractorModifier.php index 737c29e..2fd6c35 100644 --- a/src/ColorExtractorModifier.php +++ b/src/ColorExtractorModifier.php @@ -2,18 +2,18 @@ namespace AryehRaber\ColorExtractor; -use Statamic\Support\Arr; -use Statamic\Support\Str; +use ColorContrast\ColorContrast; +use Illuminate\Support\Facades\Cache; +use Intervention\Image\Facades\Image; +use JonasKohl\ColorExtractor\Color; +use JonasKohl\ColorExtractor\ColorExtractor; +use JonasKohl\ColorExtractor\Palette; use Statamic\Assets\Asset; use Statamic\Facades\File; use Statamic\Facades\Folder; -use ColorContrast\ColorContrast; -use League\ColorExtractor\Color; use Statamic\Modifiers\Modifier; -use League\ColorExtractor\Palette; -use Illuminate\Support\Facades\Cache; -use Intervention\Image\Facades\Image; -use League\ColorExtractor\ColorExtractor; +use Statamic\Support\Arr; +use Statamic\Support\Str; class ColorExtractorModifier extends Modifier {