Skip to content

Merge main into release/14.0.0 - #2306

Merged
navaronbracke merged 7 commits into
release/14.0.0from
chore/merge-main-into-v14
Nov 2, 2026
Merged

navaronbracke merged 7 commits into
release/14.0.0from
chore/merge-main-into-v14

Conversation

@vicajilau

Copy link
Copy Markdown
Owner

Part of #2224. Brings the 13.x fixes published today into release/14.0.0:

Conflicts

  • The versions and the facade constraints keep the v14 ones.
  • Each CHANGELOG keeps its v14 section on top of the new 13.x one.
  • file_picker_android_test.dart keeps both the v14 tests and the new status update tests.

#2304 moves the Android tests onto a fake FilePickerApi, so it will need the status update tests ported once this is in.

Tests

dart format, flutter analyze and flutter test pass in every package, as do flutter test tool/test and ./gradlew :android_file_picker:testDebugUnitTest.

Merge it with a merge commit, not a squash, so main stays an ancestor of the release branch.

vicajilau and others added 7 commits November 1, 2026 13:22
FilePickerDelegate dropped activity results with an unexpected result code, a confirmed save without a location, and picks without a type, so the Dart call never completed and every later pick failed with already_active. They now fail with unknown_result or invalid_type, decided by a JVM tested ResultOutcome. Results of activities started by other plugins are no longer answered as an error of a pending pick, and a SecurityException while writing a saved file now fails the save instead of crashing the app.

On Android and Darwin, onFileSaving now also reports done when saving fails, and an error of the status stream is ignored instead of thrown as an uncaught error.

Bumps android_file_picker to 2.1.3, file_picker_darwin to 2.4.2 and file_picker to 13.3.2.
2.0.1 raised dbus to ^0.8.0 through a Dependabot bump that nothing
needed, so apps that also use a plugin still on dbus 0.7, such as
geolocator_linux, could no longer resolve once the facade required
file_picker_linux ^2.0.2. Allow >=0.7.13 <0.9.0 and keep Dependabot
from raising the lower bound again.
Co-authored-by: Navaron Bracke <brackenavaron@gmail.com>
Let file_picker_linux resolve against dbus 0.7 again
Brings the 13.x fixes published as android_file_picker 2.1.3, file_picker_darwin 2.4.2, file_picker_linux 2.0.3 and file_picker 13.3.2 into v14 (#2302, #2305).

The versions and the facade constraints stay at the v14 ones. Each CHANGELOG keeps its v14 section on top of the new 13.x one. The Android tests keep both the v14 tests and the new status update tests.
@navaronbracke
navaronbracke merged commit 6f402e0 into release/14.0.0 Nov 2, 2026
14 checks passed
@navaronbracke
navaronbracke deleted the chore/merge-main-into-v14 branch November 2, 2026 13:26
vicajilau added a commit that referenced this pull request Nov 2, 2026
Brings in the 13.x fixes merged through #2306. The status stream and saveFile() fixes of #2302 merged cleanly into the Pigeon version. The conflict in pickFiles() keeps the Pigeon call, without the catch that only rethrew, which #2302 removed.

The two status update tests of #2302 mocked the method channel, which is gone, so they now answer through a FakeFilePickerApi. Both still fail without the fixes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants