diff --git a/Resources/config/adapters.xml b/Resources/config/adapters.xml index 11eb1c0..b5bae5a 100644 --- a/Resources/config/adapters.xml +++ b/Resources/config/adapters.xml @@ -21,7 +21,7 @@ - + diff --git a/composer.json b/composer.json index bab9875..16fdb8a 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "symfony/http-kernel": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { - "async-aws/flysystem-s3": "^0.4.0", + "async-aws/flysystem-s3": "^1.0", "jenko/flysystem-gaufrette": "^1.0", "league/flysystem-aws-s3-v2": "^1.0", "league/flysystem-azure-blob-storage": "^0.1", @@ -75,6 +75,9 @@ "superbalist/flysystem-google-storage": "Allows you to use Google Cloud Storage buckets", "twistor/flysystem-stream-wrapper": "Allows you to use stream wrapper" }, + "conflict": { + "async-aws/flysystem-s3": "<1.0" + }, "config": { "sort-packages": true },