From c8fefe4ed0b738bf0fba592bbb27b34da120b459 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Thu, 16 Jul 2020 12:16:02 -0700 Subject: [PATCH] [null-safety] remove package references from flutter frontend-server test, ci analyze (flutter/engine#19810) --- engine/src/flutter/ci/analyze.sh | 8 ++--- .../fixtures/.dart_tool/package_config.json | 11 +++++++ .../test/fixtures/.gitignore | 2 +- .../test/fixtures/.packages | 2 -- .../test/to_string_test.dart | 6 ++-- .../.dart_tool/package_config.json | 33 ++++++++++--------- .../src/flutter/tools/const_finder/.packages | 2 +- .../src/flutter/tools/licenses/pubspec.yaml | 5 +-- 8 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 engine/src/flutter/flutter_frontend_server/test/fixtures/.dart_tool/package_config.json delete mode 100644 engine/src/flutter/flutter_frontend_server/test/fixtures/.packages diff --git a/engine/src/flutter/ci/analyze.sh b/engine/src/flutter/ci/analyze.sh index abe21ef7307..536d9332898 100755 --- a/engine/src/flutter/ci/analyze.sh +++ b/engine/src/flutter/ci/analyze.sh @@ -21,7 +21,7 @@ fi echo "Analyzing flutter_frontend_server..." RESULTS=`dartanalyzer \ - --packages=flutter/flutter_frontend_server/.packages \ + --packages=flutter/flutter_frontend_server/.dart_tool/package_config.json \ --options flutter/analysis_options.yaml \ flutter/flutter_frontend_server \ 2>&1 \ @@ -36,7 +36,7 @@ fi echo "Analyzing tools/licenses..." (cd flutter/tools/licenses && pub get) RESULTS=`dartanalyzer \ - --packages=flutter/tools/licenses/.packages \ + --packages=flutter/tools/licenses/.dart_tool/package_config.json \ --options flutter/tools/licenses/analysis_options.yaml \ flutter/tools/licenses \ 2>&1 \ @@ -53,7 +53,7 @@ flutter/tools/gn --unoptimized ninja -C out/host_debug_unopt sky_engine sky_services (cd flutter/testing/dart && pub get) RESULTS=`dartanalyzer \ - --packages=flutter/testing/dart/.packages \ + --packages=flutter/testing/dart/.dart_tool/package_config.json \ --options flutter/analysis_options.yaml \ flutter/testing/dart \ 2>&1 \ @@ -68,7 +68,7 @@ fi echo "Analyzing testing/scenario_app..." (cd flutter/testing/scenario_app && pub get) RESULTS=`dartanalyzer \ - --packages=flutter/testing/scenario_app/.packages \ + --packages=flutter/testing/scenario_app/.dart_tool/package_config.json \ --options flutter/analysis_options.yaml \ flutter/testing/scenario_app \ 2>&1 \ diff --git a/engine/src/flutter/flutter_frontend_server/test/fixtures/.dart_tool/package_config.json b/engine/src/flutter/flutter_frontend_server/test/fixtures/.dart_tool/package_config.json new file mode 100644 index 00000000000..3ef4faffb74 --- /dev/null +++ b/engine/src/flutter/flutter_frontend_server/test/fixtures/.dart_tool/package_config.json @@ -0,0 +1,11 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "flutter_frontend_fixtures", + "rootUri": "../", + "packageUri": "lib", + "languageVersion": "2.2" + } + ] +} diff --git a/engine/src/flutter/flutter_frontend_server/test/fixtures/.gitignore b/engine/src/flutter/flutter_frontend_server/test/fixtures/.gitignore index 160ff889221..0a2903304a5 100644 --- a/engine/src/flutter/flutter_frontend_server/test/fixtures/.gitignore +++ b/engine/src/flutter/flutter_frontend_server/test/fixtures/.gitignore @@ -1 +1 @@ -!.packages +!.dart_tool diff --git a/engine/src/flutter/flutter_frontend_server/test/fixtures/.packages b/engine/src/flutter/flutter_frontend_server/test/fixtures/.packages deleted file mode 100644 index 6164a98c24f..00000000000 --- a/engine/src/flutter/flutter_frontend_server/test/fixtures/.packages +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by pub on 2020-01-15 10:08:29.776333. -flutter_frontend_fixtures:lib/ diff --git a/engine/src/flutter/flutter_frontend_server/test/to_string_test.dart b/engine/src/flutter/flutter_frontend_server/test/to_string_test.dart index 406d595716a..6391cfcc68d 100644 --- a/engine/src/flutter/flutter_frontend_server/test/to_string_test.dart +++ b/engine/src/flutter/flutter_frontend_server/test/to_string_test.dart @@ -246,7 +246,7 @@ void main(List args) async { final String basePath = path.canonicalize(path.join(path.dirname(Platform.script.path), '..')); final String fixtures = path.join(basePath, 'test', 'fixtures'); final String mainDart = path.join(fixtures, 'lib', 'main.dart'); - final String dotPackages = path.join(fixtures, '.packages'); + final String packageConfig = path.join(fixtures, '.dart_tool', 'package_config.json'); final String regularDill = path.join(fixtures, 'toString.dill'); final String transformedDill = path.join(fixtures, 'toStringTransformed.dill'); @@ -264,7 +264,7 @@ void main(List args) async { frontendServer, '--sdk-root=$sdkRoot', '--target=flutter', - '--packages=$dotPackages', + '--packages=$packageConfig', '--output-dill=$regularDill', mainDart, ])); @@ -288,7 +288,7 @@ void main(List args) async { frontendServer, '--sdk-root=$sdkRoot', '--target=flutter', - '--packages=$dotPackages', + '--packages=$packageConfig', '--output-dill=$transformedDill', '--delete-tostring-package-uri', 'dart:ui', '--delete-tostring-package-uri', 'package:flutter_frontend_fixtures', diff --git a/engine/src/flutter/tools/const_finder/.dart_tool/package_config.json b/engine/src/flutter/tools/const_finder/.dart_tool/package_config.json index c0548411d61..6e22210f30a 100644 --- a/engine/src/flutter/tools/const_finder/.dart_tool/package_config.json +++ b/engine/src/flutter/tools/const_finder/.dart_tool/package_config.json @@ -2,34 +2,37 @@ "configVersion": 2, "packages": [ { - "name": "const_finder", - "rootUri": "../", - "packageUri": "lib", - "languageVersion": "2.4" + "name": "args", + "rootUri": "../../../../third_party/dart/third_party/pkg/args", + "packageUri": "lib/", + "languageVersion": "2.3" }, { "name": "kernel", "rootUri": "../../../../third_party/dart/pkg/kernel", - "packageUri": "lib", + "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "meta", "rootUri": "../../../../third_party/dart/pkg/meta", - "packageUri": "lib", + "packageUri": "lib/", "languageVersion": "2.9" }, - { - "name": "args", - "rootUri": "../../../../third_party/dart/third_party/pkg/args", - "packageUri": "lib", - "languageVersion": "2.3" - }, { "name": "path", "rootUri": "../../../../third_party/dart/third_party/pkg/path", - "packageUri": "lib", + "packageUri": "lib/", "languageVersion": "2.0" + }, + { + "name": "const_finder", + "rootUri": "../", + "packageUri": "lib/", + "languageVersion": "2.4" } - ] -} \ No newline at end of file + ], + "generated": "2020-07-16T17:06:29.414763Z", + "generator": "pub", + "generatorVersion": "2.9.0-21.0.dev.flutter-89fe12b12a" +} diff --git a/engine/src/flutter/tools/const_finder/.packages b/engine/src/flutter/tools/const_finder/.packages index 2a698fd32e8..68fe4139fef 100644 --- a/engine/src/flutter/tools/const_finder/.packages +++ b/engine/src/flutter/tools/const_finder/.packages @@ -1,4 +1,4 @@ -# Generated by pub on 2020-01-16 11:11:54.947929. +# Generated by pub on 2020-07-16 10:06:29.401548. args:../../../third_party/dart/third_party/pkg/args/lib/ kernel:../../../third_party/dart/pkg/kernel/lib/ meta:../../../third_party/dart/pkg/meta/lib/ diff --git a/engine/src/flutter/tools/licenses/pubspec.yaml b/engine/src/flutter/tools/licenses/pubspec.yaml index 91ba3b11b7d..8d517ee3e1c 100644 --- a/engine/src/flutter/tools/licenses/pubspec.yaml +++ b/engine/src/flutter/tools/licenses/pubspec.yaml @@ -1,9 +1,10 @@ name: licenses +environment: + sdk: '>=2.8.0 <3.0.0' + dependencies: archive: ^2.0.4 args: 1.5.0 crypto: ^2.0.2+1 meta: ^1.1.6 path: ^1.3.0 -environment: - sdk: '>=2.3.0 <3.0.0'