[video_player and in_app_purchase] Fix multiple-definition error caused by applying multiple plugins (#885)

gin7773 · web-flow · commit 5f5d42eb3ccf · 2025-08-13T10:37:59.000+08:00
diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 0.1.3
 
 * Update code format.
+* Fix multiple-definition error caused by applying multiple plugins at once. (Issue #883)
 
 ## 0.1.2
 
diff --git a/packages/in_app_purchase/README.md b/packages/in_app_purchase/README.md
@@ -35,7 +35,7 @@ This package is not an _endorsed_ implementation of `in_app_purchase`. Therefore
 ```yaml
 dependencies:
   in_app_purchase: ^3.2.1
-  in_app_purchase_tizen: ^0.1.2
+  in_app_purchase_tizen: ^0.1.3
 ```
 
 Then you can import `in_app_purchase` and `in_app_purchase_tizen` in your Dart code:
diff --git a/packages/in_app_purchase/lib/src/messages.g.dart b/packages/in_app_purchase/lib/src/messages.g.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.7.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), 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, no_leading_underscores_for_local_identifiers
 
diff --git a/packages/in_app_purchase/pigeons/messages.dart b/packages/in_app_purchase/pigeons/messages.dart
@@ -7,6 +7,7 @@ import 'package:pigeon/pigeon.dart';
 @ConfigurePigeon(
   PigeonOptions(
     dartOut: 'lib/src/messages.g.dart',
+    cppOptions: CppOptions(namespace: 'in_app_purchase_tizen'),
     cppHeaderOut: 'tizen/src/messages.h',
     cppSourceOut: 'tizen/src/messages.cc',
   ),
diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml
@@ -2,7 +2,7 @@ name: in_app_purchase_tizen
 description: Tizen implementation of the in_app_purchase plugin for Samsung Smart TV.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/in_app_purchase
-version: 0.1.2
+version: 0.1.3
 
 environment:
   sdk: ">=3.1.0 <4.0.0"
diff --git a/packages/in_app_purchase/tizen/src/billing_manager.cc b/packages/in_app_purchase/tizen/src/billing_manager.cc
@@ -17,6 +17,8 @@
 #include "messages.h"
 #include "rapidjson/document.h"
 
+namespace in_app_purchase_tizen {
+
 static std::string ServerTypeToString(billing_server_type server_type) {
   switch (server_type) {
     case SERVERTYPE_OPERATE:
@@ -506,3 +508,5 @@ void BillingManager::OnVerify(const char *detail_result, void *user_data) {
 void BillingManager::Dispose() {
   LOG_INFO("[BillingManager] Dispose billing.");
 }
+
+}  // namespace in_app_purchase_tizen
diff --git a/packages/in_app_purchase/tizen/src/billing_manager.h b/packages/in_app_purchase/tizen/src/billing_manager.h
@@ -19,6 +19,8 @@
 
 #define SSO_API_MAX_STRING_LEN 128
 
+namespace in_app_purchase_tizen {
+
 typedef struct sso_login_info {
   char login_id[SSO_API_MAX_STRING_LEN];
   char login_pwd[SSO_API_MAX_STRING_LEN];
@@ -223,4 +225,6 @@ class BillingManager {
   std::mutex mutex_;
 };
 
+}  // namespace in_app_purchase_tizen
+
 #endif  // FLUTTER_PLUGIN_BILLING_MANAGER_H
diff --git a/packages/in_app_purchase/tizen/src/in_app_purchase_tizen_plugin.cc b/packages/in_app_purchase/tizen/src/in_app_purchase_tizen_plugin.cc
@@ -17,7 +17,7 @@
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
 
-namespace {
+namespace in_app_purchase_tizen {
 
 class InAppPurchaseTizenPlugin : public flutter::Plugin,
                                  public InAppPurchaseApi {
@@ -175,11 +175,11 @@ ErrorOr<std::string> InAppPurchaseTizenPlugin::GetCountryCode() {
   return billing_->GetCountryCode();
 }
 
-}  // namespace
+}  // namespace in_app_purchase_tizen
 
 void InAppPurchaseTizenPluginRegisterWithRegistrar(
     FlutterDesktopPluginRegistrarRef registrar) {
-  InAppPurchaseTizenPlugin::RegisterWithRegistrar(
+  in_app_purchase_tizen::InAppPurchaseTizenPlugin::RegisterWithRegistrar(
       flutter::PluginRegistrarManager::GetInstance()
           ->GetRegistrar<flutter::PluginRegistrar>(registrar));
 }
diff --git a/packages/in_app_purchase/tizen/src/messages.cc b/packages/in_app_purchase/tizen/src/messages.cc
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.7.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #undef _HAS_EXCEPTIONS
@@ -14,6 +14,7 @@
 #include <optional>
 #include <string>
 
+namespace in_app_purchase_tizen {
 using flutter::BasicMessageChannel;
 using flutter::CustomEncodableValue;
 using flutter::EncodableList;
@@ -1058,3 +1059,5 @@ EncodableValue InAppPurchaseApi::WrapError(const FlutterError& error) {
                                       EncodableValue(error.message()),
                                       error.details()});
 }
+
+}  // namespace in_app_purchase_tizen
diff --git a/packages/in_app_purchase/tizen/src/messages.h b/packages/in_app_purchase/tizen/src/messages.h
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.7.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #ifndef PIGEON_MESSAGES_H_
@@ -12,6 +12,8 @@
 #include <optional>
 #include <string>
 
+namespace in_app_purchase_tizen {
+
 // Generated class from Pigeon.
 
 class FlutterError {
@@ -545,4 +547,5 @@ class InAppPurchaseApi {
  protected:
   InAppPurchaseApi() = default;
 };
+}  // namespace in_app_purchase_tizen
 #endif  // PIGEON_MESSAGES_H_
diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.5.7
+
+* Fix multiple-definition error caused by applying multiple plugins at once. (Issue #883)
+
 ## 2.5.6
 
 * Update code format.
diff --git a/packages/video_player/README.md b/packages/video_player/README.md
@@ -15,7 +15,7 @@ This package is not an _endorsed_ implementation of `video_player`. Therefore, y
 ```yaml
 dependencies:
   video_player: ^2.9.2
-  video_player_tizen: ^2.5.6
+  video_player_tizen: ^2.5.7
 ```
 
 Then you can import `video_player` in your Dart code:
diff --git a/packages/video_player/lib/src/messages.g.dart b/packages/video_player/lib/src/messages.g.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.3.0), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), 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, no_leading_underscores_for_local_identifiers
 
@@ -16,29 +16,41 @@ PlatformException _createConnectionError(String channelName) {
 }
 
 class TextureMessage {
-  TextureMessage({required this.textureId});
+  TextureMessage({
+    required this.textureId,
+  });
 
   int textureId;
 
   Object encode() {
-    return <Object?>[textureId];
+    return <Object?>[
+      textureId,
+    ];
   }
 
   static TextureMessage decode(Object result) {
     result as List<Object?>;
-    return TextureMessage(textureId: result[0]! as int);
+    return TextureMessage(
+      textureId: result[0]! as int,
+    );
   }
 }
 
 class LoopingMessage {
-  LoopingMessage({required this.textureId, required this.isLooping});
+  LoopingMessage({
+    required this.textureId,
+    required this.isLooping,
+  });
 
   int textureId;
 
   bool isLooping;
 
   Object encode() {
-    return <Object?>[textureId, isLooping];
+    return <Object?>[
+      textureId,
+      isLooping,
+    ];
   }
 
   static LoopingMessage decode(Object result) {
@@ -51,14 +63,20 @@ class LoopingMessage {
 }
 
 class VolumeMessage {
-  VolumeMessage({required this.textureId, required this.volume});
+  VolumeMessage({
+    required this.textureId,
+    required this.volume,
+  });
 
   int textureId;
 
   double volume;
 
   Object encode() {
-    return <Object?>[textureId, volume];
+    return <Object?>[
+      textureId,
+      volume,
+    ];
   }
 
   static VolumeMessage decode(Object result) {
@@ -71,14 +89,20 @@ class VolumeMessage {
 }
 
 class PlaybackSpeedMessage {
-  PlaybackSpeedMessage({required this.textureId, required this.speed});
+  PlaybackSpeedMessage({
+    required this.textureId,
+    required this.speed,
+  });
 
   int textureId;
 
   double speed;
 
   Object encode() {
-    return <Object?>[textureId, speed];
+    return <Object?>[
+      textureId,
+      speed,
+    ];
   }
 
   static PlaybackSpeedMessage decode(Object result) {
@@ -91,14 +115,20 @@ class PlaybackSpeedMessage {
 }
 
 class PositionMessage {
-  PositionMessage({required this.textureId, required this.position});
+  PositionMessage({
+    required this.textureId,
+    required this.position,
+  });
 
   int textureId;
 
   int position;
 
   Object encode() {
-    return <Object?>[textureId, position];
+    return <Object?>[
+      textureId,
+      position,
+    ];
   }
 
   static PositionMessage decode(Object result) {
@@ -130,7 +160,13 @@ class CreateMessage {
   Map<String?, String?> httpHeaders;
 
   Object encode() {
-    return <Object?>[asset, uri, packageName, formatHint, httpHeaders];
+    return <Object?>[
+      asset,
+      uri,
+      packageName,
+      formatHint,
+      httpHeaders,
+    ];
   }
 
   static CreateMessage decode(Object result) {
@@ -147,17 +183,23 @@ class CreateMessage {
 }
 
 class MixWithOthersMessage {
-  MixWithOthersMessage({required this.mixWithOthers});
+  MixWithOthersMessage({
+    required this.mixWithOthers,
+  });
 
   bool mixWithOthers;
 
   Object encode() {
-    return <Object?>[mixWithOthers];
+    return <Object?>[
+      mixWithOthers,
+    ];
   }
 
   static MixWithOthersMessage decode(Object result) {
     result as List<Object?>;
-    return MixWithOthersMessage(mixWithOthers: result[0]! as bool);
+    return MixWithOthersMessage(
+      mixWithOthers: result[0]! as bool,
+    );
   }
 }
 
@@ -221,10 +263,9 @@ class TizenVideoPlayerApi {
   /// Constructor for [TizenVideoPlayerApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  TizenVideoPlayerApi({
-    BinaryMessenger? binaryMessenger,
-    String messageChannelSuffix = '',
-  })  : pigeonVar_binaryMessenger = binaryMessenger,
+  TizenVideoPlayerApi(
+      {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+      : pigeonVar_binaryMessenger = binaryMessenger,
         pigeonVar_messageChannelSuffix =
             messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
   final BinaryMessenger? pigeonVar_binaryMessenger;
diff --git a/packages/video_player/pigeons/messages.dart b/packages/video_player/pigeons/messages.dart
@@ -7,6 +7,7 @@ import 'package:pigeon/pigeon.dart';
 @ConfigurePigeon(
   PigeonOptions(
     dartOut: 'lib/src/messages.g.dart',
+    cppOptions: CppOptions(namespace: 'video_player_tizen'),
     cppHeaderOut: 'tizen/src/messages.h',
     cppSourceOut: 'tizen/src/messages.cc',
   ),
diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml
@@ -2,7 +2,7 @@ name: video_player_tizen
 description: Tizen implementation of the video_player plugin.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/video_player
-version: 2.5.6
+version: 2.5.7
 
 environment:
   sdk: ">=3.3.0 <4.0.0"
diff --git a/packages/video_player/tizen/src/messages.cc b/packages/video_player/tizen/src/messages.cc
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.3.0), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #undef _HAS_EXCEPTIONS
@@ -14,6 +14,7 @@
 #include <optional>
 #include <string>
 
+namespace video_player_tizen {
 using flutter::BasicMessageChannel;
 using flutter::CustomEncodableValue;
 using flutter::EncodableList;
@@ -813,3 +814,5 @@ EncodableValue TizenVideoPlayerApi::WrapError(const FlutterError& error) {
                                       EncodableValue(error.message()),
                                       error.details()});
 }
+
+}  // namespace video_player_tizen
diff --git a/packages/video_player/tizen/src/messages.h b/packages/video_player/tizen/src/messages.h
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v22.3.0), do not edit directly.
+// Autogenerated from Pigeon (v22.7.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #ifndef PIGEON_MESSAGES_H_
@@ -12,6 +12,8 @@
 #include <optional>
 #include <string>
 
+namespace video_player_tizen {
+
 // Generated class from Pigeon.
 
 class FlutterError {
@@ -270,4 +272,5 @@ class TizenVideoPlayerApi {
  protected:
   TizenVideoPlayerApi() = default;
 };
+}  // namespace video_player_tizen
 #endif  // PIGEON_MESSAGES_H_
diff --git a/packages/video_player/tizen/src/video_player.cc b/packages/video_player/tizen/src/video_player.cc
diff --git a/packages/video_player/tizen/src/video_player.h b/packages/video_player/tizen/src/video_player.h
diff --git a/packages/video_player/tizen/src/video_player_tizen_plugin.cc b/packages/video_player/tizen/src/video_player_tizen_plugin.cc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Autogenerated from Pigeon (v22.7.2), do not edit directly.`
	`1`	`+// Autogenerated from Pigeon (v22.7.4), do not edit directly.`
`2`	`2`	`// See also: https://pub.dev/packages/pigeon`
`3`	`3`	`// 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`
`4`	`4`