Use SDK sources to refer to our own packages (#6001)
Switch our pubspec.yamls to using SDK sources so that we can have consistent source types when we depend on these packages from external packages using SDK sources.
This commit is contained in:
parent
07416d5372
commit
c1a2967430
@ -1,6 +1,6 @@
|
|||||||
name: flutter_automated_tests
|
name: flutter_automated_tests
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -3,10 +3,11 @@ description: A new flutter project.
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../../packages/flutter
|
sdk: flutter
|
||||||
flutter_driver:
|
flutter_driver:
|
||||||
path: ../../../packages/flutter_driver
|
sdk: flutter
|
||||||
# Also update examples/flutter_gallery/pubspec.yaml
|
|
||||||
|
# Also examples/flutter_gallery/pubspec.yaml
|
||||||
flutter_gallery_assets:
|
flutter_gallery_assets:
|
||||||
git:
|
git:
|
||||||
url: https://flutter.googlesource.com/gallery-assets
|
url: https://flutter.googlesource.com/gallery-assets
|
||||||
@ -14,4 +15,4 @@ dependencies:
|
|||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -2,8 +2,8 @@ name: microbenchmarks
|
|||||||
description: A new flutter project.
|
description: A new flutter project.
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../../packages/flutter
|
sdk: flutter
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../../packages/flutter_test
|
sdk: flutter
|
||||||
stocks:
|
stocks:
|
||||||
path: ../../../examples/stocks
|
path: ../../../examples/stocks
|
||||||
|
@ -10,7 +10,7 @@ pub global activate dartdoc 0.9.7+1
|
|||||||
|
|
||||||
# This script generates a unified doc set, and creates
|
# This script generates a unified doc set, and creates
|
||||||
# a custom index.html, placing everything into dev/docs/doc
|
# a custom index.html, placing everything into dev/docs/doc
|
||||||
dart dev/tools/dartdoc.dart
|
FLUTTER_ROOT=$PWD dart dev/tools/dartdoc.dart
|
||||||
|
|
||||||
# Ensure google webmaster tools can verify our site.
|
# Ensure google webmaster tools can verify our site.
|
||||||
cp dev/docs/google2ed1af765c529f57.html dev/docs/doc
|
cp dev/docs/google2ed1af765c529f57.html dev/docs/doc
|
||||||
@ -22,4 +22,4 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
|
|||||||
cd dev/docs
|
cd dev/docs
|
||||||
firebase deploy --project docs-flutter-io
|
firebase deploy --project docs-flutter-io
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -28,11 +28,13 @@ if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
|
|||||||
COVERAGE_FLAG=--coverage
|
COVERAGE_FLAG=--coverage
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SRC_ROOT=$PWD
|
||||||
|
|
||||||
# run tests
|
# run tests
|
||||||
(cd packages/flutter; flutter test $COVERAGE_FLAG)
|
(cd packages/flutter; flutter test $COVERAGE_FLAG)
|
||||||
(cd packages/flutter_driver; dart -c test/all.dart)
|
(cd packages/flutter_driver; dart -c test/all.dart)
|
||||||
(cd packages/flutter_test; flutter test)
|
(cd packages/flutter_test; flutter test)
|
||||||
(cd packages/flutter_tools; dart -c test/all.dart)
|
(cd packages/flutter_tools; FLUTTER_ROOT=$SRC_ROOT dart -c test/all.dart)
|
||||||
|
|
||||||
(cd dev/devicelab; dart -c test/all.dart)
|
(cd dev/devicelab; dart -c test/all.dart)
|
||||||
(cd dev/manual_tests; flutter test)
|
(cd dev/manual_tests; flutter test)
|
||||||
|
@ -1,14 +1 @@
|
|||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
assets:
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/sun.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/clouds-0.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/clouds-1.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/ray.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/sun.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/weathersprites.json
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/weathersprites.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/icon-sun.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/icon-rain.png
|
|
||||||
- packages/flutter_gallery_assets/weather_demo/icon-snow.png
|
|
||||||
- packages/flutter_gallery_assets/fitness_demo/jumpingjack.json
|
|
||||||
- packages/flutter_gallery_assets/fitness_demo/jumpingjack.png
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
name: flutter_manual_tests
|
name: flutter_manual_tests
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: any # flutter_test provides the version constraints
|
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -30,7 +30,7 @@ dependencies:
|
|||||||
''');
|
''');
|
||||||
for (String package in findPackageNames()) {
|
for (String package in findPackageNames()) {
|
||||||
buf.writeln(' $package:');
|
buf.writeln(' $package:');
|
||||||
buf.writeln(' path: ../../packages/$package');
|
buf.writeln(' sdk: flutter');
|
||||||
}
|
}
|
||||||
new File('dev/docs/pubspec.yaml').writeAsStringSync(buf.toString());
|
new File('dev/docs/pubspec.yaml').writeAsStringSync(buf.toString());
|
||||||
|
|
||||||
@ -45,7 +45,12 @@ dependencies:
|
|||||||
new File('dev/docs/lib/temp_doc.dart').writeAsStringSync(contents.toString());
|
new File('dev/docs/lib/temp_doc.dart').writeAsStringSync(contents.toString());
|
||||||
|
|
||||||
// Run pub.
|
// Run pub.
|
||||||
Process process = await Process.start('pub', <String>['get'], workingDirectory: 'dev/docs');
|
Process process = await Process.start('pub', <String>['get'],
|
||||||
|
workingDirectory: 'dev/docs',
|
||||||
|
environment: <String, String>{
|
||||||
|
'FLUTTER_ROOT': Directory.current.path
|
||||||
|
}
|
||||||
|
);
|
||||||
printStream(process.stdout);
|
printStream(process.stdout);
|
||||||
printStream(process.stderr);
|
printStream(process.stderr);
|
||||||
int code = await process.exitCode;
|
int code = await process.exitCode;
|
||||||
|
@ -5,9 +5,10 @@ dependencies:
|
|||||||
string_scanner: ^1.0.0
|
string_scanner: ^1.0.0
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
flutter_markdown:
|
flutter_markdown:
|
||||||
path: ../../packages/flutter_markdown
|
sdk: flutter
|
||||||
|
|
||||||
# Also update dev/benchmarks/complex_layout/pubspec.yaml
|
# Also update dev/benchmarks/complex_layout/pubspec.yaml
|
||||||
flutter_gallery_assets:
|
flutter_gallery_assets:
|
||||||
git:
|
git:
|
||||||
@ -15,8 +16,7 @@ dependencies:
|
|||||||
ref: ef928550119411358b8b25e16aecde6ace513526
|
ref: ef928550119411358b8b25e16aecde6ace513526
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: any # flutter_test provides the version constraints
|
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
flutter_driver:
|
flutter_driver:
|
||||||
path: ../../packages/flutter_driver
|
sdk: flutter
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
name: hello_services
|
name: hello_services
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: any # flutter_test provides the version constraints
|
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
name: hello_world
|
name: hello_world
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: any # flutter_test provides the version constraints
|
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
name: flutter_examples_layers
|
name: flutter_examples_layers
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: any # flutter_test provides the version constraints
|
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
name: stocks
|
name: stocks
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../../packages/flutter
|
sdk: flutter
|
||||||
intl: '>=0.14.0 <0.15.0'
|
intl: '>=0.14.0 <0.15.0'
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../../packages/flutter_test
|
sdk: flutter
|
||||||
flutter_driver:
|
flutter_driver:
|
||||||
path: ../../packages/flutter_driver
|
sdk: flutter
|
||||||
|
@ -22,7 +22,7 @@ dependencies:
|
|||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../flutter_test
|
sdk: flutter
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=1.19.0 <2.0.0'
|
sdk: '>=1.19.0 <2.0.0'
|
||||||
|
@ -15,9 +15,9 @@ dependencies:
|
|||||||
web_socket_channel: '^1.0.0'
|
web_socket_channel: '^1.0.0'
|
||||||
vm_service_client: '^0.2.0'
|
vm_service_client: '^0.2.0'
|
||||||
flutter:
|
flutter:
|
||||||
path: '../flutter'
|
sdk: flutter
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: '../flutter_test'
|
sdk: flutter
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: 0.12.15+4
|
test: 0.12.15+4
|
||||||
|
@ -6,10 +6,10 @@ homepage: http://flutter.io
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: ../flutter
|
sdk: flutter
|
||||||
markdown: '^0.9.0'
|
markdown: '^0.9.0'
|
||||||
string_scanner: ^1.0.0
|
string_scanner: ^1.0.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
path: ../flutter_test
|
sdk: flutter
|
||||||
|
@ -8,4 +8,4 @@ dependencies:
|
|||||||
test: 0.12.15+4
|
test: 0.12.15+4
|
||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
path: ../flutter
|
sdk: flutter
|
||||||
|
@ -2,9 +2,9 @@ name: {{projectName}}
|
|||||||
description: {{description}}
|
description: {{description}}
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
path: {{flutterPackagesDirectory}}/flutter
|
sdk: flutter
|
||||||
{{#withDriverTest?}}
|
{{#withDriverTest?}}
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_driver:
|
flutter_driver:
|
||||||
path: {{flutterPackagesDirectory}}/flutter_driver
|
sdk: flutter
|
||||||
{{/withDriverTest?}}
|
{{/withDriverTest?}}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user