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

Bump Dart SDK to 1.20.0-dev.10.0. (#6212)

Browse Source 
* Bump Dart SDK to `1.20.0-dev.10.0`.

`1.20.0-dev.10.0` corresponds to `1.20-RC0`.

* pubspec.lock cleanup

* check for pubspec.lock existence

* cleaned up conditional remove
This commit is contained in:
Phil Quitslund 2016-10-05 09:05:15 -07:00 committed by GitHub
parent 95fa9e3c55
commit e44f6fe478
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cache/dart-sdk.version vendored
View File

@ -1 +1 @@
1.20.0-dev.5.0 1.20.0-dev.10.0

2
bin/flutter
View File

@ -41,7 +41,7 @@ DART="$DART_SDK_PATH/bin/dart"
echo Building flutter tool... echo Building flutter tool...
FLUTTER_DIR="$FLUTTER_ROOT/packages/flutter" FLUTTER_DIR="$FLUTTER_ROOT/packages/flutter"
(cd "$FLUTTER_TOOLS_DIR"; "../../bin/cache/dart-sdk/bin/pub" get --verbosity=error --no-packages-dir) (cd "$FLUTTER_TOOLS_DIR"; rm -f pubspec.lock; "../../bin/cache/dart-sdk/bin/pub" get --verbosity=error --no-packages-dir)
"$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
echo $REVISION > "$STAMP_PATH" echo $REVISION > "$STAMP_PATH"
fi fi

3
packages/flutter/lib/src/rendering/binding.dart
View File

@ -222,7 +222,8 @@ abstract class RendererBinding extends BindingBase implements SchedulerBinding,
void hitTest(HitTestResult result, Point position) { void hitTest(HitTestResult result, Point position) {
assert(renderView != null); assert(renderView != null);
renderView.hitTest(result, position: position); renderView.hitTest(result, position: position);
super.hitTest(result, position); // This super call is safe since it will be bound to a mixed-in declaration.
super.hitTest(result, position); //ignore: abstract_super_member_reference
} }
void _forceRepaint() { void _forceRepaint() {

2
packages/flutter_tools/lib/src/dart/analysis.dart
View File

@ -5,6 +5,7 @@
import 'dart:collection'; import 'dart:collection';
import 'dart:io'; import 'dart:io';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/file_system/file_system.dart' as file_system; import 'package:analyzer/file_system/file_system.dart' as file_system;
import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/plugin/options.dart'; import 'package:analyzer/plugin/options.dart';
@ -14,7 +15,6 @@ import 'package:analyzer/source/package_map_resolver.dart';
import 'package:analyzer/src/context/builder.dart'; // ignore: implementation_imports import 'package:analyzer/src/context/builder.dart'; // ignore: implementation_imports
import 'package:analyzer/src/dart/sdk/sdk.dart'; // ignore: implementation_imports import 'package:analyzer/src/dart/sdk/sdk.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/engine.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/engine.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/error.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/java_io.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/java_io.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/source.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/source.dart'; // ignore: implementation_imports
import 'package:analyzer/src/generated/source_io.dart'; // ignore: implementation_imports import 'package:analyzer/src/generated/source_io.dart'; // ignore: implementation_imports

6
packages/flutter_tools/lib/src/dart/summary.dart
View File

@ -72,11 +72,9 @@ void buildSkyEngineSdkSummary(
// //
// Build. // Build.
// //
SummaryBuildConfig config = new SummaryBuildConfig(strongMode: true); List<int> bytes = new SummaryBuilder(sources, sdk.context, true).build();
BuilderOutput output =
new SummaryBuilder(sources, sdk.context, config).build();
String outputPath = pathos.join(skyEnginePath, outBundleName); String outputPath = pathos.join(skyEnginePath, outBundleName);
new io.File(outputPath).writeAsBytesSync(output.sum); new io.File(outputPath).writeAsBytesSync(bytes);
} }
Future<Null> buildUnlinkedForPackages(String flutterPath) async { Future<Null> buildUnlinkedForPackages(String flutterPath) async {