Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 22ab152

Browse files
authored
Migrate the remaining real pub packages to pub workspaces. (#54232)
Closes flutter/flutter#147883.
1 parent 1633272 commit 22ab152

File tree

6 files changed

+20
-35
lines changed

6 files changed

+20
-35
lines changed

ci/licenses_golden/excluded_files

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
../../../flutter/impeller/scene/scene_unittests.cc
212212
../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
213213
../../../flutter/impeller/tessellator/dart/.dart_tool
214-
../../../flutter/impeller/tessellator/dart/pubspec.lock
215214
../../../flutter/impeller/tessellator/dart/pubspec.yaml
216215
../../../flutter/impeller/tessellator/tessellator_unittests.cc
217216
../../../flutter/impeller/toolkit/android/README.md
@@ -423,7 +422,6 @@
423422
../../../flutter/shell/profiling/sampling_profiler_unittest.cc
424423
../../../flutter/shell/testing
425424
../../../flutter/shell/vmservice/.dart_tool
426-
../../../flutter/shell/vmservice/pubspec.lock
427425
../../../flutter/shell/vmservice/pubspec.yaml
428426
../../../flutter/sky/packages/sky_engine/.gitignore
429427
../../../flutter/sky/packages/sky_engine/LICENSE

flutter_frontend_server/pubspec.yaml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,14 @@
44

55
name: flutter_frontend_server
66
publish_to: none
7-
version: 0.1.1-dev
8-
description: Communication pipe to Dart Frontend
9-
homepage: https://flutter.dev
10-
11-
# Do not add any dependencies that require more than what is provided in
12-
# //third_party/pkg, //third_party/dart/pkg or
13-
# //third_party/dart/third_party/pkg. In particular, package:test is not usable
14-
# here.
15-
16-
# If you do add packages here, make sure you can run `pub get --offline`, and
17-
# check the .packages and .package_config to make sure all the paths are
18-
# relative to this directory into //third_party/dart
197

8+
# Required for workspace support.
209
environment:
21-
sdk: '>=3.2.0-0 <4.0.0'
10+
sdk: ^3.5.0-294.0.dev
11+
12+
# This package is managed as part of the engine workspace.
13+
resolution: workspace
2214

2315
dev_dependencies:
2416
litetest: any
2517
path: any
26-
27-
dependency_overrides:
28-
async_helper:
29-
path: ../third_party/dart/pkg/async_helper
30-
expect:
31-
path: ../third_party/dart/pkg/expect
32-
litetest:
33-
path: ../testing/litetest
34-
meta:
35-
path: ../third_party/dart/pkg/meta
36-
path:
37-
path: ../third_party/dart/third_party/pkg/path
38-
smith:
39-
path: ../third_party/dart/pkg/smith

impeller/tessellator/dart/pubspec.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44
name: tessellator
5-
description: A Dart FFI wrapper for Impeller's tessellator.
6-
version: 0.0.0
75
publish_to: none
8-
homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart
96

7+
# Required for workspace support.
108
environment:
11-
sdk: '>=3.2.0-0 <4.0.0'
9+
sdk: ^3.5.0-294.0.dev
10+
11+
# This package is managed as part of the engine workspace.
12+
resolution: workspace

pubspec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ environment:
8181
# Declare all packages that are part of the workspace.
8282
workspace:
8383
- ci
84+
- flutter_frontend_server
85+
- impeller/tessellator/dart
86+
- shell/vmservice
8487
- testing/benchmark
8588
- testing/dart
8689
- testing/litetest

shell/vmservice/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ import("//flutter/build/dart/rules.gni")
77
# Build a minimal snapshot that can be used to launch the VM service isolate.
88
flutter_snapshot("vmservice_snapshot") {
99
main_dart = "empty.dart"
10-
package_config = ".dart_tool/package_config.json"
1110
output_aot_lib = "libvmservice_snapshot.so"
1211
}

shell/vmservice/pubspec.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44

55
name: vmservice_snapshot
66
publish_to: none
7+
8+
# Required for workspace support.
79
environment:
8-
sdk: '>=3.2.0-0 <4.0.0'
10+
sdk: ^3.5.0-294.0.dev
11+
12+
# This package is managed as part of the engine workspace.
13+
resolution: workspace
14+

0 commit comments

Comments
 (0)