diff --git a/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md b/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md index 17b024e410..521b2c04be 100644 --- a/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_foundation/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.3.3 + +* Updates Pigeon-generated code to avoid conflicts with `shared_preferences_ios`. + ## 2.3.2 * Updates to the latest version of `pigeon`. diff --git a/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift b/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift index 2e2616073c..cb247f9c8c 100644 --- a/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift +++ b/packages/shared_preferences/shared_preferences_foundation/darwin/Classes/messages.g.swift @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.6), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -53,7 +53,8 @@ class UserDefaultsApiSetup { /// Sets up an instance of `UserDefaultsApi` to handle messages through the `binaryMessenger`. static func setUp(binaryMessenger: FlutterBinaryMessenger, api: UserDefaultsApi?) { let removeChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.remove", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove", + binaryMessenger: binaryMessenger) if let api = api { removeChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -69,7 +70,8 @@ class UserDefaultsApiSetup { removeChannel.setMessageHandler(nil) } let setBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.setBool", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool", + binaryMessenger: binaryMessenger) if let api = api { setBoolChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -86,7 +88,8 @@ class UserDefaultsApiSetup { setBoolChannel.setMessageHandler(nil) } let setDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.setDouble", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble", + binaryMessenger: binaryMessenger) if let api = api { setDoubleChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -103,7 +106,8 @@ class UserDefaultsApiSetup { setDoubleChannel.setMessageHandler(nil) } let setValueChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.setValue", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue", + binaryMessenger: binaryMessenger) if let api = api { setValueChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -120,7 +124,8 @@ class UserDefaultsApiSetup { setValueChannel.setMessageHandler(nil) } let getAllChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.getAll", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll", + binaryMessenger: binaryMessenger) if let api = api { getAllChannel.setMessageHandler { message, reply in let args = message as! [Any?] @@ -137,7 +142,8 @@ class UserDefaultsApiSetup { getAllChannel.setMessageHandler(nil) } let clearChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.UserDefaultsApi.clear", binaryMessenger: binaryMessenger) + name: "dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear", + binaryMessenger: binaryMessenger) if let api = api { clearChannel.setMessageHandler { message, reply in let args = message as! [Any?] diff --git a/packages/shared_preferences/shared_preferences_foundation/lib/messages.g.dart b/packages/shared_preferences/shared_preferences_foundation/lib/messages.g.dart index 70b23362bb..132d92ac22 100644 --- a/packages/shared_preferences/shared_preferences_foundation/lib/messages.g.dart +++ b/packages/shared_preferences/shared_preferences_foundation/lib/messages.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.6), do not edit directly. // See also: https://pub.dev/packages/pigeon // 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 @@ -23,7 +23,8 @@ class UserDefaultsApi { Future remove(String arg_key) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.remove', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_key]) as List?; @@ -45,7 +46,8 @@ class UserDefaultsApi { Future setBool(String arg_key, bool arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setBool', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_key, arg_value]) as List?; @@ -67,7 +69,8 @@ class UserDefaultsApi { Future setDouble(String arg_key, double arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_key, arg_value]) as List?; @@ -89,7 +92,8 @@ class UserDefaultsApi { Future setValue(String arg_key, Object arg_value) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setValue', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel.send([arg_key, arg_value]) as List?; @@ -112,7 +116,8 @@ class UserDefaultsApi { Future> getAll( String arg_prefix, List? arg_allowList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.getAll', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel .send([arg_prefix, arg_allowList]) as List?; @@ -139,7 +144,8 @@ class UserDefaultsApi { Future clear(String arg_prefix, List? arg_allowList) async { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.clear', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear', + codec, binaryMessenger: _binaryMessenger); final List? replyList = await channel .send([arg_prefix, arg_allowList]) as List?; diff --git a/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml b/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml index 2962614d8f..b27d979041 100644 --- a/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_foundation/pubspec.yaml @@ -2,7 +2,7 @@ name: shared_preferences_foundation description: iOS and macOS implementation of the shared_preferences plugin. repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_foundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.3.2 +version: 2.3.3 environment: sdk: ">=2.18.0 <4.0.0" @@ -29,4 +29,4 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - pigeon: ^10.1.3 + pigeon: ^10.1.6 diff --git a/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart b/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart index 7d7386f8e3..39f8b4fede 100644 --- a/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart +++ b/packages/shared_preferences/shared_preferences_foundation/test/test_api.g.dart @@ -1,7 +1,7 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Autogenerated from Pigeon (v10.1.3), do not edit directly. +// Autogenerated from Pigeon (v10.1.6), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import // ignore_for_file: avoid_relative_lib_imports @@ -34,7 +34,8 @@ abstract class TestUserDefaultsApi { {BinaryMessenger? binaryMessenger}) { { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.remove', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -44,11 +45,11 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove was null.'); final List args = (message as List?)!; final String? arg_key = (args[0] as String?); assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.remove was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.remove was null, expected non-null String.'); api.remove(arg_key!); return []; }); @@ -56,7 +57,8 @@ abstract class TestUserDefaultsApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setBool', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -66,14 +68,14 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null.'); final List args = (message as List?)!; final String? arg_key = (args[0] as String?); assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null, expected non-null String.'); final bool? arg_value = (args[1] as bool?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setBool was null, expected non-null bool.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setBool was null, expected non-null bool.'); api.setBool(arg_key!, arg_value!); return []; }); @@ -81,7 +83,8 @@ abstract class TestUserDefaultsApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setDouble', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -91,14 +94,14 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null.'); final List args = (message as List?)!; final String? arg_key = (args[0] as String?); assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null, expected non-null String.'); final double? arg_value = (args[1] as double?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setDouble was null, expected non-null double.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setDouble was null, expected non-null double.'); api.setDouble(arg_key!, arg_value!); return []; }); @@ -106,7 +109,8 @@ abstract class TestUserDefaultsApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.setValue', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -116,14 +120,14 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null.'); final List args = (message as List?)!; final String? arg_key = (args[0] as String?); assert(arg_key != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null, expected non-null String.'); final Object? arg_value = (args[1] as Object?); assert(arg_value != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.setValue was null, expected non-null Object.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.setValue was null, expected non-null Object.'); api.setValue(arg_key!, arg_value!); return []; }); @@ -131,7 +135,8 @@ abstract class TestUserDefaultsApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.getAll', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -141,11 +146,11 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.getAll was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll was null.'); final List args = (message as List?)!; final String? arg_prefix = (args[0] as String?); assert(arg_prefix != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.getAll was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.getAll was null, expected non-null String.'); final List? arg_allowList = (args[1] as List?)?.cast(); final Map output = @@ -156,7 +161,8 @@ abstract class TestUserDefaultsApi { } { final BasicMessageChannel channel = BasicMessageChannel( - 'dev.flutter.pigeon.UserDefaultsApi.clear', codec, + 'dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear', + codec, binaryMessenger: binaryMessenger); if (api == null) { _testBinaryMessengerBinding!.defaultBinaryMessenger @@ -166,11 +172,11 @@ abstract class TestUserDefaultsApi { .setMockDecodedMessageHandler(channel, (Object? message) async { assert(message != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.clear was null.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear was null.'); final List args = (message as List?)!; final String? arg_prefix = (args[0] as String?); assert(arg_prefix != null, - 'Argument for dev.flutter.pigeon.UserDefaultsApi.clear was null, expected non-null String.'); + 'Argument for dev.flutter.pigeon.shared_preferences_foundation.UserDefaultsApi.clear was null, expected non-null String.'); final List? arg_allowList = (args[1] as List?)?.cast(); final bool output = api.clear(arg_prefix!, arg_allowList);