Skip to content

Commit

Permalink
Merge pull request #1706 from rvanvelzen/async-aws-s3-v2
Browse files Browse the repository at this point in the history
Allow async-aws/*s3 v2
  • Loading branch information
frankdejonge authored Oct 5, 2023
2 parents b980636 + 42223da commit 03da7c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"composer/semver": "^3.0",
"friendsofphp/php-cs-fixer": "^3.5",
"google/cloud-storage": "^1.23",
"async-aws/s3": "^1.5",
"async-aws/simple-s3": "^1.1",
"async-aws/s3": "^1.5 || ^2.0",
"async-aws/simple-s3": "^1.1 || ^2.0",
"sabre/dav": "^4.3.1"
},
"conflict": {
Expand Down
4 changes: 2 additions & 2 deletions src/AsyncAwsS3/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"php": "^8.0.2",
"league/flysystem": "^3.10.0",
"league/mime-type-detection": "^1.0.0",
"async-aws/s3": "^1.5"
"async-aws/s3": "^1.5 || ^2.0"
},
"require-dev": {
"async-aws/simple-s3": "^1.1"
"async-aws/simple-s3": "^1.1 || ^2.0"
},
"conflict": {
"symfony/http-client": "<5.2",
Expand Down

0 comments on commit 03da7c5

Please sign in to comment.