languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-04 16:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change SDK to use package_config v1.9 (unreleased).

Browse source 
Change-Id: I405ac5e59d0b330c6fc6c63fab48d2d303734e59
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/136123
Commit-Queue: Lasse R.H. Nielsen <lrn@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>
This commit is contained in:
Lasse R.H. Nielsen 2020-02-18 10:56:59 +00:00 committed by commit-bot@chromium.org
parent 2a49768f15
commit 3f28a3496c
13 changed files with 25 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.packages
View file

@ -74,7 +74,6 @@ oauth2:third_party/pkg/oauth2/lib
observatory:runtime/observatory/lib
observatory_test_package:runtime/observatory/tests/service/observatory_test_package
package_config:third_party/pkg_tested/package_config/lib
package_config_v2:third_party/pkg/package_config_v2/lib
package_resolver:third_party/pkg_tested/package_resolver/lib
path:third_party/pkg/path/lib
pedantic:third_party/pkg/pedantic/lib

8
DEPS
View file

@ -106,14 +106,13 @@ vars = {
"logging_tag": "0.11.3+2",
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
"markdown_tag": "2.1.1",
"matcher_tag": "0.12.3",
"matcher_tag": "0.12.5",
"mime_tag": "0.9.6+2",
"mockito_tag": "d39ac507483b9891165e422ec98d9fb480037c8b",
"mustache_tag" : "5e81b12215566dbe2473b2afd01a8a8aedd56ad9",
"oauth2_tag": "1.2.1",
"observatory_pub_packages_rev": "0894122173b0f98eb08863a7712e78407d4477bc",
"package_config_tag": "2453cd2e78c2db56ee2669ced17ce70dd00bf576", # should be 1.1.0
"package_config_v2_tag": "8e776a8b05951d4104aa101151df26a2c5ac931f", # should be 3.0
"package_config_tag": "3401e2897b3cf46e64966e2ba19ed7032501cf41", # should be 1.9.0
"package_resolver_tag": "1.0.10",
"path_tag": "1.6.2",
"pedantic_tag": "v1.8.0",
@ -342,9 +341,6 @@ deps = {
Var("dart_root") + "/third_party/pkg_tested/package_config":
Var("dart_git") + "package_config.git" +
"@" + Var("package_config_tag"),
Var("dart_root") + "/third_party/pkg/package_config_v2":
Var("dart_git") + "package_config.git" +
"@" + Var("package_config_v2_tag"),
Var("dart_root") + "/third_party/pkg_tested/package_resolver":
Var("dart_git") + "package_resolver.git"
+ "@" + Var("package_resolver_tag"),

2
pkg/front_end/lib/src/base/processed_options.dart
View file

@ -17,7 +17,7 @@ import 'package:kernel/kernel.dart' show CanonicalName, Component, Location;
import 'package:kernel/target/targets.dart'
show NoneTarget, Target, TargetFlags;
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import '../api_prototype/compiler_options.dart'
show CompilerOptions, DiagnosticMessage;

3
pkg/front_end/lib/src/fasta/incremental_compiler.dart
View file

@ -43,8 +43,7 @@ import 'package:kernel/kernel.dart' as kernel show Combinator;
import 'package:kernel/target/changed_structure_notifier.dart'
show ChangedStructureNotifier;
import 'package:package_config_v2/package_config.dart'
show Package, PackageConfig;
import 'package:package_config/package_config.dart' show Package, PackageConfig;
import '../api_prototype/file_system.dart' show FileSystem, FileSystemEntity;

2
pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
View file

@ -51,7 +51,7 @@ import 'package:kernel/target/changed_structure_notifier.dart'
import 'package:kernel/target/targets.dart' show DiagnosticReporter;
import 'package:kernel/type_environment.dart' show TypeEnvironment;
import 'package:kernel/verifier.dart' show verifyGetStaticType;
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import '../../api_prototype/file_system.dart' show FileSystem;

2
pkg/front_end/lib/src/fasta/loader.dart
View file

@ -11,7 +11,7 @@ import 'dart:collection' show Queue;
import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity;
import 'package:kernel/ast.dart' show Class, DartType, Library;
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import 'scope.dart';

2
pkg/front_end/lib/src/fasta/uri_translator.dart
View file

@ -6,7 +6,7 @@ library fasta.uri_translator;
import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity;
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import '../base/libraries_specification.dart' show TargetLibrariesSpecification;
import 'compiler_context.dart' show CompilerContext;

4
pkg/front_end/pubspec.yaml
View file

@ -10,8 +10,8 @@ environment:
dependencies:
_fe_analyzer_shared: 1.0.0
kernel: 0.3.29
package_config_v2:
path: ../../third_party/pkg/package_config_v2/
package_config:
path: ../../third_party/pkg_tested/package_config/
meta: ^1.0.2
dev_dependencies:
analyzer: 0.39.1

18
pkg/front_end/test/deps_test.dart
View file

@ -21,14 +21,16 @@ final Uri repoDir = computeRepoDirUri();
Set<String> whitelistedExternalDartFiles = {
"third_party/pkg/charcode/lib/ascii.dart",
"third_party/pkg/package_config_v2/lib/package_config.dart",
"third_party/pkg/package_config_v2/lib/src/discovery.dart",
"third_party/pkg/package_config_v2/lib/src/errors.dart",
"third_party/pkg/package_config_v2/lib/src/package_config_impl.dart",
"third_party/pkg/package_config_v2/lib/src/package_config_json.dart",
"third_party/pkg/package_config_v2/lib/src/package_config.dart",
"third_party/pkg/package_config_v2/lib/src/packages_file.dart",
"third_party/pkg/package_config_v2/lib/src/util.dart",
"third_party/pkg_tested/package_config/lib/package_config.dart",
"third_party/pkg_tested/package_config/lib/package_config_types.dart",
"third_party/pkg_tested/package_config/lib/src/discovery.dart",
"third_party/pkg_tested/package_config/lib/src/errors.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_impl.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_io.dart",
"third_party/pkg_tested/package_config/lib/src/package_config_json.dart",
"third_party/pkg_tested/package_config/lib/src/package_config.dart",
"third_party/pkg_tested/package_config/lib/src/packages_file.dart",
"third_party/pkg_tested/package_config/lib/src/util.dart",
// TODO(CFE-team): This file should not be included.
// The package isn't even in pubspec.yaml.

2
pkg/front_end/test/fasta/uri_translator_test.dart
View file

@ -4,7 +4,7 @@
import 'package:front_end/src/base/libraries_specification.dart';
import 'package:front_end/src/fasta/uri_translator.dart';
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';

2
pkg/front_end/test/lint_suite.dart
View file

@ -25,7 +25,7 @@ import 'package:front_end/src/fasta/command_line_reporting.dart'
import 'package:kernel/kernel.dart';
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import 'package:testing/testing.dart'
show Chain, ChainContext, Result, Step, TestDescription, runMe;

2
pkg/front_end/test/src/base/processed_options_test.dart
View file

@ -13,7 +13,7 @@ import 'package:front_end/src/fasta/fasta_codes.dart';
import 'package:kernel/binary/ast_to_binary.dart' show BinaryPrinter;
import 'package:kernel/kernel.dart'
show CanonicalName, Library, Component, loadComponentFromBytes;
import 'package:package_config_v2/package_config.dart';
import 'package:package_config/package_config.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';

15
tools/patches/flutter-engine/0299903f3e78ab6eb1d7d5ed1a70a039b3646913.patch
View file

@ -2,21 +2,12 @@ diff --git a/DEPS b/DEPS
index f2b3cc9..88557e8 100644
--- a/DEPS
+++ b/DEPS
@@ -72,6 +72,7 @@ vars = {
@@ -72,6 +72,6 @@ vars = {
'dart_oauth2_tag': '1.2.1',
'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc',
'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576',
+ 'dart_package_config_v2_tag': '8e776a8b05951d4104aa101151df26a2c5ac931f',
- 'dart_package_config_tag': '2453cd2e78c2db56ee2669ced17ce70dd00bf576',
+ 'dart_package_config_tag': '3401e2897b3cf46e64966e2ba19ed7032501cf41',
'dart_package_resolver_tag': '1.0.10',
'dart_path_tag': '1.6.2',
'dart_pedantic_tag': 'v1.8.0',
@@ -373,6 +374,9 @@ deps = {
'src/third_party/dart/third_party/pkg_tested/package_config':
Var('dart_git') + '/package_config.git' + '@' + Var('dart_package_config_tag'),
+ 'src/third_party/dart/third_party/pkg/package_config_v2':
+ Var('dart_git') + '/package_config.git' + '@' + Var('dart_package_config_v2_tag'),
+
'src/third_party/dart/third_party/pkg_tested/package_resolver':
Var('dart_git') + '/package_resolver.git' + '@' + Var('dart_package_resolver_tag'),