Merge branch 'main' into camera-windows-example-deprecation

stuartmorgan-g · web-flow · commit 4fb1a516740b · 2025-11-07T09:37:12.000-05:00
diff --git a/.ci.yaml b/.ci.yaml
@@ -95,7 +95,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -108,7 +108,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14|Mac-15.5
+      os: Mac-15.5|Mac-15.7
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
diff --git a/packages/go_router/test/extra_codec_test.dart b/packages/go_router/test/extra_codec_test.dart
@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
+import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
 
 import 'test_helpers.dart';
 
@@ -52,33 +53,40 @@ void main() {
     expect(find.text(initialString), findsOneWidget);
   });
 
-  testWidgets('Restores state correctly', (WidgetTester tester) async {
-    const String initialString = 'some string';
-    const String empty = 'empty';
-    final List<RouteBase> routes = <RouteBase>[
-      GoRoute(
-        path: '/',
-        builder: (_, GoRouterState state) {
-          return Text((state.extra as ComplexData?)?.data ?? empty);
-        },
-      ),
-    ];
+  testWidgets(
+    'Restores state correctly',
+    (WidgetTester tester) async {
+      const String initialString = 'some string';
+      const String empty = 'empty';
+      final List<RouteBase> routes = <RouteBase>[
+        GoRoute(
+          path: '/',
+          builder: (_, GoRouterState state) {
+            return Text((state.extra as ComplexData?)?.data ?? empty);
+          },
+        ),
+      ];
 
-    await createRouter(
-      routes,
-      tester,
-      initialExtra: ComplexData(initialString),
-      restorationScopeId: 'test',
-      extraCodec: ComplexDataCodec(),
-    );
-    expect(find.text(initialString), findsOneWidget);
+      await createRouter(
+        routes,
+        tester,
+        initialExtra: ComplexData(initialString),
+        restorationScopeId: 'test',
+        extraCodec: ComplexDataCodec(),
+      );
+      expect(find.text(initialString), findsOneWidget);
 
-    await tester.restartAndRestore();
-    addTearDown(tester.binding.restorationManager.dispose);
+      await tester.restartAndRestore();
 
-    await tester.pumpAndSettle();
-    expect(find.text(initialString), findsOneWidget);
-  });
+      await tester.pumpAndSettle();
+      expect(find.text(initialString), findsOneWidget);
+    },
+    // TODO(hgraceb): Remove when minimum flutter version includes
+    // https://github.com/flutter/flutter/pull/176519
+    experimentalLeakTesting: LeakTesting.settings.withIgnored(
+      classes: const <String>['TestRestorationManager', 'RestorationBucket'],
+    ),
+  );
 }
 
 class ComplexData {
diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 26.0.5
+
+* [kotlin] Serialize custom enums as `Long` instead of `Int` to avoid `ClassCastException` on decoding.
+
 ## 26.0.4
 
 * Adds compatibility with `analyzer` 8.x.
diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt
@@ -142,7 +142,7 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
     when (value) {
       is Code -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is MessageData -> {
         stream.write(130)
diff --git 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.0.4';
+const String pigeonVersion = '26.0.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
@@ -475,7 +475,9 @@ class KotlinGenerator extends StructuredGenerator<InternalKotlinOptions> {
 
     void writeEncodeLogic(EnumeratedType customType) {
       final String encodeString =
-          customType.type == CustomTypes.customClass ? 'toList()' : 'raw';
+          customType.type == CustomTypes.customClass
+              ? 'toList()'
+              : 'raw.toLong()';
       final String valueString =
           customType.enumeration < maximumCodecFieldKey
               ? 'value.$encodeString'
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt
@@ -704,11 +704,11 @@ private open class CoreTestsPigeonCodec : StandardMessageCodec() {
     when (value) {
       is AnEnum -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is AnotherEnum -> {
         stream.write(130)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is UnusedClass -> {
         stream.write(131)
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
@@ -477,11 +477,11 @@ private open class EventChannelTestsPigeonCodec : StandardMessageCodec() {
     when (value) {
       is EventEnum -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is AnotherEventEnum -> {
         stream.write(130)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       is EventAllNullableTypes -> {
         stream.write(131)
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt
@@ -560,7 +560,7 @@ private open class ProxyApiTestsPigeonCodec : StandardMessageCodec() {
     when (value) {
       is ProxyApiTestEnum -> {
         stream.write(129)
-        writeValue(stream, value.raw)
+        writeValue(stream, value.raw.toLong())
       }
       else -> super.writeValue(stream, value)
     }
diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt b/packages/pigeon/platform_tests/test_plugin/android/src/test/kotlin/com/example/test_plugin/AllDatatypesTest.kt
@@ -46,33 +46,52 @@ internal class AllDatatypesTest {
   }
 
   @Test
-  fun testHasValues() {
+  fun testRoundtripNullValues() {
+    val everything = AllNullableTypes()
+    val codec = FlutterIntegrationCoreApi.codec
+    val encoded = codec.encodeMessage(everything)
+    encoded?.rewind()
+    val decoded = codec.decodeMessage(encoded)
+    assertEquals(everything, decoded)
+  }
+
+  fun getFullyPopulatedAllNullableTypes(): AllNullableTypes {
     val stringList = listOf("string", "another one")
-    val everything =
-        AllNullableTypes(
-            aNullableBool = false,
-            aNullableInt = 1234L,
-            aNullableDouble = 2.0,
-            aNullableString = "hello",
-            aNullableByteArray = byteArrayOf(1, 2, 3, 4),
-            aNullable4ByteArray = intArrayOf(1, 2, 3, 4),
-            aNullable8ByteArray = longArrayOf(1, 2, 3, 4),
-            aNullableFloatArray = doubleArrayOf(0.5, 0.25, 1.5, 1.25),
-            aNullableObject = 0,
-            list = listOf(1, 2, 3),
-            stringList = stringList,
-            boolList = listOf(true, false),
-            intList = listOf(1, 2),
-            doubleList = listOf(1.1, 2.2),
-            objectList = listOf(1, 2, 3),
-            listList = listOf(stringList, stringList.toList()),
-            mapList = listOf(mapOf("hello" to 1234), mapOf("hello" to 1234)),
-            map = mapOf("hello" to 1234),
-            stringMap = mapOf("hello" to "you"),
-            intMap = mapOf(1L to 0L),
-            objectMap = mapOf("hello" to 1234),
-            listMap = mapOf(1L to stringList),
-            mapMap = mapOf(1L to mapOf()))
+
+    return AllNullableTypes(
+        aNullableBool = false,
+        aNullableInt = 1234L,
+        aNullableDouble = 2.0,
+        aNullableString = "hello",
+        aNullableByteArray = byteArrayOf(1, 2, 3, 4),
+        aNullable4ByteArray = intArrayOf(1, 2, 3, 4),
+        aNullable8ByteArray = longArrayOf(1, 2, 3, 4),
+        aNullableFloatArray = doubleArrayOf(0.5, 0.25, 1.5, 1.25),
+        aNullableEnum = AnEnum.TWO,
+        anotherNullableEnum = AnotherEnum.JUST_IN_CASE,
+        aNullableObject = 0,
+        list = listOf(1, 2, 3),
+        stringList = stringList,
+        boolList = listOf(true, false),
+        enumList = listOf(AnEnum.ONE, AnEnum.TWO),
+        intList = listOf(1, 2),
+        doubleList = listOf(1.1, 2.2),
+        objectList = listOf(1, 2, 3),
+        listList = listOf(stringList, stringList.toList()),
+        mapList = listOf(mapOf("hello" to 1234), mapOf("hello" to 1234)),
+        map = mapOf("hello" to 1234),
+        stringMap = mapOf("hello" to "you"),
+        intMap = mapOf(1L to 0L),
+        objectMap = mapOf("hello" to 1234),
+        enumMap =
+            mapOf(AnEnum.ONE to AnEnum.FORTY_TWO, AnEnum.TWO to AnEnum.FOUR_HUNDRED_TWENTY_TWO),
+        listMap = mapOf(1L to stringList),
+        mapMap = mapOf(1L to mapOf()))
+  }
+
+  @Test
+  fun testHasValues() {
+    val everything = getFullyPopulatedAllNullableTypes()
     val binaryMessenger = mockk<BinaryMessenger>()
     val api = FlutterIntegrationCoreApi(binaryMessenger)
 
@@ -97,6 +116,16 @@ internal class AllDatatypesTest {
     assertTrue(didCall)
   }
 
+  @Test
+  fun testRoundtripHasValues() {
+    val everything = getFullyPopulatedAllNullableTypes()
+    val codec = FlutterIntegrationCoreApi.codec
+    val encoded = codec.encodeMessage(everything)
+    encoded?.rewind()
+    val decoded = codec.decodeMessage(encoded)
+    assertEquals(everything, decoded)
+  }
+
   private val correctList = listOf<Any?>("a", 2, "three")
   private val matchingList = correctList.toMutableList()
   private val differentList = listOf<Any?>("a", 2, "three", 4.0)
diff --git 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.0.4 # This must match the version in lib/src/generator_tools.dart
+version: 26.0.5 # This must match the version in lib/src/generator_tools.dart
 
 environment:
   sdk: ^3.7.0

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ platform_properties:`
`95`	`95`	`[`
`96`	`96`	`{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}`
`97`	`97`	`]`
`98`		`- os: Mac-14\|Mac-15.5`
	`98`	`+ os: Mac-15.5\|Mac-15.7`
`99`	`99`	`device_type: none`
`100`	`100`	`cpu: arm64`
`101`	`101`	`$flutter/osx_sdk : >-`
`@@ -108,7 +108,7 @@ platform_properties:`
`108`	`108`	`[`
`109`	`109`	`{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}`
`110`	`110`	`]`
`111`		`- os: Mac-14\|Mac-15.5`
	`111`	`+ os: Mac-15.5\|Mac-15.7`
`112`	`112`	`device_type: none`
`113`	`113`	`cpu: x86`
`114`	`114`	`$flutter/osx_sdk : >-`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {`
`142`	`142`	`when (value) {`
`143`	`143`	`is Code -> {`
`144`	`144`	`stream.write(129)`
`145`		`- writeValue(stream, value.raw)`
	`145`	`+ writeValue(stream, value.raw.toLong())`
`146`	`146`	`}`
`147`	`147`	`is MessageData -> {`
`148`	`148`	`stream.write(130)`
Original file line number	Diff line number	Diff line change
`@@ -704,11 +704,11 @@ private open class CoreTestsPigeonCodec : StandardMessageCodec() {`
`704`	`704`	`when (value) {`
`705`	`705`	`is AnEnum -> {`
`706`	`706`	`stream.write(129)`
`707`		`- writeValue(stream, value.raw)`
	`707`	`+ writeValue(stream, value.raw.toLong())`
`708`	`708`	`}`
`709`	`709`	`is AnotherEnum -> {`
`710`	`710`	`stream.write(130)`
`711`		`- writeValue(stream, value.raw)`
	`711`	`+ writeValue(stream, value.raw.toLong())`
`712`	`712`	`}`
`713`	`713`	`is UnusedClass -> {`
`714`	`714`	`stream.write(131)`
Original file line number	Diff line number	Diff line change
`@@ -477,11 +477,11 @@ private open class EventChannelTestsPigeonCodec : StandardMessageCodec() {`
`477`	`477`	`when (value) {`
`478`	`478`	`is EventEnum -> {`
`479`	`479`	`stream.write(129)`
`480`		`- writeValue(stream, value.raw)`
	`480`	`+ writeValue(stream, value.raw.toLong())`
`481`	`481`	`}`
`482`	`482`	`is AnotherEventEnum -> {`
`483`	`483`	`stream.write(130)`
`484`		`- writeValue(stream, value.raw)`
	`484`	`+ writeValue(stream, value.raw.toLong())`
`485`	`485`	`}`
`486`	`486`	`is EventAllNullableTypes -> {`
`487`	`487`	`stream.write(131)`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ private open class ProxyApiTestsPigeonCodec : StandardMessageCodec() {`
`560`	`560`	`when (value) {`
`561`	`561`	`is ProxyApiTestEnum -> {`
`562`	`562`	`stream.write(129)`
`563`		`- writeValue(stream, value.raw)`
	`563`	`+ writeValue(stream, value.raw.toLong())`
`564`	`564`	`}`
`565`	`565`	`else -> super.writeValue(stream, value)`
`566`	`566`	`}`