DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[null-safety] remove package references from flutter frontend-server test, ci analyze (flutter/engine#19810)

Browse Source
This commit is contained in:
Jonah Williams 2020-07-16 12:16:02 -07:00 committed by GitHub
parent 132bfaa975
commit c8fefe4ed0
8 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/flutter/ci/analyze.sh
View File

@ -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 \

11
engine/src/flutter/flutter_frontend_server/test/fixtures/.dart_tool/package_config.json vendored Normal file
View File

@ -0,0 +1,11 @@
{
"configVersion": 2,
"packages": [
{
"name": "flutter_frontend_fixtures",
"rootUri": "../",
"packageUri": "lib",
"languageVersion": "2.2"
}
]
}

2
engine/src/flutter/flutter_frontend_server/test/fixtures/.gitignore vendored
View File

@ -1 +1 @@
!.packages
!.dart_tool

2
engine/src/flutter/flutter_frontend_server/test/fixtures/.packages vendored
View File

@ -1,2 +0,0 @@
# Generated by pub on 2020-01-15 10:08:29.776333.
flutter_frontend_fixtures:lib/

6
engine/src/flutter/flutter_frontend_server/test/to_string_test.dart
View File

@ -246,7 +246,7 @@ void main(List<String> 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<String> args) async {
frontendServer,
'--sdk-root=$sdkRoot',
'--target=flutter',
'--packages=$dotPackages',
'--packages=$packageConfig',
'--output-dill=$regularDill',
mainDart,
]));
@ -288,7 +288,7 @@ void main(List<String> 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',

33
engine/src/flutter/tools/const_finder/.dart_tool/package_config.json
View File

@ -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"
}
]
}
],
"generated": "2020-07-16T17:06:29.414763Z",
"generator": "pub",
"generatorVersion": "2.9.0-21.0.dev.flutter-89fe12b12a"
}

2
engine/src/flutter/tools/const_finder/.packages
View File

@ -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/

5
engine/src/flutter/tools/licenses/pubspec.yaml
View File

@ -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'