From 3ef421e97afe0bcbb46ae7d545352c77c38e55ab Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Tue, 16 Dec 2025 06:05:19 -0800 Subject: [PATCH 01/14] [pr-fix] Run all flutter/packages macOS tests using Xcode 26 and iOS 26 simulator --- .ci.yaml | 14 ++++---------- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 37590f9c73b0..08b8237b1ffd 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -95,12 +95,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a400" } mac_x64: properties: @@ -108,12 +108,12 @@ platform_properties: [ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] - os: Mac-15.5|Mac-15.7 + os: Mac-15.7 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "16c5032a" + "sdk_version": "17a400" } targets: @@ -795,7 +795,6 @@ targets: - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -886,7 +885,6 @@ targets: # Don't run full platform tests on both channels in pre-submit. - name: Mac_arm64 ios_platform_tests_shard_1 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -896,7 +894,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -906,7 +903,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -916,7 +912,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable @@ -926,7 +921,6 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 stable recipe: packages/packages - presubmit: false timeout: 60 properties: channel: stable diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index a993f470f378..165de7264bbc 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-18-2 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-0 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 4e10a6f091b7..203158c0492e 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -26,7 +26,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=18.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index fe86925792aa..8cce1bba6a11 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,7 +359,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-18-2'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; const deviceOS = '18.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( From 133e8100b4c7710c5693dd9c5c29f1b1bb023163 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Wed, 17 Dec 2025 19:28:58 -0800 Subject: [PATCH 02/14] update version --- packages/pigeon/tool/shared/test_suites.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index 8cce1bba6a11..b0710d971659 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -360,7 +360,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; - const deviceOS = '18.2'; + const deviceOS = '26.0'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From c3cfd04b3712db4b59c5ab8a94de3c34235ed0cf Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:11:57 -0800 Subject: [PATCH 03/14] try xcode 26.1 release --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 08b8237b1ffd..4ea86f30089a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17a400" + "sdk_version": "17B55" } mac_x64: properties: @@ -113,7 +113,7 @@ platform_properties: cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17a400" + "sdk_version": "17B55" } targets: From 9ea2d75e34c430e9ede4c62277a053f2d302c269 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:18:33 -0800 Subject: [PATCH 04/14] try 26.2 --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 4ea86f30089a..33a00cebc24c 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17B55" + "sdk_version": "17c52" } mac_x64: properties: @@ -113,7 +113,7 @@ platform_properties: cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17B55" + "sdk_version": "17c52" } targets: From 668fd6612e47caa40f34c7a554ea3f6b44d7e62a Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 18 Dec 2025 15:30:27 -0800 Subject: [PATCH 05/14] try 26.2 --- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 165de7264bbc..e43100266004 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-0 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-2 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 203158c0492e..2cad013b0404 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -26,7 +26,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.0", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index b0710d971659..993f276ecd3d 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,8 +359,8 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-0'; - const deviceOS = '26.0'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; + const deviceOS = '26.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From 7b59edbcd628086676718a1b8f19050907a84bd1 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Fri, 19 Dec 2025 12:19:40 -0800 Subject: [PATCH 06/14] use arm64 --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 33a00cebc24c..66f7c4654f7a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -110,7 +110,7 @@ platform_properties: ] os: Mac-15.7 device_type: none - cpu: x86 + cpu: arm64 $flutter/osx_sdk : >- { "sdk_version": "17c52" From 63694fc2e971e66c6295a1f1935805cf3c631320 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Fri, 27 Mar 2026 12:36:54 -0700 Subject: [PATCH 07/14] update version to 26.4 --- .ci.yaml | 6 +++--- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 66f7c4654f7a..af5d51415a43 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17c52" + "sdk_version": "17e192" } mac_x64: properties: @@ -110,10 +110,10 @@ platform_properties: ] os: Mac-15.7 device_type: none - cpu: arm64 + cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17c52" + "sdk_version": "17e192" } targets: diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index e43100266004..806e1ec3e36e 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-2 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-4 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 2cad013b0404..15d559b580bd 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -26,7 +26,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.4", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index 993f276ecd3d..e20f519ba7e6 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -360,7 +360,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; - const deviceOS = '26.2'; + const deviceOS = '26.4'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From 659fbdad7ccc234968ed48257f58dac9986e001f Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Fri, 27 Mar 2026 13:38:23 -0700 Subject: [PATCH 08/14] version --- packages/pigeon/tool/shared/test_suites.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index e20f519ba7e6..fffda581aecf 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,7 +359,7 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-4'; const deviceOS = '26.4'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( From 19000e81d815570c68f7aedbc6a7a89214ff82c3 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Mon, 6 Apr 2026 11:33:15 -0700 Subject: [PATCH 09/14] maps fix --- .../google_maps_flutter_ios/CHANGELOG.md | 4 ++++ .../google_maps_flutter_ios/example/ios/Podfile | 8 ++++++++ .../google_maps_flutter_ios/pubspec.yaml | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 179691037daf..f8fecc2b2d9b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.18.2 + +* Suppresses `-Wenum-enum-conversion` warning in `Google-Maps-iOS-Utils` for Xcode 26+ compatibility. + ## 2.18.1 * Removes conditional header logic that broke add-to-app builds. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile index c2c1dc5432d3..ab3a992684a5 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile @@ -39,5 +39,13 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + # Suppress -Wenum-enum-conversion for Google-Maps-iOS-Utils, which OR's + # CGBitmapInfo and CGImageAlphaInfo enums in GMUHeatmapTileLayer.m:345. + # This is valid usage but flagged as an error under Xcode 26+ / Clang 16+. + if target.name == 'Google-Maps-iOS-Utils' + target.build_configurations.each do |config| + config.build_settings['OTHER_CFLAGS'] = '$(inherited) -Wno-enum-enum-conversion' + end + end end end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index d8548ac8dac0..8a8b1cee4779 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.1 +version: 2.18.2 environment: sdk: ^3.10.0 From 47028b8c9115493580763b8e95223a92332c53cc Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Mon, 6 Apr 2026 12:34:50 -0700 Subject: [PATCH 10/14] maps v2 --- .../google_maps_flutter_ios/CHANGELOG.md | 1 + .../google_maps_flutter_ios/FGMTileOverlayController.m | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index f8fecc2b2d9b..7287e81eeb93 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.18.2 * Suppresses `-Wenum-enum-conversion` warning in `Google-Maps-iOS-Utils` for Xcode 26+ compatibility. +* Fixes enum type mismatch in `FGMTileOverlayController` for Xcode 26+ compatibility. ## 2.18.1 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 012276e27281..6b89c6d056e6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -88,9 +88,9 @@ - (UIImage *)handleResultTile:(nullable UIImage *)tile { // If it is wide gamut, we want to downsample it if (isFloat & (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = - CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace, - (kCGBitmapAlphaInfoMask & kCGImageAlphaPremultipliedLast)); + CGContextRef context = CGBitmapContextCreate( + nil, tile.size.width, tile.size.height, 8, 0, colorSpace, + (kCGBitmapAlphaInfoMask & (CGBitmapInfo)kCGImageAlphaPremultipliedLast)); CGContextDrawImage(context, CGRectMake(0, 0, tile.size.width, tile.size.height), tile.CGImage); CGImageRef image = CGBitmapContextCreateImage(context); tile = [UIImage imageWithCGImage:image]; From c8baa0e8477f5dcbf5e6bd729256346349600cfd Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Wed, 8 Apr 2026 14:50:36 -0700 Subject: [PATCH 11/14] map v3 --- .../google_maps_flutter_ios/CHANGELOG.md | 1 - .../google_maps_flutter_ios/FGMTileOverlayController.m | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index 7287e81eeb93..f8fecc2b2d9b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,7 +1,6 @@ ## 2.18.2 * Suppresses `-Wenum-enum-conversion` warning in `Google-Maps-iOS-Utils` for Xcode 26+ compatibility. -* Fixes enum type mismatch in `FGMTileOverlayController` for Xcode 26+ compatibility. ## 2.18.1 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m index 6b89c6d056e6..012276e27281 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMTileOverlayController.m @@ -88,9 +88,9 @@ - (UIImage *)handleResultTile:(nullable UIImage *)tile { // If it is wide gamut, we want to downsample it if (isFloat & (bitsPerComponent == 16)) { CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGContextRef context = CGBitmapContextCreate( - nil, tile.size.width, tile.size.height, 8, 0, colorSpace, - (kCGBitmapAlphaInfoMask & (CGBitmapInfo)kCGImageAlphaPremultipliedLast)); + CGContextRef context = + CGBitmapContextCreate(nil, tile.size.width, tile.size.height, 8, 0, colorSpace, + (kCGBitmapAlphaInfoMask & kCGImageAlphaPremultipliedLast)); CGContextDrawImage(context, CGRectMake(0, 0, tile.size.width, tile.size.height), tile.CGImage); CGImageRef image = CGBitmapContextCreateImage(context); tile = [UIImage imageWithCGImage:image]; From 5ee28008b837e4b1b938504e01ecd2e49dd70bbc Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Wed, 8 Apr 2026 16:38:38 -0700 Subject: [PATCH 12/14] map v3.1 --- .../google_maps_flutter_ios/CHANGELOG.md | 4 ---- .../google_maps_flutter_ios/example/ios/Podfile | 8 -------- .../google_maps_flutter_ios/pubspec.yaml | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index f8fecc2b2d9b..179691037daf 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.18.2 - -* Suppresses `-Wenum-enum-conversion` warning in `Google-Maps-iOS-Utils` for Xcode 26+ compatibility. - ## 2.18.1 * Removes conditional header logic that broke add-to-app builds. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile index ab3a992684a5..c2c1dc5432d3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios/Podfile @@ -39,13 +39,5 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) - # Suppress -Wenum-enum-conversion for Google-Maps-iOS-Utils, which OR's - # CGBitmapInfo and CGImageAlphaInfo enums in GMUHeatmapTileLayer.m:345. - # This is valid usage but flagged as an error under Xcode 26+ / Clang 16+. - if target.name == 'Google-Maps-iOS-Utils' - target.build_configurations.each do |config| - config.build_settings['OTHER_CFLAGS'] = '$(inherited) -Wno-enum-enum-conversion' - end - end end end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 8a8b1cee4779..d8548ac8dac0 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_maps_flutter_ios description: iOS implementation of the google_maps_flutter plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22 -version: 2.18.2 +version: 2.18.1 environment: sdk: ^3.10.0 From fe581334546d7ca20cd850bd55e821b0609938b1 Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Thu, 9 Apr 2026 08:30:51 -0700 Subject: [PATCH 13/14] 26.2 --- .ci.yaml | 4 ++-- .ci/scripts/create_simulator.sh | 2 +- .ci/targets/ios_platform_tests.yaml | 2 +- packages/pigeon/tool/shared/test_suites.dart | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index af5d51415a43..33a00cebc24c 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -100,7 +100,7 @@ platform_properties: cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "17e192" + "sdk_version": "17c52" } mac_x64: properties: @@ -113,7 +113,7 @@ platform_properties: cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "17e192" + "sdk_version": "17c52" } targets: diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index 806e1ec3e36e..e43100266004 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -9,7 +9,7 @@ set -o pipefail # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-4 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-26-2 # Delete any existing devices named Flutter-iPhone. Having more than one may # cause issues when builds target the device. diff --git a/.ci/targets/ios_platform_tests.yaml b/.ci/targets/ios_platform_tests.yaml index 15d559b580bd..2cad013b0404 100644 --- a/.ci/targets/ios_platform_tests.yaml +++ b/.ci/targets/ios_platform_tests.yaml @@ -26,7 +26,7 @@ tasks: - name: native test script: .ci/scripts/tool_runner.sh # Simulator name and version must match name and version in create_simulator.sh - args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.4", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] + args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=26.2", "--xcode-warnings-exceptions=script/configs/xcode_warnings_exceptions.yaml"] - name: boot simulator # Ensure simulator is still booted script: .ci/scripts/boot_simulator.sh diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index fffda581aecf..993f276ecd3d 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -359,8 +359,8 @@ Future _runIOSPluginUnitTests(String testPluginPath) async { const deviceName = 'Pigeon-Test-iPhone'; const deviceType = 'com.apple.CoreSimulator.SimDeviceType.iPhone-14'; - const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-4'; - const deviceOS = '26.4'; + const deviceRuntime = 'com.apple.CoreSimulator.SimRuntime.iOS-26-2'; + const deviceOS = '26.2'; await _createSimulator(deviceName, deviceType, deviceRuntime); return runXcodeBuild( '$examplePath/ios', From 9f82a72209d0c9712a4b9066ab1856c5e15ca8fb Mon Sep 17 00:00:00 2001 From: Elijah Okoroh Date: Mon, 13 Apr 2026 13:49:06 -0700 Subject: [PATCH 14/14] restore presubmits --- .ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 33a00cebc24c..ffb6f2004001 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -795,6 +795,7 @@ targets: - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable @@ -885,6 +886,7 @@ targets: # Don't run full platform tests on both channels in pre-submit. - name: Mac_arm64 ios_platform_tests_shard_1 stable recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable @@ -894,6 +896,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_2 stable recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable @@ -903,6 +906,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_3 stable recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable @@ -912,6 +916,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_4 stable recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable @@ -921,6 +926,7 @@ targets: - name: Mac_arm64 ios_platform_tests_shard_5 stable recipe: packages/packages + presubmit: false timeout: 60 properties: channel: stable