Skip to content

Commit 0bf0878

Browse files
stuartmorgan-gstuartmorgan-g
authored
[shared_preferences] Update iOS/macOS Pigeon (flutter#4668)
Updates to the latest version of Pigeon to pick up the change that added the package name to method channels. Avoids the collision with the legacy `shared_preferences_ios` that causes flutter#128560.
1 parent 6cc49a4 commit 0bf0878

File tree

5 files changed

+60
-38
lines changed

5 files changed

+60
-38
lines changed

‎packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.3.3
2+
3+
* Updates Pigeon-generated code to avoid conflicts with `shared_preferences_ios`.
4+
15
## 2.3.2
26

37
* Updates to the latest version of `pigeon`.

‎packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift‎

Lines changed: 13 additions & 7 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 (v10.1.3), do not edit directly.
4+
// Autogenerated from Pigeon (v10.1.6), do not edit directly.
55
// See also: https://pub.dev/packages/pigeon
66

77
import Foundation
@@ -53,7 +53,8 @@ class UserDefaultsApiSetup {
5353
/// Sets up an instance of `UserDefaultsApi` to handle messages through the `binaryMessenger`.
5454
static func setUp(binaryMessenger: FlutterBinaryMessenger, api: UserDefaultsApi?) {
5555
let removeChannel = FlutterBasicMessageChannel(
56-
name: "dev.flutter.pigeon.UserDefaultsApi.remove", binaryMessenger: binaryMessenger)
56+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove",
57+
binaryMessenger: binaryMessenger)
5758
if let api = api {
5859
removeChannel.setMessageHandler { message, reply in
5960
let args = message as! [Any?]
@@ -69,7 +70,8 @@ class UserDefaultsApiSetup {
6970
removeChannel.setMessageHandler(nil)
7071
}
7172
let setBoolChannel = FlutterBasicMessageChannel(
72-
name: "dev.flutter.pigeon.UserDefaultsApi.setBool", binaryMessenger: binaryMessenger)
73+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool",
74+
binaryMessenger: binaryMessenger)
7375
if let api = api {
7476
setBoolChannel.setMessageHandler { message, reply in
7577
let args = message as! [Any?]
@@ -86,7 +88,8 @@ class UserDefaultsApiSetup {
8688
setBoolChannel.setMessageHandler(nil)
8789
}
8890
let setDoubleChannel = FlutterBasicMessageChannel(
89-
name: "dev.flutter.pigeon.UserDefaultsApi.setDouble", binaryMessenger: binaryMessenger)
91+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble",
92+
binaryMessenger: binaryMessenger)
9093
if let api = api {
9194
setDoubleChannel.setMessageHandler { message, reply in
9295
let args = message as! [Any?]
@@ -103,7 +106,8 @@ class UserDefaultsApiSetup {
103106
setDoubleChannel.setMessageHandler(nil)
104107
}
105108
let setValueChannel = FlutterBasicMessageChannel(
106-
name: "dev.flutter.pigeon.UserDefaultsApi.setValue", binaryMessenger: binaryMessenger)
109+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue",
110+
binaryMessenger: binaryMessenger)
107111
if let api = api {
108112
setValueChannel.setMessageHandler { message, reply in
109113
let args = message as! [Any?]
@@ -120,7 +124,8 @@ class UserDefaultsApiSetup {
120124
setValueChannel.setMessageHandler(nil)
121125
}
122126
let getAllChannel = FlutterBasicMessageChannel(
123-
name: "dev.flutter.pigeon.UserDefaultsApi.getAll", binaryMessenger: binaryMessenger)
127+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll",
128+
binaryMessenger: binaryMessenger)
124129
if let api = api {
125130
getAllChannel.setMessageHandler { message, reply in
126131
let args = message as! [Any?]
@@ -137,7 +142,8 @@ class UserDefaultsApiSetup {
137142
getAllChannel.setMessageHandler(nil)
138143
}
139144
let clearChannel = FlutterBasicMessageChannel(
140-
name: "dev.flutter.pigeon.UserDefaultsApi.clear", binaryMessenger: binaryMessenger)
145+
name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear",
146+
binaryMessenger: binaryMessenger)
141147
if let api = api {
142148
clearChannel.setMessageHandler { message, reply in
143149
let args = message as! [Any?]

‎packages/shared_preferences/shared_preferences_foundation/lib/messages.g.dart‎

Lines changed: 13 additions & 7 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 (v10.1.3), do not edit directly.
4+
// Autogenerated from Pigeon (v10.1.6), 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
77

@@ -23,7 +23,8 @@ class UserDefaultsApi {
2323

2424
Future<void> remove(String arg_key) async {
2525
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
26-
'dev.flutter.pigeon.UserDefaultsApi.remove', codec,
26+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove',
27+
codec,
2728
binaryMessenger: _binaryMessenger);
2829
final List<Object?>? replyList =
2930
await channel.send(<Object?>[arg_key]) as List<Object?>?;
@@ -45,7 +46,8 @@ class UserDefaultsApi {
4546

4647
Future<void> setBool(String arg_key, bool arg_value) async {
4748
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
48-
'dev.flutter.pigeon.UserDefaultsApi.setBool', codec,
49+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool',
50+
codec,
4951
binaryMessenger: _binaryMessenger);
5052
final List<Object?>? replyList =
5153
await channel.send(<Object?>[arg_key, arg_value]) as List<Object?>?;
@@ -67,7 +69,8 @@ class UserDefaultsApi {
6769

6870
Future<void> setDouble(String arg_key, double arg_value) async {
6971
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
70-
'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec,
72+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble',
73+
codec,
7174
binaryMessenger: _binaryMessenger);
7275
final List<Object?>? replyList =
7376
await channel.send(<Object?>[arg_key, arg_value]) as List<Object?>?;
@@ -89,7 +92,8 @@ class UserDefaultsApi {
8992

9093
Future<void> setValue(String arg_key, Object arg_value) async {
9194
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
92-
'dev.flutter.pigeon.UserDefaultsApi.setValue', codec,
95+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue',
96+
codec,
9397
binaryMessenger: _binaryMessenger);
9498
final List<Object?>? replyList =
9599
await channel.send(<Object?>[arg_key, arg_value]) as List<Object?>?;
@@ -112,7 +116,8 @@ class UserDefaultsApi {
112116
Future<Map<String?, Object?>> getAll(
113117
String arg_prefix, List<String?>? arg_allowList) async {
114118
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
115-
'dev.flutter.pigeon.UserDefaultsApi.getAll', codec,
119+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll',
120+
codec,
116121
binaryMessenger: _binaryMessenger);
117122
final List<Object?>? replyList = await channel
118123
.send(<Object?>[arg_prefix, arg_allowList]) as List<Object?>?;
@@ -139,7 +144,8 @@ class UserDefaultsApi {
139144

140145
Future<bool> clear(String arg_prefix, List<String?>? arg_allowList) async {
141146
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
142-
'dev.flutter.pigeon.UserDefaultsApi.clear', codec,
147+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear',
148+
codec,
143149
binaryMessenger: _binaryMessenger);
144150
final List<Object?>? replyList = await channel
145151
.send(<Object?>[arg_prefix, arg_allowList]) as List<Object?>?;

‎packages/shared_preferences/shared_preferences_foundation/pubspec.yaml‎

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

77
environment:
88
sdk: ">=2.18.0 <4.0.0"
@@ -29,4 +29,4 @@ dependencies:
2929
dev_dependencies:
3030
flutter_test:
3131
sdk: flutter
32-
pigeon: ^10.1.3
32+
pigeon: ^10.1.6

‎packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart‎

Lines changed: 28 additions & 22 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 (v10.1.3), do not edit directly.
4+
// Autogenerated from Pigeon (v10.1.6), 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
77
// ignore_for_file: avoid_relative_lib_imports
@@ -34,7 +34,8 @@ abstract class TestUserDefaultsApi {
3434
{BinaryMessenger? binaryMessenger}) {
3535
{
3636
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
37-
'dev.flutter.pigeon.UserDefaultsApi.remove', codec,
37+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove',
38+
codec,
3839
binaryMessenger: binaryMessenger);
3940
if (api == null) {
4041
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -44,19 +45,20 @@ abstract class TestUserDefaultsApi {
4445
.setMockDecodedMessageHandler<Object?>(channel,
4546
(Object? message) async {
4647
assert(message != null,
47-
'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null.');
48+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove was null.');
4849
final List<Object?> args = (message as List<Object?>?)!;
4950
final String? arg_key = (args[0] as String?);
5051
assert(arg_key != null,
51-
'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null, expected non-null String.');
52+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove was null, expected non-null String.');
5253
api.remove(arg_key!);
5354
return <Object?>[];
5455
});
5556
}
5657
}
5758
{
5859
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
59-
'dev.flutter.pigeon.UserDefaultsApi.setBool', codec,
60+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool',
61+
codec,
6062
binaryMessenger: binaryMessenger);
6163
if (api == null) {
6264
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -66,22 +68,23 @@ abstract class TestUserDefaultsApi {
6668
.setMockDecodedMessageHandler<Object?>(channel,
6769
(Object? message) async {
6870
assert(message != null,
69-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null.');
71+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null.');
7072
final List<Object?> args = (message as List<Object?>?)!;
7173
final String? arg_key = (args[0] as String?);
7274
assert(arg_key != null,
73-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null String.');
75+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null, expected non-null String.');
7476
final bool? arg_value = (args[1] as bool?);
7577
assert(arg_value != null,
76-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null bool.');
78+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null, expected non-null bool.');
7779
api.setBool(arg_key!, arg_value!);
7880
return <Object?>[];
7981
});
8082
}
8183
}
8284
{
8385
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
84-
'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec,
86+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble',
87+
codec,
8588
binaryMessenger: binaryMessenger);
8689
if (api == null) {
8790
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -91,22 +94,23 @@ abstract class TestUserDefaultsApi {
9194
.setMockDecodedMessageHandler<Object?>(channel,
9295
(Object? message) async {
9396
assert(message != null,
94-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null.');
97+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null.');
9598
final List<Object?> args = (message as List<Object?>?)!;
9699
final String? arg_key = (args[0] as String?);
97100
assert(arg_key != null,
98-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null String.');
101+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null, expected non-null String.');
99102
final double? arg_value = (args[1] as double?);
100103
assert(arg_value != null,
101-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null double.');
104+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null, expected non-null double.');
102105
api.setDouble(arg_key!, arg_value!);
103106
return <Object?>[];
104107
});
105108
}
106109
}
107110
{
108111
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
109-
'dev.flutter.pigeon.UserDefaultsApi.setValue', codec,
112+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue',
113+
codec,
110114
binaryMessenger: binaryMessenger);
111115
if (api == null) {
112116
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -116,22 +120,23 @@ abstract class TestUserDefaultsApi {
116120
.setMockDecodedMessageHandler<Object?>(channel,
117121
(Object? message) async {
118122
assert(message != null,
119-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null.');
123+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null.');
120124
final List<Object?> args = (message as List<Object?>?)!;
121125
final String? arg_key = (args[0] as String?);
122126
assert(arg_key != null,
123-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null String.');
127+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null, expected non-null String.');
124128
final Object? arg_value = (args[1] as Object?);
125129
assert(arg_value != null,
126-
'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null Object.');
130+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null, expected non-null Object.');
127131
api.setValue(arg_key!, arg_value!);
128132
return <Object?>[];
129133
});
130134
}
131135
}
132136
{
133137
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
134-
'dev.flutter.pigeon.UserDefaultsApi.getAll', codec,
138+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll',
139+
codec,
135140
binaryMessenger: binaryMessenger);
136141
if (api == null) {
137142
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -141,11 +146,11 @@ abstract class TestUserDefaultsApi {
141146
.setMockDecodedMessageHandler<Object?>(channel,
142147
(Object? message) async {
143148
assert(message != null,
144-
'Argument for dev.flutter.pigeon.UserDefaultsApi.getAll was null.');
149+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll was null.');
145150
final List<Object?> args = (message as List<Object?>?)!;
146151
final String? arg_prefix = (args[0] as String?);
147152
assert(arg_prefix != null,
148-
'Argument for dev.flutter.pigeon.UserDefaultsApi.getAll was null, expected non-null String.');
153+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll was null, expected non-null String.');
149154
final List<String?>? arg_allowList =
150155
(args[1] as List<Object?>?)?.cast<String?>();
151156
final Map<String?, Object?> output =
@@ -156,7 +161,8 @@ abstract class TestUserDefaultsApi {
156161
}
157162
{
158163
final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
159-
'dev.flutter.pigeon.UserDefaultsApi.clear', codec,
164+
'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear',
165+
codec,
160166
binaryMessenger: binaryMessenger);
161167
if (api == null) {
162168
_testBinaryMessengerBinding!.defaultBinaryMessenger
@@ -166,11 +172,11 @@ abstract class TestUserDefaultsApi {
166172
.setMockDecodedMessageHandler<Object?>(channel,
167173
(Object? message) async {
168174
assert(message != null,
169-
'Argument for dev.flutter.pigeon.UserDefaultsApi.clear was null.');
175+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear was null.');
170176
final List<Object?> args = (message as List<Object?>?)!;
171177
final String? arg_prefix = (args[0] as String?);
172178
assert(arg_prefix != null,
173-
'Argument for dev.flutter.pigeon.UserDefaultsApi.clear was null, expected non-null String.');
179+
'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear was null, expected non-null String.');
174180
final List<String?>? arg_allowList =
175181
(args[1] as List<Object?>?)?.cast<String?>();
176182
final bool output = api.clear(arg_prefix!, arg_allowList);

0 commit comments

Comments
 (0)