Skip to content

Commit e276647

Browse files
authored
Merge pull request #1 from flutter/master
Updating Flutter fork
2 parents e99c881 + 820b0e0 commit e276647

File tree

1,421 files changed

+49091
-14006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,421 files changed

+49091
-14006
lines changed

.cirrus.yml

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ task:
1010
PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
1111
ANDROID_SDK_ROOT: "/opt/android_sdk"
1212
git_fetch_script:
13+
- git clean -xfd
1314
- git fetch origin
1415
- git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
1516
pub_cache:
@@ -27,9 +28,9 @@ task:
2728
env:
2829
SHARD: docs
2930
# For uploading master docs to Firebase master branch staging site
30-
FIREBASE_MASTER_TOKEN: ENCRYPTED[37e8b82f167864cae9a3f4d2cf3f37dea331d9375c295327c45de524f6c588fa6f6d63e5784f10f6d43ce29689f36c92]
31+
FIREBASE_MASTER_TOKEN: ENCRYPTED[eb768d18798fdc5abfe09b224e1724c4d82831d715ccf90df2c79d618c317216cbd99493278361f6fe7948b409b603f0]
3132
# For uploading beta docs to Firebase public live site
32-
FIREBASE_PUBLIC_TOKEN: ENCRYPTED[c422da192f06da7b4449ca8e7aa866dabeb8a0f8d7488497c2e7e447e6fd31d917e6c813db081dc4e2a7a63afdf41864]
33+
FIREBASE_PUBLIC_TOKEN: ENCRYPTED[37e8b82f167864cae9a3f4d2cf3f37dea331d9375c295327c45de524f6c588fa6f6d63e5784f10f6d43ce29689f36c92]
3334
docs_script: ./dev/bots/docs.sh
3435
- name: deploy_gallery
3536
only_if: $CIRRUS_BRANCH == 'dev'
@@ -49,6 +50,7 @@ task:
4950
- dart --enable-asserts ./dev/bots/analyze.dart
5051
- name: tests-linux
5152
env:
53+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
5254
SHARD: tests
5355
test_script:
5456
- dart --enable-asserts ./dev/bots/test.dart
@@ -57,6 +59,7 @@ task:
5759
memory: 12G
5860
- name: tool_tests-linux
5961
env:
62+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
6063
SHARD: tool_tests
6164
test_script:
6265
- dart --enable-asserts ./dev/bots/test.dart
@@ -66,6 +69,9 @@ task:
6669
- name: build_tests-linux
6770
env:
6871
SHARD: build_tests
72+
- name: integration_tests-linux
73+
env:
74+
SHARD: integration_tests
6975
test_script:
7076
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
7177
# might include non-ASCII characters which makes Gradle crash.
@@ -83,21 +89,18 @@ task:
8389
container:
8490
cpu: 4
8591
memory: 12G
86-
- name: codelabs-build-test
87-
env:
88-
SHARD: codelabs-build-test
89-
build_test_script: ./dev/bots/codelabs_build_test.sh
9092

9193

9294
task:
9395
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
9496
windows_container:
95-
image: cirrusci/windowsservercore:2016
97+
image: cirrusci/android-sdk:28-windowsservercore-ltsc2016
9698
os_version: 2016
9799
cpu: 4
98100
env:
99101
CIRRUS_WORKING_DIR: "C:\\Windows\\Temp\\flutter sdk"
100102
git_fetch_script:
103+
- git clean -xfd
101104
- git fetch origin
102105
- git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
103106
pub_cache:
@@ -119,16 +122,24 @@ task:
119122
matrix:
120123
- name: tests-windows
121124
env:
125+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
122126
SHARD: tests
123127
- name: tool_tests-windows
124128
env:
129+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
125130
SHARD: tool_tests
126131
- name: build_tests-windows
127132
env:
128133
SHARD: build_tests
129134
container:
130135
cpu: 4
131136
memory: 12G
137+
- name: integration_tests-windows
138+
env:
139+
SHARD: integration_tests
140+
container:
141+
cpu: 4
142+
memory: 12G
132143

133144
task:
134145
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
@@ -141,6 +152,7 @@ task:
141152
- tests-macos
142153
- tool_tests-macos
143154
- build_tests-macos
155+
- add2app-macos
144156
env:
145157
# Name the SDK directory to include a space so that we constantly
146158
# test path names with spaces in them.
@@ -155,8 +167,13 @@ task:
155167
# Private repo for publishing certificates.
156168
PUBLISHING_MATCH_CERTIFICATE_REPO: [email protected]:flutter/private_publishing_certificates.git
157169
osx_instance:
158-
image: high-sierra-xcode-9.4.1
170+
image: mojave-xcode-10.1
171+
# occasionally the clock on these machines is out of sync
172+
# with the actual time - this should help to verify
173+
print_date_script:
174+
- date
159175
git_fetch_script:
176+
- git clean -xfd
160177
- git fetch origin
161178
- git fetch origin master # To set FETCH_HEAD
162179
setup_script:
@@ -168,14 +185,42 @@ task:
168185
task:
169186
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
170187
osx_instance:
171-
image: high-sierra-xcode-9.4.1
188+
image: mojave-xcode-10.1
172189
depends_on:
173190
- analyze
174191
env:
175192
CIRRUS_WORKING_DIR: "/tmp/flutter sdk"
193+
COCOAPODS_DISABLE_STATS: true
194+
matrix:
195+
- name: tests-macos
196+
env:
197+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
198+
SHARD: tests
199+
- name: tool_tests-macos
200+
env:
201+
GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
202+
SHARD: tool_tests
203+
- name: $SHARD-macos
204+
env:
205+
matrix:
206+
- SHARD: integration_tests
207+
- SHARD: build_tests
208+
COCOAPODS_DISABLE_STATS: true
209+
FLUTTER_FRAMEWORK_DIR: "/tmp/flutter sdk/bin/cache/artifacts/engine/ios/"
210+
osx_instance:
211+
image: mojave-flutter
212+
remove_preinstalled_fluuter_script: rm -rf $FLUTTER_HOME
213+
- name: add2app-macos
214+
env:
215+
SHARD: add2app_test
216+
# occasionally the clock on these machines is out of sync
217+
# with the actual time - this should help to verify
218+
print_date_script:
219+
- date
176220
install_cocoapods_script:
177221
- sudo gem install cocoapods
178222
git_fetch_script:
223+
- git clean -xfd
179224
- git fetch origin
180225
- git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
181226
pub_cache:
@@ -193,22 +238,6 @@ task:
193238
test_all_script: |
194239
ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
195240
bin/cache/dart-sdk/bin/dart --enable-asserts dev/bots/test.dart
196-
matrix:
197-
- name: tests-macos
198-
env:
199-
SHARD: tests
200-
- name: tool_tests-macos
201-
env:
202-
SHARD: tool_tests
203-
- name: build_tests-macos
204-
env:
205-
SHARD: build_tests
206-
COCOAPODS_DISABLE_STATS: true
207-
FLUTTER_FRAMEWORK_DIR: "/tmp/flutter sdk/bin/cache/artifacts/engine/ios/"
208-
container:
209-
cpu: 4
210-
memory: 12G
211-
212241
213242
docker_builder:
214243
# Only build a new docker image when we tag a release (for dev, beta, or release.)
@@ -221,7 +250,7 @@ docker_builder:
221250
- tests-linux
222251
- tool_tests-linux
223252
- build_tests-linux
253+
- integration_tests-linux
224254
build_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_build.sh"
225255
login_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_login.sh"
226256
push_script: "$CIRRUS_WORKING_DIR/dev/ci/docker_linux/docker_push.sh"
227-

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## Description
2+
3+
*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).*
4+
5+
## Related Issues
6+
7+
*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.*
8+
9+
## Checklist
10+
11+
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.
12+
13+
- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
14+
- [ ] My PR includes tests for *all* changed/updated/fixed behaviors (See [Test Coverage]).
15+
- [ ] All existing and new tests are passing.
16+
- [ ] I updated/added relevant documentation (doc comments with `///`).
17+
- [ ] The analyzer (`flutter analyze --flutter-repo`) does not report any problems on my PR.
18+
- [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
19+
- [ ] I signed the [CLA].
20+
- [ ] I am willing to follow-up on review comments in a timely manner.
21+
22+
## Breaking Change
23+
24+
Does your PR require Flutter developers to manually update their apps to accommodate your change?
25+
26+
- [ ] Yes, this is a breaking change (Please read [Handling breaking changes]).
27+
- [ ] No, this is *not* a breaking change.
28+
29+
<!-- Links -->
30+
[issue database]: https://github.com/flutter/flutter/issues
31+
[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
32+
[Test Coverage]: https://github.com/flutter/flutter/wiki/Test-coverage-for-package%3Aflutter
33+
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
34+
[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
35+
[CLA]: https://cla.developers.google.com/
36+
[Handling breaking changes]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
/packages/flutter/coverage/
3333
version
3434

35+
# packages file containing multi-root paths
36+
.packages.generated
37+
3538
# Flutter/Dart/Pub related
3639
**/doc/api/
3740
.dart_tool/

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ Chema Molins <[email protected]>
3232
Stefan Mitev <[email protected]>
3333
Jasper van Riet <[email protected]>
3434
Mattijs Fuijkschot <[email protected]>
35+
Volodymyr Lykhonis <[email protected]>
3536
TruongSinh Tran-Nguyen <[email protected]>
3637
Sander Dalby Larsen <[email protected]>
3738
Marco Scannadinari <[email protected]>
3839
Frederik Schweiger <[email protected]>
3940
Martin Staadecker <[email protected]>
41+
Igor Katsuba <[email protected]>

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Flutter is Google’s mobile app SDK for crafting high-quality native interfaces
99

1010
### Documentation
1111

12-
**Main site: [flutter.io][]**
13-
* [Install](https://flutter.io/get-started/install/)
14-
* [Get started](https://flutter.io/get-started/)
15-
* [API documentation](https://docs.flutter.io/)
12+
**Main site: [flutter.dev][]**
13+
* [Install](https://flutter.dev/get-started/install/)
14+
* [Get started](https://flutter.dev/get-started/)
15+
* [API documentation](https://docs.flutter.dev/)
1616
* [Changelog](https://github.com/flutter/flutter/wiki/Changelog)
1717
* [How to contribute](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
1818

@@ -42,12 +42,12 @@ Cupertino (iOS-flavor) widgets, rich motion APIs,
4242
smooth natural scrolling, and platform awareness.
4343

4444
[<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)
45-
[<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)
45+
<img src="https://github.com/flutter/website/blob/master/src/images/homepage/screenshot-2.png" width="270" height="480" alt="Fitness app design">
4646

4747
[<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)
4848
[<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/)
4949

50-
Browse the <a href="https://flutter.io/widgets/">widget catalog</a>.
50+
Browse the <a href="https://flutter.dev/widgets/">widget catalog</a>.
5151

5252
## Modern, reactive framework
5353

@@ -89,9 +89,9 @@ class CounterState extends State<Counter> {
8989
}
9090
```
9191

92-
Browse the <a href="https://flutter.io/widgets/">widget catalog</a>
92+
Browse the <a href="https://flutter.dev/widgets/">widget catalog</a>
9393
and learn more about the
94-
<a href="https://flutter.io/widgets-intro/">functional-reactive framework</a>.
94+
<a href="https://flutter.dev/widgets-intro/">functional-reactive framework</a>.
9595

9696
## Access native features and SDKs
9797

@@ -118,8 +118,8 @@ Future<void> getBatteryLevel() async {
118118
}
119119
```
120120

121-
Learn how to use <a href="https://flutter.io/using-packages/">packages</a> or
122-
write <a href="https://flutter.io/platform-channels/">platform channels</a>
121+
Learn how to use <a href="https://flutter.dev/using-packages/">packages</a> or
122+
write <a href="https://flutter.dev/platform-channels/">platform channels</a>
123123
to access native code, APIs, and SDKs.
124124

125125
## Unified app development
@@ -133,7 +133,7 @@ you can use Flutter for your views and leverage much of your
133133
existing Java/Kotlin/ObjC/Swift investment.
134134

135135
Learn more about what makes Flutter special in the
136-
<a href="https://flutter.io/technical-overview/">technical overview</a>.
136+
<a href="https://flutter.dev/technical-overview/">technical overview</a>.
137137

138138
# More resources
139139

@@ -146,7 +146,7 @@ To join the team working on Flutter, see our [contributor guide](CONTRIBUTING.md
146146

147147
[Build Status - Cirrus]: https://api.cirrus-ci.com/github/flutter/flutter.svg
148148
[Build status]: https://cirrus-ci.com/github/flutter/flutter/master
149-
[flutter.io]: https://flutter.io
149+
[flutter.dev]: https://flutter.dev
150150
[Flutter logo]: https://github.com/dart-lang/site-shared/blob/master/src/_assets/image/flutter/icon/64.png?raw=1
151151
[Gitter Channel]: https://badges.gitter.im/flutter/flutter.svg
152-
[Gitter badge]: https://gitter.im/flutter/flutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
152+
[Gitter badge]: https://gitter.im/flutter/flutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

bin/flutter

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function upgrade_flutter () {
121121

122122
retry_upgrade
123123

124-
"$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
124+
"$DART" --snapshot="$SNAPSHOT_PATH" --snapshot-kind=app-jit --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" training
125125
echo "$revision" > "$STAMP_PATH"
126126
fi
127127
# The exit here is duplicitous since the function is run in a subshell,

bin/flutter.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ GOTO :after_subroutine
138138
ECHO Running pub upgrade...
139139
CALL "%pub%" upgrade "%VERBOSITY%"
140140
IF "%ERRORLEVEL%" EQU "0" goto :upgrade_succeeded
141-
ECHO Error Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left)
141+
ECHO Error (%ERRORLEVEL%): Unable to 'pub upgrade' flutter tool. Retrying in five seconds... (%remaining_tries% tries left)
142142
timeout /t 5 /nobreak 2>NUL
143143
SET /A remaining_tries-=1
144144
IF "%remaining_tries%" EQU "0" GOTO upgrade_retries_exhausted
@@ -152,7 +152,7 @@ GOTO :after_subroutine
152152

153153
POPD
154154

155-
"%dart%" --snapshot="%snapshot_path%" --packages="%flutter_tools_dir%\.packages" "%script_path%"
155+
"%dart%" --snapshot="%snapshot_path%" --snapshot-kind=app-jit --packages="%flutter_tools_dir%\.packages" "%script_path%"
156156
IF "%ERRORLEVEL%" NEQ "0" (
157157
ECHO Error: Unable to create dart snapshot for flutter tool.
158158
SET exit_code=%ERRORLEVEL%

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3757390fa4b00d2d261bfdf5182d2e87c9113ff9
1+
0d83a2ecd1bb78f8e1f0ed9719ff3751cdfdd064

bin/internal/goldens.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ec90c64e598804d691c1c6bfcd191a63480e3053
1+
894e9634cda6eb940d1ad4efb20b63a174bb7797

bin/internal/update_dart_sdk.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
4444
case "$(uname -s)" in
4545
Darwin)
4646
DART_ZIP_NAME="dart-sdk-darwin-x64.zip"
47+
IS_USER_EXECUTABLE="-perm +100"
4748
;;
4849
Linux)
4950
DART_ZIP_NAME="dart-sdk-linux-x64.zip"
51+
IS_USER_EXECUTABLE="-perm /u+x"
5052
;;
5153
*)
5254
echo "Unknown operating system. Cannot install Dart SDK."
@@ -65,7 +67,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
6567

6668
# install the new sdk
6769
rm -rf -- "$DART_SDK_PATH"
68-
mkdir -p -- "$DART_SDK_PATH"
70+
mkdir -m 755 -p -- "$DART_SDK_PATH"
6971
DART_SDK_ZIP="$FLUTTER_ROOT/bin/cache/$DART_ZIP_NAME"
7072

7173
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
8789
exit 1
8890
}
8991
rm -f -- "$DART_SDK_ZIP"
92+
find "$DART_SDK_PATH" -type d -exec chmod 755 {} \;
93+
find "$DART_SDK_PATH" -type f $IS_USER_EXECUTABLE -exec chmod a+x,a+r {} \;
9094
echo "$ENGINE_VERSION" > "$ENGINE_STAMP"
9195

9296
# delete any temporary sdk path

0 commit comments

Comments
 (0)