From 7967533b468d52a5ba8d38300233f179852b222e Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 15 Oct 2024 15:50:41 -0700 Subject: [PATCH 1/5] image_picker: Loosen mime dep to >=1.0.4 <3.0.0 Provides version interop for projects that depend on mime version 2.0.0 and later. The breaking version change was due to a change in the return value of `extensionFromMime`, which is unused in `image_picker`. See: https://github.com/dart-lang/tools/blob/main/pkgs/mime/CHANGELOG.md#200 Issue: https://github.com/flutter/packages/pull/7875 --- packages/image_picker/image_picker/CHANGELOG.md | 4 ++++ .../image_picker/image_picker_android/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_for_web/pubspec.yaml | 2 +- packages/image_picker/image_picker_ios/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_linux/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_macos/example/pubspec.yaml | 2 +- .../image_picker/image_picker_windows/example/pubspec.yaml | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 29fb408f8b45..66cdc927a984 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,3 +1,7 @@ +## NEXT + +* Extends the `mime` package version constraint from `^1.0.4` to `>=1.0.4 <3.0.0`. + ## 1.1.2 * Adds comment for the limit parameter. diff --git a/packages/image_picker/image_picker_android/example/pubspec.yaml b/packages/image_picker/image_picker_android/example/pubspec.yaml index 180cff67ed3c..b34a5b15dd34 100644 --- a/packages/image_picker/image_picker_android/example/pubspec.yaml +++ b/packages/image_picker/image_picker_android/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ image_picker_platform_interface: ^2.10.0 - mime: ^1.0.4 + mime: ">=1.0.4 <3.0.0" video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_for_web/pubspec.yaml b/packages/image_picker/image_picker_for_web/pubspec.yaml index af3cf9f92e87..9c1c7282a7e6 100644 --- a/packages/image_picker/image_picker_for_web/pubspec.yaml +++ b/packages/image_picker/image_picker_for_web/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter image_picker_platform_interface: ^2.9.0 - mime: ^1.0.4 + mime: ">=1.0.4 <3.0.0" web: ">=0.5.1 <2.0.0" dev_dependencies: diff --git a/packages/image_picker/image_picker_ios/example/pubspec.yaml b/packages/image_picker/image_picker_ios/example/pubspec.yaml index 57c9e2d83fc4..10cc6339a7a9 100755 --- a/packages/image_picker/image_picker_ios/example/pubspec.yaml +++ b/packages/image_picker/image_picker_ios/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ image_picker_platform_interface: ^2.10.0 - mime: ^1.0.4 + mime: ">=1.0.4 <3.0.0" video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_linux/example/pubspec.yaml b/packages/image_picker/image_picker_linux/example/pubspec.yaml index 6f1bbca79bd9..2f55da36fe1d 100644 --- a/packages/image_picker/image_picker_linux/example/pubspec.yaml +++ b/packages/image_picker/image_picker_linux/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # the parent directory to use the current plugin's version. path: .. image_picker_platform_interface: ^2.8.0 - mime: ^1.0.4 + mime: ">=1.0.4 <3.0.0" video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_macos/example/pubspec.yaml b/packages/image_picker/image_picker_macos/example/pubspec.yaml index e7e359d7529a..3a42c5be57cd 100644 --- a/packages/image_picker/image_picker_macos/example/pubspec.yaml +++ b/packages/image_picker/image_picker_macos/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # the parent directory to use the current plugin's version. path: .. image_picker_platform_interface: ^2.8.0 - mime: ^1.0.4 + mime: ">=1.0.4 < 3.0.0" video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_windows/example/pubspec.yaml b/packages/image_picker/image_picker_windows/example/pubspec.yaml index c91f2fb4555e..7f526d0248fe 100644 --- a/packages/image_picker/image_picker_windows/example/pubspec.yaml +++ b/packages/image_picker/image_picker_windows/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: .. - mime: ^1.0.4 + mime: ">=1.0.4 <3.0.0" video_player: ^2.1.4 dev_dependencies: From 6d3a6838950c42aaba8e38e6e44d9b84bf7eff53 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 15 Oct 2024 16:31:13 -0700 Subject: [PATCH 2/5] Bump pubspec version to 1.1.3 --- packages/image_picker/image_picker/CHANGELOG.md | 2 +- packages/image_picker/image_picker/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 66cdc927a984..554fa67b13ef 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,4 +1,4 @@ -## NEXT +## 1.1.3 * Extends the `mime` package version constraint from `^1.0.4` to `>=1.0.4 <3.0.0`. diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 6c5676a60e0d..ad021b4c058c 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 1.1.2 +version: 1.1.3 environment: sdk: ^3.3.0 From d5f761df67491c6afc0e14e9c13b5c630b110e13 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 15 Oct 2024 16:55:23 -0700 Subject: [PATCH 3/5] Web is its own thing, it seems --- packages/image_picker/image_picker_for_web/CHANGELOG.md | 3 ++- packages/image_picker/image_picker_for_web/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/image_picker/image_picker_for_web/CHANGELOG.md b/packages/image_picker/image_picker_for_web/CHANGELOG.md index aeb37a216403..8770e322a3dc 100644 --- a/packages/image_picker/image_picker_for_web/CHANGELOG.md +++ b/packages/image_picker/image_picker_for_web/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 3.0.6 * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4. +* Extends the `mime` package version constraint from `^1.0.4` to `>=1.0.4 <3.0.0`. ## 3.0.5 diff --git a/packages/image_picker/image_picker_for_web/pubspec.yaml b/packages/image_picker/image_picker_for_web/pubspec.yaml index 9c1c7282a7e6..89ccc2337762 100644 --- a/packages/image_picker/image_picker_for_web/pubspec.yaml +++ b/packages/image_picker/image_picker_for_web/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_for_web description: Web platform implementation of image_picker repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_for_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 3.0.5 +version: 3.0.6 environment: sdk: ^3.4.0 From 7a9561af7fb8d52e365587665b6f772942814555 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 16 Oct 2024 10:15:21 -0700 Subject: [PATCH 4/5] Can I get away with removing the version bump here? --- packages/image_picker/image_picker/CHANGELOG.md | 4 ---- packages/image_picker/image_picker/pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 554fa67b13ef..29fb408f8b45 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.1.3 - -* Extends the `mime` package version constraint from `^1.0.4` to `>=1.0.4 <3.0.0`. - ## 1.1.2 * Adds comment for the limit parameter. diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index ad021b4c058c..6c5676a60e0d 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 1.1.3 +version: 1.1.2 environment: sdk: ^3.3.0 From 8a638ed9105622e54f65bd468301865c8b1aec60 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 16 Oct 2024 11:58:23 -0700 Subject: [PATCH 5/5] Simplify examples mime constraint --- packages/image_picker/image_picker_android/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_ios/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_linux/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_macos/example/pubspec.yaml | 2 +- packages/image_picker/image_picker_windows/example/pubspec.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/image_picker/image_picker_android/example/pubspec.yaml b/packages/image_picker/image_picker_android/example/pubspec.yaml index b34a5b15dd34..b3e2931c6986 100644 --- a/packages/image_picker/image_picker_android/example/pubspec.yaml +++ b/packages/image_picker/image_picker_android/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ image_picker_platform_interface: ^2.10.0 - mime: ">=1.0.4 <3.0.0" + mime: ^2.0.0 video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_ios/example/pubspec.yaml b/packages/image_picker/image_picker_ios/example/pubspec.yaml index 10cc6339a7a9..dbfe54d4420f 100755 --- a/packages/image_picker/image_picker_ios/example/pubspec.yaml +++ b/packages/image_picker/image_picker_ios/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ image_picker_platform_interface: ^2.10.0 - mime: ">=1.0.4 <3.0.0" + mime: ^2.0.0 video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_linux/example/pubspec.yaml b/packages/image_picker/image_picker_linux/example/pubspec.yaml index 2f55da36fe1d..5db5fb085f8c 100644 --- a/packages/image_picker/image_picker_linux/example/pubspec.yaml +++ b/packages/image_picker/image_picker_linux/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # the parent directory to use the current plugin's version. path: .. image_picker_platform_interface: ^2.8.0 - mime: ">=1.0.4 <3.0.0" + mime: ^2.0.0 video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_macos/example/pubspec.yaml b/packages/image_picker/image_picker_macos/example/pubspec.yaml index 3a42c5be57cd..ab0d82bbc305 100644 --- a/packages/image_picker/image_picker_macos/example/pubspec.yaml +++ b/packages/image_picker/image_picker_macos/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # the parent directory to use the current plugin's version. path: .. image_picker_platform_interface: ^2.8.0 - mime: ">=1.0.4 < 3.0.0" + mime: ^2.0.0 video_player: ^2.1.4 dev_dependencies: diff --git a/packages/image_picker/image_picker_windows/example/pubspec.yaml b/packages/image_picker/image_picker_windows/example/pubspec.yaml index 7f526d0248fe..744a9e61ba0f 100644 --- a/packages/image_picker/image_picker_windows/example/pubspec.yaml +++ b/packages/image_picker/image_picker_windows/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # The example app is bundled with the plugin so we use a path dependency on # the parent directory to use the current plugin's version. path: .. - mime: ">=1.0.4 <3.0.0" + mime: ^2.0.0 video_player: ^2.1.4 dev_dependencies: