Merge pull request #5 from flutter/master

Updating my flutter fork to master.

Author: gspencergoog

.travis.yml

@@ -22,7 +22,8 @@ env:
 before_script:
   - ./dev/bots/travis_setup.sh
 script:
-  - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart && ./dev/bots/travis_upload.sh)
+  # TODO(tvolkert): Re-enable `&& ./dev/bots/travis_upload.sh`
+  - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart)
 cache:
   directories:
     - $HOME/.pub-cache

CONTRIBUTING.md

@@ -8,7 +8,7 @@ _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#cod
 Things you will need
 --------------------
 
- * Linux or Mac OS X. (Windows is not yet supported.)
+ * Linux, Mac OS X, or Windows
  * git (used for source version control).
  * An IDE. We recommend [IntelliJ with the Flutter plugin](https://flutter.io/intellij-ide/).
  * An ssh client (used to authenticate with GitHub).
@@ -92,6 +92,8 @@ assume you want to check a single package and the flutter repository has several
 Running the tests
 -----------------
 
+_The `flutter test` command is not available on Windows (See [#8516](https://github.com/flutter/flutter/issues/8516))._
+
 To automatically find all files named `_test.dart` inside a package's `test/` subdirectory, and run them inside the flutter shell as a test, use the `flutter test` command, e.g:
 
  * `cd examples/stocks`

VERSION

@@ -6,4 +6,4 @@
 # incompatible way, this version number might not change. Instead, the version
 # number for package:flutter will update to reflect that change.
 
-0.0.11-dev
+0.0.12-dev

bin/internal/dart-sdk.version

@@ -1 +1 @@
-1.24.0-dev.6.7
+1.24.0

bin/internal/engine.version

@@ -1 +1 @@
-fffe502d437ac7931f08c6cef3e3f71fbd36adaa
+8a2d337446ca076048608c6b6a932110e7c0f9c9

bin/internal/gradle_wrapper.version

@@ -0,0 +1 @@
+0b5c1398d1d04ac245a310de98825cb7b3278e2a

dev/benchmarks/microbenchmarks/lib/stocks/animation_bench.dart

@@ -35,7 +35,7 @@ class BenchmarkingBinding extends LiveTestWidgetsFlutterBinding {
 
 Future<Null> main() async {
   assert(false); // don't run this in checked mode! Use --release.
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   final Stopwatch wallClockWatch = new Stopwatch();
   final Stopwatch cpuWatch = new Stopwatch();

dev/benchmarks/microbenchmarks/lib/stocks/build_bench.dart

@@ -17,7 +17,7 @@ const Duration kBenchmarkTime = const Duration(seconds: 15);
 
 Future<Null> main() async {
   assert(false); // don't run this in checked mode! Use --release.
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   // This allows us to call onBeginFrame even when the engine didn't request it,
   // and have it actually do something:

dev/benchmarks/microbenchmarks/lib/stocks/layout_bench.dart

@@ -16,7 +16,7 @@ import '../common.dart';
 const Duration kBenchmarkTime = const Duration(seconds: 15);
 
 Future<Null> main() async {
-  stock_data.StockDataFetcher.actuallyFetchData = false;
+  stock_data.StockData.actuallyFetchData = false;
 
   // This allows us to call onBeginFrame even when the engine didn't request it,
   // and have it actually do something:

dev/bots/docs.sh

@@ -14,7 +14,7 @@ bin/cache/dart-sdk/bin/pub global activate dartdoc 0.13.0+1
 # a custom index.html, placing everything into dev/docs/doc.
 (cd dev/tools; ../../bin/cache/dart-sdk/bin/pub get)
 FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/dartdoc.dart
-FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/javadoc.dart
+FLUTTER_ROOT=$PWD bin/cache/dart-sdk/bin/dart dev/tools/java_and_objc_doc.dart
 
 # Ensure google webmaster tools can verify our site.
 cp dev/docs/google2ed1af765c529f57.html dev/docs/doc