From 14ebd5d35d6b07b3073ba1284e7be0a8b7642be1 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 30 Jul 2024 14:30:40 -0700 Subject: [PATCH 1/3] Migrate the remaining real pub packages to pub workspaces. --- flutter_frontend_server/pubspec.yaml | 32 ++++---------------------- impeller/tessellator/dart/pubspec.yaml | 9 ++++---- pubspec.yaml | 3 +++ shell/vmservice/pubspec.yaml | 8 ++++++- 4 files changed, 20 insertions(+), 32 deletions(-) diff --git a/flutter_frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml index d4aac02c4f8f3..e871ad59ab11b 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 12ec6ec21b003..ef84e428bd7db 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 f435f5ba1d308..171e51258b8b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -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 diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml index c3cffd9d83aad..0580a7281b6f6 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 + From c8e48028b6f2fe0a5c631170285ce43e007b7c20 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 30 Jul 2024 14:46:12 -0700 Subject: [PATCH 2/3] ++ --- shell/vmservice/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/vmservice/BUILD.gn b/shell/vmservice/BUILD.gn index becc886597fb4..aada8b71800fd 100644 --- a/shell/vmservice/BUILD.gn +++ b/shell/vmservice/BUILD.gn @@ -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" } From 4ba770f4859c4d1e9fe37e2ddf2a86bf470ff827 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 30 Jul 2024 15:11:02 -0700 Subject: [PATCH 3/3] ++ --- ci/licenses_golden/excluded_files | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 20ea853f642db..6277a94c27890 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