Skip to content

Commit f4f316f

Browse files
authored
fix: rename autogenerated flutter error for pigeon generated code (#484)
This prevents the `FlutterError` type clashing when multiple libraries use the same name
1 parent 96a5a51 commit f4f316f

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

FlutterMockzilla/mockzilla_android/android/src/main/kotlin/com/apadmi/mockzilla/Messages.g.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff 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.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

@@ -18,7 +18,7 @@ private fun wrapResult(result: Any?): List<Any?> {
1818
}
1919

2020
private fun wrapError(exception: Throwable): List<Any?> {
21-
return if (exception is FlutterError) {
21+
return if (exception is MockzillaFlutterError) {
2222
listOf(
2323
exception.code,
2424
exception.message,
@@ -33,16 +33,16 @@ private fun wrapError(exception: Throwable): List<Any?> {
3333
}
3434
}
3535

36-
private fun createConnectionError(channelName: String): FlutterError {
37-
return FlutterError("channel-error", "Unable to establish connection on channel: '$channelName'.", "")}
36+
private fun createConnectionError(channelName: String): MockzillaFlutterError {
37+
return MockzillaFlutterError("channel-error", "Unable to establish connection on channel: '$channelName'.", "")}
3838

3939
/**
4040
* Error class for passing custom error details to Flutter via a thrown PlatformException.
4141
* @property code The error code.
4242
* @property message The error message.
4343
* @property details The error details. Must be a datatype supported by the api codec.
4444
*/
45-
class FlutterError (
45+
class MockzillaFlutterError (
4646
val code: String,
4747
override val message: String? = null,
4848
val details: Any? = null
@@ -424,9 +424,9 @@ class MockzillaFlutterApi(private val binaryMessenger: BinaryMessenger, private
424424
channel.send(listOf(requestArg, keyArg)) {
425425
if (it is List<*>) {
426426
if (it.size > 1) {
427-
callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
427+
callback(Result.failure(MockzillaFlutterError(it[0] as String, it[1] as String, it[2] as String?)))
428428
} else if (it[0] == null) {
429-
callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
429+
callback(Result.failure(MockzillaFlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
430430
} else {
431431
val output = it[0] as Boolean
432432
callback(Result.success(output))
@@ -444,9 +444,9 @@ class MockzillaFlutterApi(private val binaryMessenger: BinaryMessenger, private
444444
channel.send(listOf(requestArg, keyArg)) {
445445
if (it is List<*>) {
446446
if (it.size > 1) {
447-
callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
447+
callback(Result.failure(MockzillaFlutterError(it[0] as String, it[1] as String, it[2] as String?)))
448448
} else if (it[0] == null) {
449-
callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
449+
callback(Result.failure(MockzillaFlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
450450
} else {
451451
val output = it[0] as BridgeMockzillaHttpResponse
452452
callback(Result.success(output))
@@ -464,9 +464,9 @@ class MockzillaFlutterApi(private val binaryMessenger: BinaryMessenger, private
464464
channel.send(listOf(requestArg, keyArg)) {
465465
if (it is List<*>) {
466466
if (it.size > 1) {
467-
callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
467+
callback(Result.failure(MockzillaFlutterError(it[0] as String, it[1] as String, it[2] as String?)))
468468
} else if (it[0] == null) {
469-
callback(Result.failure(FlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
469+
callback(Result.failure(MockzillaFlutterError("null-error", "Flutter api returned null value for non-null return value.", "")))
470470
} else {
471471
val output = it[0] as BridgeMockzillaHttpResponse
472472
callback(Result.success(output))
@@ -484,7 +484,7 @@ class MockzillaFlutterApi(private val binaryMessenger: BinaryMessenger, private
484484
channel.send(listOf(logLevelArg, messageArg, tagArg, exceptionArg)) {
485485
if (it is List<*>) {
486486
if (it.size > 1) {
487-
callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
487+
callback(Result.failure(MockzillaFlutterError(it[0] as String, it[1] as String, it[2] as String?)))
488488
} else {
489489
callback(Result.success(Unit))
490490
}

FlutterMockzilla/mockzilla_android/lib/src/messages.g.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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.
22
// See also: https://pub.dev/packages/pigeon
33
// 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
44

FlutterMockzilla/mockzilla_android/pigeons/messages.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import 'package:pigeon/pigeon.dart';
55
dartOut: "lib/src/messages.g.dart",
66
dartOptions: DartOptions(),
77
kotlinOut: "android/src/main/kotlin/com/apadmi/mockzilla/Messages.g.kt",
8-
kotlinOptions: KotlinOptions(),
8+
kotlinOptions: KotlinOptions(
9+
errorClassName: "MockzillaFlutterError",
10+
),
911
),
1012
)
1113
enum BridgeHttpMethod {

FlutterMockzilla/mockzilla_ui_mobile/android/src/main/kotlin/com/apadmi/mockzilla/mobile/ui/Messages.g.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private fun wrapResult(result: Any?): List<Any?> {
1919
}
2020

2121
private fun wrapError(exception: Throwable): List<Any?> {
22-
return if (exception is MockzillaMobileUiErrorBridge) {
22+
return if (exception is MockzillaMobileUiFlutterError) {
2323
listOf(
2424
exception.code,
2525
exception.message,
@@ -40,7 +40,7 @@ private fun wrapError(exception: Throwable): List<Any?> {
4040
* @property message The error message.
4141
* @property details The error details. Must be a datatype supported by the api codec.
4242
*/
43-
class MockzillaMobileUiErrorBridge (
43+
class MockzillaMobileUiFlutterError (
4444
val code: String,
4545
override val message: String? = null,
4646
val details: Any? = null

FlutterMockzilla/mockzilla_ui_mobile/ios/mockzilla_ui_mobile/Sources/mockzilla_ui_mobile/MockzillaUiMobile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import Foundation
66
import Flutter
7-
import mockzilla_mobile_ui
7+
import mockzillamobileui
88
import SwiftMockzillaMobileUi
99

1010
class MockzillaUiMobile: Thread, MockzillaUiMobileHostApi {

FlutterMockzilla/mockzilla_ui_mobile/ios/mockzilla_ui_mobile/Sources/mockzilla_ui_mobile/MockzillaUiMobilePlugin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Flutter
22
import UIKit
3-
import mockzilla_mobile_ui
3+
import mockzillamobileui
44
import SwiftMockzillaMobileUi
55

66
public class MockzillaUiMobilePlugin: NSObject, FlutterPlugin {

FlutterMockzilla/mockzilla_ui_mobile/lib/src/messages.g.dart

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ PlatformException _createConnectionError(String channelName) {
1515
);
1616
}
1717

18+
1819
class _PigeonCodec extends StandardMessageCodec {
1920
const _PigeonCodec();
2021
@override
@@ -40,22 +41,18 @@ class MockzillaUiMobileHostApi {
4041
/// Constructor for [MockzillaUiMobileHostApi]. The [binaryMessenger] named argument is
4142
/// available for dependency injection. If it is left null, the default
4243
/// BinaryMessenger will be used which routes to the host platform.
43-
MockzillaUiMobileHostApi(
44-
{BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
44+
MockzillaUiMobileHostApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
4545
: pigeonVar_binaryMessenger = binaryMessenger,
46-
pigeonVar_messageChannelSuffix =
47-
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
46+
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
4847
final BinaryMessenger? pigeonVar_binaryMessenger;
4948

5049
static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
5150

5251
final String pigeonVar_messageChannelSuffix;
5352

5453
Future<void> launchManagementUi() async {
55-
final String pigeonVar_channelName =
56-
'dev.flutter.pigeon.mockzilla_ui_mobile.MockzillaUiMobileHostApi.launchManagementUi$pigeonVar_messageChannelSuffix';
57-
final BasicMessageChannel<Object?> pigeonVar_channel =
58-
BasicMessageChannel<Object?>(
54+
final String pigeonVar_channelName = 'dev.flutter.pigeon.mockzilla_ui_mobile.MockzillaUiMobileHostApi.launchManagementUi$pigeonVar_messageChannelSuffix';
55+
final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
5956
pigeonVar_channelName,
6057
pigeonChannelCodec,
6158
binaryMessenger: pigeonVar_binaryMessenger,

FlutterMockzilla/mockzilla_ui_mobile/pigeons/messages.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:pigeon/pigeon.dart';
1111
"android/src/main/kotlin/com/apadmi/mockzilla/mobile/ui/Messages.g.kt",
1212
kotlinOptions: KotlinOptions(
1313
package: "com.apadmi.mockzilla.mobile.ui",
14-
errorClassName: "MockzillaMobileUiErrorBridge"),
14+
errorClassName: "MockzillaMobileUiFlutterError"),
1515
),
1616
)
1717
@HostApi()

0 commit comments

Comments
 (0)