From 41c122bf0b8b09e649cda92d0d0fb97f59e14849 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:11:44 -0800 Subject: [PATCH 1/4] Make nullable signature non-nullable again --- .../lib/src/deeplink/universal_link_settings.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/devtools_shared/lib/src/deeplink/universal_link_settings.dart b/packages/devtools_shared/lib/src/deeplink/universal_link_settings.dart index 0cc78b5a96a..4e3a7b04c41 100644 --- a/packages/devtools_shared/lib/src/deeplink/universal_link_settings.dart +++ b/packages/devtools_shared/lib/src/deeplink/universal_link_settings.dart @@ -21,10 +21,11 @@ extension type const UniversalLinkSettings._(Map _json) { }); /// The bundle identifier of the iOS build of this Flutter project. - String? get bundleIdentifier => _json[_kBundleIdentifierKey] as String?; + String get bundleIdentifier => + (_json[_kBundleIdentifierKey] as String?) ?? ''; /// The team identifier of the iOS build of this Flutter project. - String? get teamIdentifier => _json[_kTeamIdentifierKey] as String?; + String get teamIdentifier => (_json[_kTeamIdentifierKey] as String?) ?? ''; /// The associated domains of the iOS build of this Flutter project. List get associatedDomains => From f635751a760dee2960778715e0b68fc0ef78de62 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:36:43 -0800 Subject: [PATCH 2/4] Make killForcefully public again --- packages/devtools_shared/lib/src/test/io_utils.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devtools_shared/lib/src/test/io_utils.dart b/packages/devtools_shared/lib/src/test/io_utils.dart index 65180feb332..eb1b5c8353d 100644 --- a/packages/devtools_shared/lib/src/test/io_utils.dart +++ b/packages/devtools_shared/lib/src/test/io_utils.dart @@ -94,11 +94,11 @@ mixin IOMixin { Process.killPid(processId); return process.exitCode.timeout( killTimeout, - onTimeout: () => _killForcefully(process, debugLogging: debugLogging), + onTimeout: () => killForcefully(process, debugLogging: debugLogging), ); } - Future _killForcefully( + Future killForcefully( Process process, { bool debugLogging = false, }) { From 3d5c07730c54bb623bbf47e10b44af6baf82a6dc Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 5 Feb 2026 11:04:13 -0800 Subject: [PATCH 3/4] Update pubspec and changelog --- packages/devtools_shared/CHANGELOG.md | 7 +++++++ packages/devtools_shared/pubspec.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/devtools_shared/CHANGELOG.md b/packages/devtools_shared/CHANGELOG.md index dfa4e232fd9..d0ac7b6c111 100644 --- a/packages/devtools_shared/CHANGELOG.md +++ b/packages/devtools_shared/CHANGELOG.md @@ -3,6 +3,13 @@ Copyright 2025 The Flutter Authors Use of this source code is governed by a BSD-style license that can be found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. --> +# 12.1.0 +* Adds additional logging to `IntegrationTestRunner`. +* Fixes assertion error when parsing Flutter channel versions using the format `X.XX.X-X.X.pre-XXX`. +* Fixes breakage associated with ChromeDriver 138 when using `IntegrationTestRunner`. +* Adds `sanitizeVersionStr` helper to `SemanticVersion`. +* Fixes null error when parsing `bundleIdentifier` or `teamIndentifier` in `UniversalLinkSettings`. + # 12.0.0 * Update `dtd` dependency to `^4.0.0`. * Register and unregister VM service connections on DTD. This change only diff --git a/packages/devtools_shared/pubspec.yaml b/packages/devtools_shared/pubspec.yaml index 7dad9cd2821..d9b56803d77 100644 --- a/packages/devtools_shared/pubspec.yaml +++ b/packages/devtools_shared/pubspec.yaml @@ -4,7 +4,7 @@ name: devtools_shared description: Package of shared Dart structures between devtools_app, dds, and other tools. -version: 12.0.0 +version: 12.1.0 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_shared From 918297c583d5d4c3322e456dc558486e403cbe4a Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Thu, 5 Feb 2026 12:27:32 -0800 Subject: [PATCH 4/4] Update test --- .../test/deeplink/universal_link_settings_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devtools_shared/test/deeplink/universal_link_settings_test.dart b/packages/devtools_shared/test/deeplink/universal_link_settings_test.dart index 15a56adb54c..ec15bcd1e68 100644 --- a/packages/devtools_shared/test/deeplink/universal_link_settings_test.dart +++ b/packages/devtools_shared/test/deeplink/universal_link_settings_test.dart @@ -29,7 +29,7 @@ void main() { } '''; final settings = UniversalLinkSettings.fromJson(json); - expect(settings.bundleIdentifier, isNull); + expect(settings.bundleIdentifier, isEmpty); expect(settings.teamIdentifier, 'TEAMID'); expect(settings.associatedDomains, ['applinks:example.com']); }); @@ -43,7 +43,7 @@ void main() { '''; final settings = UniversalLinkSettings.fromJson(json); expect(settings.bundleIdentifier, 'com.example.app'); - expect(settings.teamIdentifier, isNull); + expect(settings.teamIdentifier, isEmpty); expect(settings.associatedDomains, ['applinks:example.com']); }); });