Skip to content

Commit

Permalink
Export devtools_extensions_io.dart from devtools_shared (#6197)
Browse files Browse the repository at this point in the history
  • Loading branch information
kenzieschmoll authored Aug 17, 2023
1 parent 6eb8d22 commit 0af79f0
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 17 deletions.
4 changes: 2 additions & 2 deletions packages/devtools_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dependencies:
collection: ^1.15.0
dap: ^1.1.0
dds_service_extensions: ^1.6.0
devtools_extensions: ^0.0.1-dev.0
devtools_shared: 2.27.0-dev.8
devtools_extensions: ^0.0.2-dev.0
devtools_shared: 3.0.0
file: ^6.0.0
file_selector: ^0.8.0
file_selector_linux: ^0.0.2
Expand Down
4 changes: 4 additions & 0 deletions packages/devtools_extensions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.0.2-dev.0

* Add missing dependency on `package:devtools_shared`.

## 0.0.1-dev.0

* Initial commit. This package is under construction.
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ dependencies:
sdk: flutter
devtools_extensions:
path: ../../

dependency_overrides:
devtools_extensions:
path: ../../
devtools_shared:
path: ../../../devtools_shared
3 changes: 2 additions & 1 deletion packages/devtools_extensions/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: devtools_extensions
description: A package for building and supporting extensions for Dart DevTools.
version: 0.0.1-dev.0
version: 0.0.2-dev.0
repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions

environment:
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.0.0'

dependencies:
devtools_shared: 3.0.0
flutter:
sdk: flutter
logging: ^1.1.1
Expand Down
14 changes: 9 additions & 5 deletions packages/devtools_shared/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
`package:devtools_shared` is developed as part of the broader
[DevTools project](https://github.com/flutter/devtools). The `devtools_shared`
version is updated in lockstep with the other
[DevTools packages](https://github.com/flutter/devtools/tree/master/packages). To
see changes and commits for `package:devtools_shared`, please view the git log
# 3.0.0

- Separate extension-related libraries into those that require `dart:io` (exported as
`devtools_extensions_io.dart`) and those that do not (exported as `devtools_extensions.dart`).

Prior to version 3.0.0, `package:devtools_shared` was versioned in lockstep with
`package:devtools_app`. Both of these packages are developed as part of the broader
[DevTools project](https://github.com/flutter/devtools). To see changes and commits
for `package:devtools_shared`, prior to version 3.0.0 please view the git log
[here](https://github.com/flutter/devtools/commits/master/packages/devtools_shared).
1 change: 0 additions & 1 deletion packages/devtools_shared/lib/devtools_extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

export 'src/extensions/extension_manager.dart';
export 'src/extensions/extension_model.dart';
6 changes: 6 additions & 0 deletions packages/devtools_shared/lib/devtools_extensions_io.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2023 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.

export 'src/extensions/extension_enablement.dart';
export 'src/extensions/extension_manager.dart';
2 changes: 1 addition & 1 deletion packages/devtools_shared/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: devtools_shared
description: Package of shared structures between devtools_app, dds, and other tools.

version: 2.27.0-dev.8
version: 3.0.0

repository: https://github.com/flutter/devtools/tree/master/packages/devtools_shared

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import 'dart:io';

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:devtools_shared/src/extensions/extension_enablement.dart';
import 'package:devtools_shared/devtools_extensions_io.dart';
import 'package:test/test.dart';

void main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import 'dart:io';

import 'package:devtools_shared/devtools_extensions.dart';
import 'package:devtools_shared/devtools_extensions_io.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';

Expand Down
4 changes: 3 additions & 1 deletion packages/devtools_test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ environment:
dependencies:
async: ^2.0.0
collection: ^1.15.0
devtools_shared: 2.27.0-dev.8
devtools_shared: 3.0.0
devtools_app: 2.27.0-dev.8
flutter:
sdk: flutter
Expand All @@ -34,6 +34,8 @@ dependencies:
dependency_overrides:
devtools_app:
path: ../devtools_app
devtools_extensions:
path: ../devtools_extensions
devtools_shared:
path: ../devtools_shared

Expand Down
6 changes: 2 additions & 4 deletions tool/update_version.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ import 'package:args/command_runner.dart';
// TODO(kenz): If changes are made to this script, first consider refactoring to
// use https://github.com/dart-lang/pubspec_parse.

// package/devtools_extensions has its own versioning strategy. Do not include
// it in the list here.
// `package:devtools_extensions` and `package:devtools_shared` have their
// own versioning strategies. Do not include those packages in the list here.
final _pubspecs = [
'packages/devtools_app/pubspec.yaml',
'packages/devtools_test/pubspec.yaml',
'packages/devtools_shared/pubspec.yaml',
].map((path) => File(path)).toList();
const _releaseNoteDirPath = './packages/devtools_app/release_notes';

Expand Down Expand Up @@ -234,7 +233,6 @@ const editablePubspecSections = [
const devToolsDependencyPrefixes = [
'devtools_app: ',
'devtools_test: ',
'devtools_shared: ',
];

extension JoinExtension on List<String> {
Expand Down

0 comments on commit 0af79f0

Please sign in to comment.