diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 626aa205c37..a3b5327b802 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 26.1.5 + +* [kotlin] Fixes a "bridge method" warning when implementing an event stream handler. + ## 26.1.4 * [swift][kotlin] Fixes crash that occurs when an object that is removed from the instance manager diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt index d7ec9b6255c..e524f5d5b0c 100644 --- a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt +++ b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt @@ -186,4 +186,8 @@ abstract class StreamEventsStreamHandler : .setStreamHandler(internalStreamHandler) } } + // Implement methods from EventChannelMessagesPigeonEventChannelWrapper + override fun onListen(p0: Any?, sink: PigeonEventSink) {} + + override fun onCancel(p0: Any?) {} } diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index cb8aa5435db..e58ce2d83a0 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '26.1.4'; +const String pigeonVersion = '26.1.5'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart index 479fdaddcc4..7df50a97599 100644 --- a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart +++ b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart @@ -1234,6 +1234,10 @@ if (wrapped == null) { EventChannel(messenger, channelName, ${generatorOptions.fileSpecificClassNameComponent}$_pigeonMethodChannelCodec).setStreamHandler(internalStreamHandler) } } + // Implement methods from ${generatorOptions.fileSpecificClassNameComponent}PigeonEventChannelWrapper + override fun onListen(p0: Any?, sink: PigeonEventSink<${_kotlinTypeForDartType(func.returnType)}>) {} + + override fun onCancel(p0: Any?) {} } '''); } diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt index 7e835701a23..a3f79976d79 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt @@ -575,6 +575,10 @@ abstract class StreamIntsStreamHandler : EventChannelTestsPigeonEventChannelWrap .setStreamHandler(internalStreamHandler) } } + // Implement methods from EventChannelTestsPigeonEventChannelWrapper + override fun onListen(p0: Any?, sink: PigeonEventSink) {} + + override fun onCancel(p0: Any?) {} } abstract class StreamEventsStreamHandler : @@ -595,6 +599,10 @@ abstract class StreamEventsStreamHandler : .setStreamHandler(internalStreamHandler) } } + // Implement methods from EventChannelTestsPigeonEventChannelWrapper + override fun onListen(p0: Any?, sink: PigeonEventSink) {} + + override fun onCancel(p0: Any?) {} } abstract class StreamConsistentNumbersStreamHandler : @@ -615,4 +623,8 @@ abstract class StreamConsistentNumbersStreamHandler : .setStreamHandler(internalStreamHandler) } } + // Implement methods from EventChannelTestsPigeonEventChannelWrapper + override fun onListen(p0: Any?, sink: PigeonEventSink) {} + + override fun onCancel(p0: Any?) {} } diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index a6f1bd0d92a..b47ab59157a 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 26.1.4 # This must match the version in lib/src/generator_tools.dart +version: 26.1.5 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.9.0