Move the DTDConnectionInfo typedef to a different library (#7660)

flutter · Apr 26, 2024 · 5907c95 · 5907c95
1 parent 7a53fd2
commit 5907c95
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 8 deletions.
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   dds_service_extensions: ^2.0.0
   devtools_app_shared: ^0.2.0-dev.0
   devtools_extensions: ^0.2.0-dev.0
-  devtools_shared: ^10.0.0-dev.0
+  devtools_shared: ^10.0.0-dev.1
   dtd: ^2.2.0
   file: ">=6.0.0 <8.0.0"
   file_selector: ^1.0.0

diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   collection: ^1.15.0
   dds_service_extensions: ^2.0.0
-  devtools_shared: ^10.0.0-dev.0
+  devtools_shared: ^10.0.0-dev.1
   dtd: ^2.1.0
   flutter:
     sdk: flutter

diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml
@@ -13,7 +13,7 @@ executables:
 
 dependencies:
   args: ^2.4.2
-  devtools_shared: ^10.0.0-dev.0
+  devtools_shared: ^10.0.0-dev.1
   devtools_app_shared: ^0.2.0-dev.0
   flutter:
     sdk: flutter

diff --git a/packages/devtools_shared/CHANGELOG.md b/packages/devtools_shared/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 10.0.0-dev.1
+* Export `DTDConnectionInfo` from the `devtools_shared.dart` library instead
+of the `devtools_server.dart` library.
+
 # 10.0.0-dev.0
 * **Breaking change:** rename `DevToolsExtensionConfig.path` to
 `DevToolsExtensionConfig.extensionAssetsPath` and update class documentation.

diff --git a/packages/devtools_shared/lib/devtools_shared.dart b/packages/devtools_shared/lib/devtools_shared.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+export 'src/common.dart';
 export 'src/devtools_api.dart';
 export 'src/memory/adb_memory_info.dart';
 export 'src/memory/class_heap_detail_stats.dart';

diff --git a/packages/devtools_shared/lib/src/common.dart b/packages/devtools_shared/lib/src/common.dart
@@ -0,0 +1,6 @@
+// Copyright 2024 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Describes an instance of the Dart Tooling Daemon.
+typedef DTDConnectionInfo = ({String? uri, String? secret});
diff --git a/packages/devtools_shared/lib/src/extensions/extension_manager.dart b/packages/devtools_shared/lib/src/extensions/extension_manager.dart
@@ -7,7 +7,7 @@ import 'package:dtd/dtd.dart';
 import 'package:extension_discovery/extension_discovery.dart';
 import 'package:path/path.dart' as path;
 
-import '../server/server_api.dart';
+import '../common.dart';
 import 'constants.dart';
 import 'extension_model.dart';
 

diff --git a/packages/devtools_shared/lib/src/server/server_api.dart b/packages/devtools_shared/lib/src/server/server_api.dart
@@ -14,6 +14,7 @@ import 'package:meta/meta.dart';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:vm_service/vm_service.dart';
 
+import '../common.dart';
 import '../deeplink/deeplink_manager.dart';
 import '../devtools_api.dart';
 import '../extensions/extension_enablement.dart';
@@ -31,9 +32,6 @@ part 'handlers/_devtools_extensions.dart';
 part 'handlers/_dtd.dart';
 part 'handlers/_general.dart';
 
-/// Describes an instance of the Dart Tooling Daemon.
-typedef DTDConnectionInfo = ({String? uri, String? secret});
-
 /// The DevTools server API.
 ///
 /// This defines endpoints that serve all requests that come in over api/.

diff --git a/packages/devtools_shared/pubspec.yaml b/packages/devtools_shared/pubspec.yaml
@@ -1,7 +1,7 @@
 name: devtools_shared
 description: Package of shared Dart structures between devtools_app, dds, and other tools.
 
-version: 10.0.0-dev.0
+version: 10.0.0-dev.1
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_shared