Migrate the remaining real pub packages to pub workspaces. (#54232)
Closes https://github.com/flutter/flutter/issues/147883.
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index 20ea853..6277a94 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -211,7 +211,6 @@
../../../flutter/impeller/scene/scene_unittests.cc
../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
../../../flutter/impeller/tessellator/dart/.dart_tool
-../../../flutter/impeller/tessellator/dart/pubspec.lock
../../../flutter/impeller/tessellator/dart/pubspec.yaml
../../../flutter/impeller/tessellator/tessellator_unittests.cc
../../../flutter/impeller/toolkit/android/README.md
@@ -423,7 +422,6 @@
../../../flutter/shell/profiling/sampling_profiler_unittest.cc
../../../flutter/shell/testing
../../../flutter/shell/vmservice/.dart_tool
-../../../flutter/shell/vmservice/pubspec.lock
../../../flutter/shell/vmservice/pubspec.yaml
../../../flutter/sky/packages/sky_engine/.gitignore
../../../flutter/sky/packages/sky_engine/LICENSE
diff --git a/flutter_frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml
index d4aac02..e871ad5 100644
--- a/flutter_frontend_server/pubspec.yaml
+++ b/flutter_frontend_server/pubspec.yaml
@@ -4,36 +4,14 @@
name: flutter_frontend_server
publish_to: none
-version: 0.1.1-dev
-description: Communication pipe to Dart Frontend
-homepage: https://flutter.dev
-# Do not add any dependencies that require more than what is provided in
-# //third_party/pkg, //third_party/dart/pkg or
-# //third_party/dart/third_party/pkg. In particular, package:test is not usable
-# here.
-
-# If you do add packages here, make sure you can run `pub get --offline`, and
-# check the .packages and .package_config to make sure all the paths are
-# relative to this directory into //third_party/dart
-
+# Required for workspace support.
environment:
- sdk: '>=3.2.0-0 <4.0.0'
+ sdk: ^3.5.0-294.0.dev
+
+# This package is managed as part of the engine workspace.
+resolution: workspace
dev_dependencies:
litetest: any
path: any
-
-dependency_overrides:
- async_helper:
- path: ../third_party/dart/pkg/async_helper
- expect:
- path: ../third_party/dart/pkg/expect
- litetest:
- path: ../testing/litetest
- meta:
- path: ../third_party/dart/pkg/meta
- path:
- path: ../third_party/dart/third_party/pkg/path
- smith:
- path: ../third_party/dart/pkg/smith
diff --git a/impeller/tessellator/dart/pubspec.yaml b/impeller/tessellator/dart/pubspec.yaml
index 12ec6ec..ef84e42 100644
--- a/impeller/tessellator/dart/pubspec.yaml
+++ b/impeller/tessellator/dart/pubspec.yaml
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
name: tessellator
-description: A Dart FFI wrapper for Impeller's tessellator.
-version: 0.0.0
publish_to: none
-homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart
+# Required for workspace support.
environment:
- sdk: '>=3.2.0-0 <4.0.0'
+ sdk: ^3.5.0-294.0.dev
+
+# This package is managed as part of the engine workspace.
+resolution: workspace
diff --git a/pubspec.yaml b/pubspec.yaml
index f435f5b..171e512 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -81,6 +81,9 @@
# Declare all packages that are part of the workspace.
workspace:
- ci
+ - flutter_frontend_server
+ - impeller/tessellator/dart
+ - shell/vmservice
- testing/benchmark
- testing/dart
- testing/litetest
diff --git a/shell/vmservice/BUILD.gn b/shell/vmservice/BUILD.gn
index becc886..aada8b7 100644
--- a/shell/vmservice/BUILD.gn
+++ b/shell/vmservice/BUILD.gn
@@ -7,6 +7,5 @@
# Build a minimal snapshot that can be used to launch the VM service isolate.
flutter_snapshot("vmservice_snapshot") {
main_dart = "empty.dart"
- package_config = ".dart_tool/package_config.json"
output_aot_lib = "libvmservice_snapshot.so"
}
diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml
index c3cffd9..0580a72 100644
--- a/shell/vmservice/pubspec.yaml
+++ b/shell/vmservice/pubspec.yaml
@@ -4,5 +4,11 @@
name: vmservice_snapshot
publish_to: none
+
+# Required for workspace support.
environment:
- sdk: '>=3.2.0-0 <4.0.0'
+ sdk: ^3.5.0-294.0.dev
+
+# This package is managed as part of the engine workspace.
+resolution: workspace
+