Skip to content

Commit

Permalink
Migrate the remaining real pub packages to pub workspaces. (flutter#5…
Browse files Browse the repository at this point in the history
  • Loading branch information
matanlurey authored Jul 31, 2024
1 parent 1633272 commit 22ab152
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 35 deletions.
2 changes: 0 additions & 2 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
32 changes: 5 additions & 27 deletions flutter_frontend_server/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 5 additions & 4 deletions impeller/tessellator/dart/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ environment:
# 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
Expand Down
1 change: 0 additions & 1 deletion shell/vmservice/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ import("//flutter/build/dart/rules.gni")
# 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"
}
8 changes: 7 additions & 1 deletion shell/vmservice/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 22ab152

Please sign in to comment.