From 5bb772d18892480207f1f73d529c45bef30a1514 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Fri, 20 Mar 2026 10:35:20 -0700 Subject: [PATCH 1/5] Update flutter candidate --- flutter-candidate.txt | 2 +- pubspec.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flutter-candidate.txt b/flutter-candidate.txt index 97c660e03fd..366d50243d0 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt @@ -1 +1 @@ -f84b3c836acca76cb163a2d1174ab32a1e73cb11 +c6cec79f1f5d4ea1242936c7574af02bd39207c4 diff --git a/pubspec.lock b/pubspec.lock index e30fd8babfe..09e4c7a0228 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -530,10 +530,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.18" material_color_utilities: dependency: transitive description: @@ -854,26 +854,26 @@ packages: dependency: transitive description: name: test - sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7" + sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a" url: "https://pub.dev" source: hosted - version: "1.30.0" + version: "1.29.0" test_api: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.9" test_core: dependency: transitive description: name: test_core - sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51" + sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943" url: "https://pub.dev" source: hosted - version: "0.6.16" + version: "0.6.15" typed_data: dependency: transitive description: From 3884b4671d01be5ddcd4e5b7a354aa6e261fd852 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Fri, 20 Mar 2026 10:38:59 -0700 Subject: [PATCH 2/5] Update deps --- .../Flutter/GeneratedPluginRegistrant.swift | 12 ++++++++ .../ephemeral/Flutter-Generated.xcconfig | 12 ++++++++ .../Package.swift | 30 +++++++++++++++++++ .../FlutterGeneratedPluginSwiftPackage.swift | 3 ++ pubspec.lock | 16 +++++----- 5 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig create mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift create mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift diff --git a/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000000..8236f5728c6 --- /dev/null +++ b/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,12 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import url_launcher_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) +} diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig new file mode 100644 index 00000000000..cd5d6ec74f6 --- /dev/null +++ b/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -0,0 +1,12 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/Users/elliottbrooks/dev/flutter +FLUTTER_APPLICATION_PATH=/Users/elliottbrooks/dev/devtools/packages/devtools_app_shared +FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=/Users/elliottbrooks/dev/devtools/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/.packages/FlutterFramework +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=0.5.1 +FLUTTER_BUILD_NUMBER=0.5.1 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift new file mode 100644 index 00000000000..570e687170d --- /dev/null +++ b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift @@ -0,0 +1,30 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. +// +// Generated file. Do not edit. +// + +import PackageDescription + +let package = Package( + name: "FlutterGeneratedPluginSwiftPackage", + platforms: [ + .macOS("10.15") + ], + products: [ + .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"]) + ], + dependencies: [ + .package(name: "url_launcher_macos", path: "../.packages/url_launcher_macos"), + .package(name: "FlutterFramework", path: "../.packages/FlutterFramework") + ], + targets: [ + .target( + name: "FlutterGeneratedPluginSwiftPackage", + dependencies: [ + .product(name: "url-launcher-macos", package: "url_launcher_macos"), + .product(name: "FlutterFramework", package: "FlutterFramework") + ] + ) + ] +) diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift new file mode 100644 index 00000000000..62e7b11aa92 --- /dev/null +++ b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift @@ -0,0 +1,3 @@ +// +// Generated file. Do not edit. +// diff --git a/pubspec.lock b/pubspec.lock index 09e4c7a0228..e30fd8babfe 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -530,10 +530,10 @@ packages: dependency: transitive description: name: matcher - sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 url: "https://pub.dev" source: hosted - version: "0.12.18" + version: "0.12.19" material_color_utilities: dependency: transitive description: @@ -854,26 +854,26 @@ packages: dependency: transitive description: name: test - sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a" + sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7" url: "https://pub.dev" source: hosted - version: "1.29.0" + version: "1.30.0" test_api: dependency: transitive description: name: test_api - sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" + sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" url: "https://pub.dev" source: hosted - version: "0.7.9" + version: "0.7.10" test_core: dependency: transitive description: name: test_core - sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943" + sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51" url: "https://pub.dev" source: hosted - version: "0.6.15" + version: "0.6.16" typed_data: dependency: transitive description: From 127c6ba16339635f827663213df26b0ff7271d00 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Fri, 20 Mar 2026 10:43:05 -0700 Subject: [PATCH 3/5] untrack and gitignore macos files --- .gitignore | 4 +++ .../Flutter/GeneratedPluginRegistrant.swift | 12 -------- .../ephemeral/Flutter-Generated.xcconfig | 12 -------- .../Package.swift | 30 ------------------- .../FlutterGeneratedPluginSwiftPackage.swift | 3 -- 5 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig delete mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift delete mode 100644 packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift diff --git a/.gitignore b/.gitignore index cc7e9596bf8..de06f95ba88 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,7 @@ DEPENDENCIES.md # Ignore devtools_options.yaml files under example. **/example/**/devtools_options.yaml + +# macOS generated Flutter files +**/macos/Flutter/ephemeral/ +**/macos/Flutter/GeneratedPluginRegistrant.swift \ No newline at end of file diff --git a/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index 8236f5728c6..00000000000 --- a/packages/devtools_app_shared/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import url_launcher_macos - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) -} diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig deleted file mode 100644 index cd5d6ec74f6..00000000000 --- a/packages/devtools_app_shared/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ /dev/null @@ -1,12 +0,0 @@ -// This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/Users/elliottbrooks/dev/flutter -FLUTTER_APPLICATION_PATH=/Users/elliottbrooks/dev/devtools/packages/devtools_app_shared -FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=/Users/elliottbrooks/dev/devtools/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/.packages/FlutterFramework -COCOAPODS_PARALLEL_CODE_SIGN=true -FLUTTER_BUILD_DIR=build -FLUTTER_BUILD_NAME=0.5.1 -FLUTTER_BUILD_NUMBER=0.5.1 -DART_OBFUSCATION=false -TRACK_WIDGET_CREATION=true -TREE_SHAKE_ICONS=false -PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift deleted file mode 100644 index 570e687170d..00000000000 --- a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift +++ /dev/null @@ -1,30 +0,0 @@ -// swift-tools-version: 5.9 -// The swift-tools-version declares the minimum version of Swift required to build this package. -// -// Generated file. Do not edit. -// - -import PackageDescription - -let package = Package( - name: "FlutterGeneratedPluginSwiftPackage", - platforms: [ - .macOS("10.15") - ], - products: [ - .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"]) - ], - dependencies: [ - .package(name: "url_launcher_macos", path: "../.packages/url_launcher_macos"), - .package(name: "FlutterFramework", path: "../.packages/FlutterFramework") - ], - targets: [ - .target( - name: "FlutterGeneratedPluginSwiftPackage", - dependencies: [ - .product(name: "url-launcher-macos", package: "url_launcher_macos"), - .product(name: "FlutterFramework", package: "FlutterFramework") - ] - ) - ] -) diff --git a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift deleted file mode 100644 index 62e7b11aa92..00000000000 --- a/packages/devtools_app_shared/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift +++ /dev/null @@ -1,3 +0,0 @@ -// -// Generated file. Do not edit. -// From 8818e7c738fe06fd7cbd25d15fd79f40cdb4f567 Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Fri, 20 Mar 2026 10:43:51 -0700 Subject: [PATCH 4/5] new line end of file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de06f95ba88..2a119978514 100644 --- a/.gitignore +++ b/.gitignore @@ -54,4 +54,4 @@ DEPENDENCIES.md # macOS generated Flutter files **/macos/Flutter/ephemeral/ -**/macos/Flutter/GeneratedPluginRegistrant.swift \ No newline at end of file +**/macos/Flutter/GeneratedPluginRegistrant.swift From 0a90ef03592bbeea1f463c3bb4ed721b234b40dd Mon Sep 17 00:00:00 2001 From: Elliott Brooks <21270878+elliette@users.noreply.github.com> Date: Fri, 20 Mar 2026 11:10:14 -0700 Subject: [PATCH 5/5] Run formatteR --- .../devtools_app/lib/src/framework/observer/_memory_web.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/devtools_app/lib/src/framework/observer/_memory_web.dart b/packages/devtools_app/lib/src/framework/observer/_memory_web.dart index 251cfb64071..c6e56a3bbd3 100644 --- a/packages/devtools_app/lib/src/framework/observer/_memory_web.dart +++ b/packages/devtools_app/lib/src/framework/observer/_memory_web.dart @@ -65,8 +65,7 @@ extension type _UserAgentSpecificMemoryBreakdownAttributionElement._(JSObject _) @JS() extension type _UserAgentSpecificMemoryBreakdownAttributionContainerElement._( JSObject _ -) - implements JSObject { +) implements JSObject { external String get id; external String get url;