Skip to content

Commit da5e46d

Browse files
stuartmorgan-gstuartmorgan-g
authored
[various] Update Pigeon for task queue changes (#8654)
Picks up the changes to task queue code generation in Pigeon 24.2.0, so that calls to different background methods will be serialized within the whole group, rather than by individual method, as that was how they were intended to work in the first place (and was how the plugins worked when delegation to a background thread was done manually with the plugin, before adopting task queues)
1 parent eeecb3b commit da5e46d

11 files changed

Lines changed: 22 additions & 38 deletions

File tree

‎packages/image_picker/image_picker_android/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.12+21
2+
3+
* Ensures that platform messages on background queues are handled in order.
4+
15
## 0.8.12+20
26

37
* Updates androidx.annotation:annotation to 1.9.1.

‎packages/image_picker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/Messages.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.6.2), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66

77
package io.flutter.plugins.imagepicker;
@@ -923,8 +923,8 @@ static void setUp(
923923
@NonNull String messageChannelSuffix,
924924
@Nullable ImagePickerApi api) {
925925
messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;
926+
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
926927
{
927-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
928928
BasicMessageChannel<Object> channel =
929929
new BasicMessageChannel<>(
930930
binaryMessenger,
@@ -960,7 +960,6 @@ public void error(Throwable error) {
960960
}
961961
}
962962
{
963-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
964963
BasicMessageChannel<Object> channel =
965964
new BasicMessageChannel<>(
966965
binaryMessenger,
@@ -1030,7 +1029,6 @@ public void error(Throwable error) {
10301029
}
10311030
}
10321031
{
1033-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
10341032
BasicMessageChannel<Object> channel =
10351033
new BasicMessageChannel<>(
10361034
binaryMessenger,

‎packages/image_picker/image_picker_android/lib/src/messages.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.6.2), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
77

‎packages/image_picker/image_picker_android/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: image_picker_android
22
description: Android implementation of the image_picker plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
5-
version: 0.8.12+20
5+
version: 0.8.12+21
66

77
environment:
88
sdk: ^3.5.0
@@ -27,7 +27,7 @@ dev_dependencies:
2727
flutter_test:
2828
sdk: flutter
2929
mockito: ^5.4.4
30-
pigeon: ^22.4.1
30+
pigeon: ^24.2.0
3131

3232
topics:
3333
- camera

‎packages/image_picker/image_picker_android/test/test_api.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.6.2), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import, no_leading_underscores_for_local_identifiers
77
// ignore_for_file: avoid_relative_lib_imports

‎packages/shared_preferences/shared_preferences_android/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.4.6
2+
3+
* Ensures that platform messages on background queues are handled in order.
4+
15
## 2.4.5
26

37
* Bumps gradle-plugin to 2.1.10.

‎packages/shared_preferences/shared_preferences_android/android/src/main/java/io/flutter/plugins/sharedpreferences/Messages.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.7.2), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66

77
package io.flutter.plugins.sharedpreferences;
@@ -129,8 +129,8 @@ static void setUp(
129129
@NonNull String messageChannelSuffix,
130130
@Nullable SharedPreferencesApi api) {
131131
messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;
132+
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
132133
{
133-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
134134
BasicMessageChannel<Object> channel =
135135
new BasicMessageChannel<>(
136136
binaryMessenger,
@@ -157,7 +157,6 @@ static void setUp(
157157
}
158158
}
159159
{
160-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
161160
BasicMessageChannel<Object> channel =
162161
new BasicMessageChannel<>(
163162
binaryMessenger,
@@ -185,7 +184,6 @@ static void setUp(
185184
}
186185
}
187186
{
188-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
189187
BasicMessageChannel<Object> channel =
190188
new BasicMessageChannel<>(
191189
binaryMessenger,
@@ -213,7 +211,6 @@ static void setUp(
213211
}
214212
}
215213
{
216-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
217214
BasicMessageChannel<Object> channel =
218215
new BasicMessageChannel<>(
219216
binaryMessenger,
@@ -241,7 +238,6 @@ static void setUp(
241238
}
242239
}
243240
{
244-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
245241
BasicMessageChannel<Object> channel =
246242
new BasicMessageChannel<>(
247243
binaryMessenger,
@@ -269,7 +265,6 @@ static void setUp(
269265
}
270266
}
271267
{
272-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
273268
BasicMessageChannel<Object> channel =
274269
new BasicMessageChannel<>(
275270
binaryMessenger,
@@ -297,7 +292,6 @@ static void setUp(
297292
}
298293
}
299294
{
300-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
301295
BasicMessageChannel<Object> channel =
302296
new BasicMessageChannel<>(
303297
binaryMessenger,
@@ -325,7 +319,6 @@ static void setUp(
325319
}
326320
}
327321
{
328-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
329322
BasicMessageChannel<Object> channel =
330323
new BasicMessageChannel<>(
331324
binaryMessenger,
@@ -353,7 +346,6 @@ static void setUp(
353346
}
354347
}
355348
{
356-
BinaryMessenger.TaskQueue taskQueue = binaryMessenger.makeBackgroundTaskQueue();
357349
BasicMessageChannel<Object> channel =
358350
new BasicMessageChannel<>(
359351
binaryMessenger,

‎packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/MessagesAsync.g.kt‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.7.4), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
77

@@ -196,8 +196,8 @@ interface SharedPreferencesAsyncApi {
196196
) {
197197
val separatedMessageChannelSuffix =
198198
if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
199+
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
199200
run {
200-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
201201
val channel =
202202
BasicMessageChannel<Any?>(
203203
binaryMessenger,
@@ -224,7 +224,6 @@ interface SharedPreferencesAsyncApi {
224224
}
225225
}
226226
run {
227-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
228227
val channel =
229228
BasicMessageChannel<Any?>(
230229
binaryMessenger,
@@ -251,7 +250,6 @@ interface SharedPreferencesAsyncApi {
251250
}
252251
}
253252
run {
254-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
255253
val channel =
256254
BasicMessageChannel<Any?>(
257255
binaryMessenger,
@@ -278,7 +276,6 @@ interface SharedPreferencesAsyncApi {
278276
}
279277
}
280278
run {
281-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
282279
val channel =
283280
BasicMessageChannel<Any?>(
284281
binaryMessenger,
@@ -305,7 +302,6 @@ interface SharedPreferencesAsyncApi {
305302
}
306303
}
307304
run {
308-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
309305
val channel =
310306
BasicMessageChannel<Any?>(
311307
binaryMessenger,
@@ -332,7 +328,6 @@ interface SharedPreferencesAsyncApi {
332328
}
333329
}
334330
run {
335-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
336331
val channel =
337332
BasicMessageChannel<Any?>(
338333
binaryMessenger,
@@ -359,7 +354,6 @@ interface SharedPreferencesAsyncApi {
359354
}
360355
}
361356
run {
362-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
363357
val channel =
364358
BasicMessageChannel<Any?>(
365359
binaryMessenger,
@@ -384,7 +378,6 @@ interface SharedPreferencesAsyncApi {
384378
}
385379
}
386380
run {
387-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
388381
val channel =
389382
BasicMessageChannel<Any?>(
390383
binaryMessenger,
@@ -409,7 +402,6 @@ interface SharedPreferencesAsyncApi {
409402
}
410403
}
411404
run {
412-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
413405
val channel =
414406
BasicMessageChannel<Any?>(
415407
binaryMessenger,
@@ -434,7 +426,6 @@ interface SharedPreferencesAsyncApi {
434426
}
435427
}
436428
run {
437-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
438429
val channel =
439430
BasicMessageChannel<Any?>(
440431
binaryMessenger,
@@ -459,7 +450,6 @@ interface SharedPreferencesAsyncApi {
459450
}
460451
}
461452
run {
462-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
463453
val channel =
464454
BasicMessageChannel<Any?>(
465455
binaryMessenger,
@@ -484,7 +474,6 @@ interface SharedPreferencesAsyncApi {
484474
}
485475
}
486476
run {
487-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
488477
val channel =
489478
BasicMessageChannel<Any?>(
490479
binaryMessenger,
@@ -509,7 +498,6 @@ interface SharedPreferencesAsyncApi {
509498
}
510499
}
511500
run {
512-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
513501
val channel =
514502
BasicMessageChannel<Any?>(
515503
binaryMessenger,
@@ -535,7 +523,6 @@ interface SharedPreferencesAsyncApi {
535523
}
536524
}
537525
run {
538-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
539526
val channel =
540527
BasicMessageChannel<Any?>(
541528
binaryMessenger,
@@ -560,7 +547,6 @@ interface SharedPreferencesAsyncApi {
560547
}
561548
}
562549
run {
563-
val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
564550
val channel =
565551
BasicMessageChannel<Any?>(
566552
binaryMessenger,

‎packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.7.2), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
77

‎packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2013 The Flutter Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
4-
// Autogenerated from Pigeon (v22.7.4), do not edit directly.
4+
// Autogenerated from Pigeon (v24.2.0), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
77

0 commit comments

Comments
 (0)