diff options
| author | Remi Collet <remi@remirepo.net> | 2020-12-22 12:42:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-12-22 12:42:05 +0100 |
| commit | 240c2bc4656379259b54e9ab38883f6635dc5098 (patch) | |
| tree | 349890ee523e7ae98e8a7dcbe6582e9a3a83880a | |
| parent | 108eb5f74f61001491fcdde9045d58b6a37694c3 (diff) | |
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-oneup-flysystem-bundle.spec | 9 |
2 files changed, 10 insertions, 4 deletions
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 }, diff --git a/php-oneup-flysystem-bundle.spec b/php-oneup-flysystem-bundle.spec index 803ec9f..b82cb97 100644 --- a/php-oneup-flysystem-bundle.spec +++ b/php-oneup-flysystem-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 8217801569d773e121b922b55214631134e07e82 +%global gh_commit de1aa0fa361496b3837da5cac286f029595581da %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner 1up-lab %global gh_project OneupFlysystemBundle @@ -21,7 +21,7 @@ %global with_tests 0%{?_with_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 3.6.0 +Version: 3.7.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Conversion of unicode, HTML and shortcode emoji @@ -50,7 +50,7 @@ BuildRequires: php-league-flysystem >= 1.0.26 %endif # From composer.json, "require-dev": { # "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", @@ -237,6 +237,9 @@ exit $ret %changelog +* Tue Dec 22 2020 Remi Collet <remi@remirepo.net> - 3.7.0-1 +- update to 3.7.0 + * Thu Dec 10 2020 Remi Collet <remi@remirepo.net> - 3.6.0-1 - update to 3.6.0 (no change) - raise dependency on PHP 7.1 |