github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

pubspec normalization; remove den

Browse Source
This commit is contained in:
Devon Carew 2016-04-01 08:33:22 -07:00
parent 4cc9416bf2
commit 18d29583d0
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_driver/pubspec.yaml
View File

@ -17,6 +17,6 @@ dependencies:
path: '../flutter_test' path: '../flutter_test'
dev_dependencies: dev_dependencies:
test: '>=0.12.6 <1.0.0' test: 0.12.13
mockito: ^0.11.0 mockito: ^0.11.0
quiver: '>=0.21.4 <0.22.0' quiver: ^0.21.4

15
packages/flutter_tools/lib/executable.dart
View File

@ -98,11 +98,18 @@ Future<Null> main(List<String> args) async {
stderr.writeln(); stderr.writeln();
stderr.writeln('Oops; flutter has exited unexpectedly: "$error"'); stderr.writeln('Oops; flutter has exited unexpectedly: "$error"');
File file = _createCrashReport(args, error, chain);
stderr.writeln(); stderr.writeln();
stderr.writeln('Crash report written to ${path.relative(file.path)}.');
stderr.writeln('Please let us know at https://github.com/flutter/flutter/issues!'); if (Platform.environment.containsKey('FLUTTER_DEV')) {
// If we're working in the tools themselves, just print the stack trace.
stderr.writeln(chain.terse.toString());
} else {
File file = _createCrashReport(args, error, chain);
stderr.writeln('Crash report written to ${path.relative(file.path)}.');
stderr.writeln('Please let us know at https://github.com/flutter/flutter/issues!');
}
exit(1); exit(1);
} }
}); });

10
packages/flutter_tools/lib/src/commands/analyze.dart
View File

@ -7,7 +7,7 @@ import 'dart:collection';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:den_api/den_api.dart'; import 'package:yaml/yaml.dart' as yaml;
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import '../artifacts.dart'; import '../artifacts.dart';
@ -123,9 +123,7 @@ class AnalyzeCommand extends FlutterCommand {
bool get requiresProjectRoot => false; bool get requiresProjectRoot => false;
@override @override
Future<int> runInProject() async { Future<int> runInProject() => argResults['watch'] ? _analyzeWatch() : _analyzeOnce();
return argResults['watch'] ? _analyzeWatch() : _analyzeOnce();
}
List<String> flutterRootComponents; List<String> flutterRootComponents;
bool isFlutterLibrary(String filename) { bool isFlutterLibrary(String filename) {
@ -243,8 +241,8 @@ class AnalyzeCommand extends FlutterCommand {
// we are analyzing the actual canonical source for this package; // we are analyzing the actual canonical source for this package;
// make sure we remember that, in case all the packages are actually // make sure we remember that, in case all the packages are actually
// pointing elsewhere somehow. // pointing elsewhere somehow.
Pubspec pubSpecYaml = await Pubspec.load(pubSpecYamlPath); yaml.YamlMap pubSpecYaml = yaml.loadYaml(new File(pubSpecYamlPath).readAsStringSync());
String packageName = pubSpecYaml.name; String packageName = pubSpecYaml['name'];
String packagePath = path.normalize(path.absolute(path.join(directory.path, 'lib'))); String packagePath = path.normalize(path.absolute(path.join(directory.path, 'lib')));
dependencies.addCanonicalCase(packageName, packagePath, pubSpecYamlPath); dependencies.addCanonicalCase(packageName, packagePath, pubSpecYamlPath);
} }

1
packages/flutter_tools/pubspec.yaml
View File

@ -12,7 +12,6 @@ dependencies:
archive: ^1.0.20 archive: ^1.0.20
args: ^0.13.4 args: ^0.13.4
crypto: 0.9.2 crypto: 0.9.2
den_api: ^0.1.0
file: ^0.1.0 file: ^0.1.0
json_schema: ^1.0.3 json_schema: ^1.0.3
mustache4dart: ^1.0.0 mustache4dart: ^1.0.0