Merge pull request #1 from flutter/master

Updating Flutter fork

Author: Piinks

.cirrus.yml

@@ -10,6 +10,7 @@ task:
     PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
     ANDROID_SDK_ROOT: "/opt/android_sdk"
   git_fetch_script:
+    - git clean -xfd
     - git fetch origin
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
   pub_cache:
@@ -27,9 +28,9 @@ task:
       env:
         SHARD: docs
         # For uploading master docs to Firebase master branch staging site
-        FIREBASE_MASTER_TOKEN: ENCRYPTED[37e8b82f167864cae9a3f4d2cf3f37dea331d9375c295327c45de524f6c588fa6f6d63e5784f10f6d43ce29689f36c92]
+        FIREBASE_MASTER_TOKEN: ENCRYPTED[eb768d18798fdc5abfe09b224e1724c4d82831d715ccf90df2c79d618c317216cbd99493278361f6fe7948b409b603f0]
         # For uploading beta docs to Firebase public live site
-        FIREBASE_PUBLIC_TOKEN: ENCRYPTED[c422da192f06da7b4449ca8e7aa866dabeb8a0f8d7488497c2e7e447e6fd31d917e6c813db081dc4e2a7a63afdf41864]
+        FIREBASE_PUBLIC_TOKEN: ENCRYPTED[37e8b82f167864cae9a3f4d2cf3f37dea331d9375c295327c45de524f6c588fa6f6d63e5784f10f6d43ce29689f36c92]
       docs_script: ./dev/bots/docs.sh
     - name: deploy_gallery
       only_if: $CIRRUS_BRANCH == 'dev'
@@ -49,6 +50,7 @@ task:
         - dart --enable-asserts ./dev/bots/analyze.dart
     - name: tests-linux
       env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
         SHARD: tests
       test_script:
         - dart --enable-asserts ./dev/bots/test.dart
@@ -57,6 +59,7 @@ task:
         memory: 12G
     - name: tool_tests-linux
       env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
         SHARD: tool_tests
       test_script:
         - dart --enable-asserts ./dev/bots/test.dart
@@ -66,6 +69,9 @@ task:
     - name: build_tests-linux
       env:
         SHARD: build_tests
+    - name: integration_tests-linux
+      env:
+        SHARD: integration_tests
       test_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -83,21 +89,18 @@ task:
       container:
         cpu: 4
         memory: 12G
-    - name: codelabs-build-test
-      env:
-        SHARD: codelabs-build-test
-      build_test_script: ./dev/bots/codelabs_build_test.sh
 
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   windows_container:
-    image: cirrusci/windowsservercore:2016
+    image: cirrusci/android-sdk:28-windowsservercore-ltsc2016
     os_version: 2016
     cpu: 4
   env:
     CIRRUS_WORKING_DIR: "C:\\Windows\\Temp\\flutter sdk"
   git_fetch_script:
+    - git clean -xfd
     - git fetch origin
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
   pub_cache:
@@ -119,16 +122,24 @@ task:
   matrix:
     - name: tests-windows
       env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
         SHARD: tests
     - name: tool_tests-windows
       env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
         SHARD: tool_tests
     - name: build_tests-windows
       env:
         SHARD: build_tests
       container:
         cpu: 4
         memory: 12G
+    - name: integration_tests-windows
+      env:
+        SHARD: integration_tests
+      container:
+        cpu: 4
+        memory: 12G
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
@@ -141,6 +152,7 @@ task:
     - tests-macos
     - tool_tests-macos
     - build_tests-macos
+    - add2app-macos
   env:
     # Name the SDK directory to include a space so that we constantly
     # test path names with spaces in them.
@@ -155,8 +167,13 @@ task:
     # Private repo for publishing certificates.
     PUBLISHING_MATCH_CERTIFICATE_REPO: [email protected]:flutter/private_publishing_certificates.git
   osx_instance:
-    image: high-sierra-xcode-9.4.1
+    image: mojave-xcode-10.1
+  # occasionally the clock on these machines is out of sync
+  # with the actual time - this should help to verify
+  print_date_script:
+    - date
   git_fetch_script:
+    - git clean -xfd
     - git fetch origin
     - git fetch origin master # To set FETCH_HEAD
   setup_script:
@@ -168,14 +185,42 @@ task:
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: high-sierra-xcode-9.4.1
+    image: mojave-xcode-10.1
   depends_on:
     - analyze
   env:
     CIRRUS_WORKING_DIR: "/tmp/flutter sdk"
+    COCOAPODS_DISABLE_STATS: true
+  matrix:
+    - name: tests-macos
+      env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
+        SHARD: tests
+    - name: tool_tests-macos
+      env:
+        GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
+        SHARD: tool_tests
+    - name: $SHARD-macos
+      env:
+        matrix:
+          - SHARD: integration_tests
+          - SHARD: build_tests
+            COCOAPODS_DISABLE_STATS: true
+            FLUTTER_FRAMEWORK_DIR: "/tmp/flutter sdk/bin/cache/artifacts/engine/ios/"
+      osx_instance:
+        image: mojave-flutter
+      remove_preinstalled_fluuter_script: rm -rf $FLUTTER_HOME
+    - name: add2app-macos
+      env:
+        SHARD: add2app_test
+  # occasionally the clock on these machines is out of sync
+  # with the actual time - this should help to verify
+  print_date_script:
+    - date
   install_cocoapods_script:
     - sudo gem install cocoapods
   git_fetch_script:
+    - git clean -xfd
     - git fetch origin
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
   pub_cache:
@@ -193,22 +238,6 @@ task:
   test_all_script: |
     ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
     bin/cache/dart-sdk/bin/dart --enable-asserts dev/bots/test.dart
-  matrix:
-    - name: tests-macos
-      env:
-        SHARD: tests
-    - name: tool_tests-macos
-      env:
-        SHARD: tool_tests
-    - name: build_tests-macos
-      env:
-        SHARD: build_tests
-        COCOAPODS_DISABLE_STATS: true
-        FLUTTER_FRAMEWORK_DIR: "/tmp/flutter sdk/bin/cache/artifacts/engine/ios/"
-      container:
-        cpu: 4
-        memory: 12G
-
 
 docker_builder:
   # Only build a new docker image when we tag a release (for dev, beta, or release.)
@@ -221,7 +250,7 @@ docker_builder:
     - tests-linux
     - tool_tests-linux
     - build_tests-linux
+    - integration_tests-linux
   build_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_build.sh"
   login_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_login.sh"
   push_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_push.sh"
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,36 @@
+## Description
+
+*Replace this paragraph with a description of what this PR is doing. If you're modifying existing behavior, describe the existing behavior, how this PR is changing it, and what motivated the change. If you're changing visual properties, consider including before/after screenshots (and runnable code snippets to reproduce them).*
+
+## Related Issues
+
+*Replace this paragraph with a list of issues related to this PR from our [issue database]. Indicate, which of these issues are resolved or fixed by this PR.*
+
+## Checklist
+
+Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
+
+- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
+- [ ] My PR includes tests for *all* changed/updated/fixed behaviors (See [Test Coverage]).
+- [ ] All existing and new tests are passing.
+- [ ] I updated/added relevant documentation (doc comments with `///`).
+- [ ] The analyzer (`flutter analyze --flutter-repo`) does not report any problems on my PR.
+- [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
+- [ ] I signed the [CLA].
+- [ ] I am willing to follow-up on review comments in a timely manner.
+
+## Breaking Change
+
+Does your PR require Flutter developers to manually update their apps to accommodate your change?
+
+- [ ] Yes, this is a breaking change (Please read [Handling breaking changes]).
+- [ ] No, this is *not* a breaking change.
+
+<!-- Links -->
+[issue database]: https://github.com/flutter/flutter/issues
+[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
+[Test Coverage]: https://github.com/flutter/flutter/wiki/Test-coverage-for-package%3Aflutter
+[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
+[Features we expect every widget to implement]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#features-we-expect-every-widget-to-implement
+[CLA]: https://cla.developers.google.com/
+[Handling breaking changes]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes

.gitignore

@@ -32,6 +32,9 @@
 /packages/flutter/coverage/
 version
 
+# packages file containing multi-root paths
+.packages.generated
+
 # Flutter/Dart/Pub related
 **/doc/api/
 .dart_tool/

AUTHORS

@@ -32,8 +32,10 @@ Chema Molins <[email protected]>
 Stefan Mitev <[email protected]>
 Jasper van Riet <[email protected]>
 Mattijs Fuijkschot <[email protected]>
+Volodymyr Lykhonis <[email protected]>
 TruongSinh Tran-Nguyen <[email protected]>
 Sander Dalby Larsen <[email protected]>
 Marco Scannadinari <[email protected]>
 Frederik Schweiger <[email protected]>
 Martin Staadecker <[email protected]>
+Igor Katsuba <[email protected]>

README.md

@@ -9,10 +9,10 @@ Flutter is Google’s mobile app SDK for crafting high-quality native interfaces
 
 ### Documentation
 
-**Main site: [flutter.io][]**
-* [Install](https://flutter.io/get-started/install/)
-* [Get started](https://flutter.io/get-started/)
-* [API documentation](https://docs.flutter.io/)
+**Main site: [flutter.dev][]**
+* [Install](https://flutter.dev/get-started/install/)
+* [Get started](https://flutter.dev/get-started/)
+* [API documentation](https://docs.flutter.dev/)
 * [Changelog](https://github.com/flutter/flutter/wiki/Changelog)
 * [How to contribute](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
 
@@ -42,12 +42,12 @@ Cupertino (iOS-flavor) widgets, rich motion APIs,
 smooth natural scrolling, and platform awareness.
 
 [<img src="https://github.com/flutter/website/blob/master/src/images/homepage/screenshot-1.png" width="270" height="480" alt="Brand-first shopping design" align="left">](https://github.com/flutter/flutter/tree/master/examples/flutter_gallery/lib/demo/animation)
-[<img src="https://github.com/flutter/website/blob/master/src/images/homepage/screenshot-2.png" width="270" height="480" alt="Fitness app design">](https://github.com/flutter/posse_gallery)
+<img src="https://github.com/flutter/website/blob/master/src/images/homepage/screenshot-2.png" width="270" height="480" alt="Fitness app design">
 
 [<img src="https://github.com/flutter/website/blob/master/src/images/homepage/screenshot-3.png" width="270" height="480" alt="Contact app design" align="left">](https://github.com/flutter/flutter/blob/master/examples/flutter_gallery/lib/demo/contacts_demo.dart)
 [<img src="https://github.com/flutter/website/blob/master/src/images/homepage/ios-friendlychat.png" width="270" height="480" alt="iOS chat app design">](https://codelabs.developers.google.com/codelabs/flutter/)
 
-Browse the <a href="https://flutter.io/widgets/">widget catalog</a>.
+Browse the <a href="https://flutter.dev/widgets/">widget catalog</a>.
 
 ## Modern, reactive framework
 
@@ -89,9 +89,9 @@ class CounterState extends State<Counter> {
 }
 ```
 
-Browse the <a href="https://flutter.io/widgets/">widget catalog</a>
+Browse the <a href="https://flutter.dev/widgets/">widget catalog</a>
 and learn more about the
-<a href="https://flutter.io/widgets-intro/">functional-reactive framework</a>.
+<a href="https://flutter.dev/widgets-intro/">functional-reactive framework</a>.
 
 ## Access native features and SDKs
 
@@ -118,8 +118,8 @@ Future<void> getBatteryLevel() async {
 }
 ```
 
-Learn how to use <a href="https://flutter.io/using-packages/">packages</a> or
-write <a href="https://flutter.io/platform-channels/">platform channels</a>
+Learn how to use <a href="https://flutter.dev/using-packages/">packages</a> or
+write <a href="https://flutter.dev/platform-channels/">platform channels</a>
 to access native code, APIs, and SDKs.
 
 ## Unified app development
@@ -133,7 +133,7 @@ you can use Flutter for your views and leverage much of your
 existing Java/Kotlin/ObjC/Swift investment.
 
 Learn more about what makes Flutter special in the
-<a href="https://flutter.io/technical-overview/">technical overview</a>.
+<a href="https://flutter.dev/technical-overview/">technical overview</a>.
 
 # More resources
 
@@ -146,7 +146,7 @@ To join the team working on Flutter, see our [contributor guide](CONTRIBUTING.md
 
 [Build Status - Cirrus]: https://api.cirrus-ci.com/github/flutter/flutter.svg
 [Build status]: https://cirrus-ci.com/github/flutter/flutter/master
-[flutter.io]: https://flutter.io
+[flutter.dev]: https://flutter.dev
 [Flutter logo]: https://github.com/dart-lang/site-shared/blob/master/src/_assets/image/flutter/icon/64.png?raw=1
 [Gitter Channel]: https://badges.gitter.im/flutter/flutter.svg
-[Gitter badge]: https://gitter.im/flutter/flutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[Gitter badge]: https://gitter.im/flutter/flutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

bin/flutter

@@ -121,7 +121,7 @@ function upgrade_flutter () {
 
     retry_upgrade
 
-    "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
+    "$DART" --snapshot="$SNAPSHOT_PATH" --snapshot-kind=app-jit --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" training
     echo "$revision" > "$STAMP_PATH"
   fi
   # The exit here is duplicitous since the function is run in a subshell,

bin/flutter.bat

@@ -138,7 +138,7 @@ GOTO :after_subroutine
         ECHO Running pub upgrade...
         CALL "%pub%" upgrade "%VERBOSITY%"
         IF "%ERRORLEVEL%" EQU "0" goto :upgrade_succeeded
-        ECHO Error Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left)
+        ECHO Error (%ERRORLEVEL%): Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left)
         timeout /t 5 /nobreak 2>NUL
         SET /A remaining_tries-=1
         IF "%remaining_tries%" EQU "0" GOTO upgrade_retries_exhausted
@@ -152,7 +152,7 @@ GOTO :after_subroutine
 
     POPD
 
-    "%dart%" --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" "%script_path%"
+    "%dart%" --snapshot="%snapshot_path%" --snapshot-kind=app-jit --packages="%flutter_tools_dir%\.packages" "%script_path%"
     IF "%ERRORLEVEL%" NEQ "0" (
       ECHO Error: Unable to create dart snapshot for flutter tool.
       SET exit_code=%ERRORLEVEL%

bin/internal/engine.version

@@ -1 +1 @@
-3757390fa4b00d2d261bfdf5182d2e87c9113ff9
+0d83a2ecd1bb78f8e1f0ed9719ff3751cdfdd064

bin/internal/goldens.version

@@ -1 +1 @@
-ec90c64e598804d691c1c6bfcd191a63480e3053
+894e9634cda6eb940d1ad4efb20b63a174bb7797

bin/internal/update_dart_sdk.sh

@@ -44,9 +44,11 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
   case "$(uname -s)" in
     Darwin)
       DART_ZIP_NAME="dart-sdk-darwin-x64.zip"
+      IS_USER_EXECUTABLE="-perm +100"
       ;;
     Linux)
       DART_ZIP_NAME="dart-sdk-linux-x64.zip"
+      IS_USER_EXECUTABLE="-perm /u+x"
       ;;
     *)
       echo "Unknown operating system. Cannot install Dart SDK."
@@ -65,7 +67,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
 
   # install the new sdk
   rm -rf -- "$DART_SDK_PATH"
-  mkdir -p -- "$DART_SDK_PATH"
+  mkdir -m 755 -p -- "$DART_SDK_PATH"
   DART_SDK_ZIP="$FLUTTER_ROOT/bin/cache/$DART_ZIP_NAME"
 
   curl --continue-at - --location --output "$DART_SDK_ZIP" "$DART_SDK_URL" 2>&1 || {
@@ -87,6 +89,8 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
     exit 1
   }
   rm -f -- "$DART_SDK_ZIP"
+  find "$DART_SDK_PATH" -type d -exec chmod 755 {} \;
+  find "$DART_SDK_PATH" -type f $IS_USER_EXECUTABLE -exec chmod a+x,a+r {} \;
   echo "$ENGINE_VERSION" > "$ENGINE_STAMP"
 
   # delete any temporary sdk path