Skip to content

Commit bac2aa6

Browse files
authored
Merge pull request flutter#1 from ened/webview_assets_patch
Webview assets patch
2 parents 01b7104 + 847c19b commit bac2aa6

File tree

545 files changed

+21637
-4726
lines changed

Some content is hidden

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

545 files changed

+21637
-4726
lines changed

.ci/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ RUN yes | sdkmanager \
55
"platforms;android-27" \
66
"build-tools;27.0.3" \
77
"extras;google;m2repository" \
8-
"extras;android;m2repository"
8+
"extras;android;m2repository" \
9+
"system-images;android-21;default;armeabi-v7a"
10+
11+
RUN yes | sdkmanager --licenses

.cirrus.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ task:
22
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
33
container:
44
dockerfile: .ci/Dockerfile
5-
cpu: 4
6-
memory: 8G
5+
cpu: 8
6+
memory: 16G
77
upgrade_script:
88
- flutter channel master
99
- flutter upgrade
@@ -22,11 +22,17 @@ task:
2222
test_script: ./script/incremental_build.sh test
2323
- name: analyze
2424
script: ./script/incremental_build.sh analyze
25-
- name: build-apks+java-test
25+
- name: build-apks+java-test+drive-examples
2626
env:
2727
matrix:
2828
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
2929
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
30+
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
31+
create_device_script:
32+
echo no | avdmanager -v create avd -n test -k "system-images;android-21;default;armeabi-v7a"
33+
start_emulator_background_script:
34+
- $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window
35+
wait_for_emulator_script: adb wait-for-device
3036
script:
3137
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
3238
# might include non-ASCII characters which makes Gradle crash.
@@ -40,19 +46,25 @@ task:
4046
- export CIRRUS_COMMIT_MESSAGE=""
4147
- ./script/incremental_build.sh build-examples --apk
4248
- ./script/incremental_build.sh java-test # must come after apk build
49+
# TODO(jackson): Re-enable once Android emulators support Firebase
50+
# https://github.com/flutter/flutter/issues/29571
51+
# - ./script/incremental_build.sh drive-examples
4352
- export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
4453
- export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
4554

4655
task:
4756
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
48-
name: build-ipas
57+
name: build-ipas+drive-examples
4958
osx_instance:
5059
image: mojave-xcode-10.1
5160
env:
5261
PATH: $PATH:/usr/local/bin
5362
matrix:
54-
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
55-
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
63+
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
64+
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
65+
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
66+
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
67+
SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
5668
setup_script:
5769
- brew update
5870
- brew install libimobiledevice
@@ -64,6 +76,8 @@ task:
6476
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
6577
- flutter doctor
6678
- pub global activate flutter_plugin_tools
79+
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
6780
build_script:
6881
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
6982
- ./script/incremental_build.sh build-examples --ipa
83+
- ./script/incremental_build.sh drive-examples

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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.*
4+
5+
## Related Issues
6+
7+
*Replace this paragraph with a list of issues related to this PR from the [issue database](https://github.com/flutter/flutter/issues). Indicate, which of these issues are resolved or fixed by this PR. Note that you'll have to prefix the issue numbers with flutter/flutter#.*
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 unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]).
15+
- [ ] All existing and new tests are passing.
16+
- [ ] I updated/added relevant documentation (doc comments with `///`).
17+
- [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.
18+
- [ ] I read and followed the [Flutter Style Guide].
19+
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
20+
- [ ] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
21+
- [ ] I updated CHANGELOG.md to add a description of the change.
22+
- [ ] I signed the [CLA].
23+
- [ ] I am willing to follow-up on review comments in a timely manner.
24+
25+
## Breaking Change
26+
27+
Does your PR require plugin users to manually update their apps to accommodate your change?
28+
29+
- [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
30+
- [ ] No, this is *not* a breaking change.
31+
32+
<!-- Links -->
33+
[issue database]: https://github.com/flutter/flutter/issues
34+
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
35+
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
36+
[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
37+
[CLA]: https://cla.developers.google.com/

.opensource/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"packages/firebase_analytics/README.md": "Analytics",
1313
"packages/firebase_auth/README.md": "Authentication",
1414
"packages/firebase_core/README.md": "Core",
15+
"packages/firebase_crashlytics/README.md": "Crashlytics",
1516
"packages/firebase_database/README.md": "Realtime Database",
1617
"packages/firebase_dynamic_links/README.md": "Dynamic Links",
1718
"packages/firebase_messaging/README.md": "Cloud Messaging",

AUTHORS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,15 @@ Thomas Danner <thmsdnnr@gmail.com>
2222
Diego Velásquez <diego.velasquez.lopez@gmail.com>
2323
Hajime Nakamura <nkmrhj@gmail.com>
2424
Tuyển Vũ Xuân <netsoft1985@gmail.com>
25+
Miguel Ruivo <miguel@miguelruivo.com>
2526
Sarthak Verma <sarthak@artiosys.com>
27+
Mike Diarmid <mike@invertase.io>
28+
Invertase <oss@invertase.io>
29+
Elliot Hesp <elliot@invertase.io>
30+
Vince Varga <vince.varga@smaho.com>
31+
Aawaz Gyawali <awazgyawali@gmail.com>
32+
EUI Limited <ian.evans3@admiralgroup.co.uk>
33+
Katarina Sheremet <katarina@sheremet.ch>
34+
Thomas Stockx <thomas@stockxit.com>
35+
Sarbagya Dhaubanjar <sarbagyastha@gmail.com>
36+
Ozkan Eksi <ozeksi@gmail.com>

CODEOWNERS

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@
44
# These names are just suggestions. It is fine to have your changes
55
# reviewed by someone else.
66

7+
packages/android_alarm_manager/* @bkonyi
8+
packages/camera/* @bparrishMines @mklim
79
packages/cloud_firestore/* @collinjackson @kroikie
10+
packages/cloud_functions/* @collinjackson @kroikie
11+
packages/connectivity/* @cyanglaz
12+
packages/firebase_admob/* @amirh @bparrishMines
13+
packages/firebase_analytics/* @collinjackson @kroikie
814
packages/firebase_auth/* @collinjackson @kroikie
15+
packages/firebase_core/* @collinjackson @kroikie
16+
packages/firebase_crashlytics/* @kroikie @collinjackson
17+
packages/firebase_database/* @collinjackson @kroikie
18+
packages/firebase_dynamic_links/* @bparrishMines
919
packages/firebase_messaging/* @collinjackson @kroikie
10-
packages/camera/* @bparrishMines @mklim
11-
packages/firebase_admob/* @amirh
1220
packages/firebase_ml_vision/* @bparrishMines
13-
packages/image_picker/* @cyanglaz
14-
packages/android_alarm_manager/* @bkonyi
15-
packages/google_maps_flutter/* @amirh
16-
packages/google_sign_in/* @cyanglaz @mehmetf
17-
packages/in_app_purchase/* @mklim
18-
packages/firebase_database/* @collinjackson @kroikie
21+
packages/firebase_performance/* @bparrishMines @collinjackson
22+
packages/firebase_remote_config/* @collinjackson @kroikie
1923
packages/firebase_storage/* @collinjackson @kroikie
24+
packages/google_maps_flutter/* @amirh @iskakaushik
25+
packages/google_sign_in/* @cyanglaz @mehmetf
26+
packages/image_picker/* @cyanglaz
27+
packages/in_app_purchase/* @mklim @cyanglaz
2028
packages/package_info/* @cyanglaz
21-
packages/firebase_analytics/* @collinjackson @kroikie
22-
packages/connectivity/* @cyanglaz
23-
packages/webview_flutter/* @amirh
29+
packages/path_provider/* @collinjackson
30+
packages/shared_preferences/* @collinjackson
31+
packages/video_player/* @iskakaushik @cyanglaz
32+
packages/webview_flutter/* @amirh @iskakaushik

CONTRIBUTING.md

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Contributing to Flutter
2-
=======================
1+
Contributing to Flutter Plugins
2+
===============================
33

4-
[![Build Status](https://travis-ci.org/flutter/plugins.svg)](https://travis-ci.org/flutter/plugins)
4+
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
55

66
_See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
77

@@ -40,6 +40,24 @@ USB and debugging enabled on that device.
4040
* `cd packages/battery/example`
4141
* `flutter run`
4242

43+
Running the tests
44+
-----------------
45+
46+
Flutter plugins have both unit tests of their Dart API and integration tests that run on a virtual or actual device.
47+
48+
To run the unit tests:
49+
50+
```
51+
flutter test test/<name_of_plugin>_test.dart
52+
```
53+
54+
To run the integration tests:
55+
56+
```
57+
cd example
58+
flutter drive test/<name_of_plugin>.dart
59+
```
60+
4361
Contributing code
4462
-----------------
4563

@@ -74,19 +92,16 @@ To send us a pull request:
7492

7593
Please make sure all your checkins have detailed commit messages explaining the patch.
7694

77-
Once you've gotten an LGTM from a project maintainer and once your PR has received
78-
the green light from all our automated testing (Travis, AppVeyor, etc), submit your
79-
changes to the `master` branch using one of the following methods:
95+
Plugins tests are run automatically on contributions using Cirrus CI. However, due to
96+
cost constraints, pull requests from non-committers may not run all the tests
97+
automatically.
8098

81-
* Wait for one of the project maintainers to submit it for you.
82-
* Click the green "Merge pull request" button on the GitHub UI of your pull
83-
request (requires commit access).
99+
Once you've gotten an LGTM from a project maintainer and once your PR has received
100+
the green light from all our automated testing, wait for one the package maintainers
101+
to merge the pull request and `pub submit` any affected packages.
84102

85103
You must complete the
86104
[Contributor License Agreement](https://cla.developers.google.com/clas).
87105
You can do this online, and it only takes a minute.
88106
If you've never submitted code before, you must add your (or your
89107
organization's) name and contact info to the [AUTHORS](AUTHORS) file.
90-
91-
We grant commit access to people who have gained our trust and demonstrated
92-
a commitment to Flutter.

FlutterFire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The plugins are still under development, and some APIs might not be available ye
2020
| [firebase_analytics][analytics_pub] | ![pub package][analytics_badge] | [Firebase Analytics][analytics_product] | [`packages/firebase_analytics`][analytics_code] |
2121
| [firebase_auth][auth_pub] | ![pub package][auth_badge] | [Firebase Authentication][auth_product] | [`packages/firebase_auth`][auth_code] |
2222
| [firebase_core][core_pub] | ![pub package][core_badge] | [Firebase Core][core_product] | [`packages/firebase_core`][core_code] |
23+
| [firebase_crashlytics][crash_pub] | ![pub package][crash_badge] | [Firebase Crashlytics][crash_product] | [`packages/firebase_crashlytics`][crash_code] |
2324
| [firebase_database][database_pub] | ![pub package][database_badge] | [Firebase Realtime Database][database_product] | [`packages/firebase_database`][database_code] |
2425
| [firebase_dynamic_links][dynamic_links_pub] | ![pub package][dynamic_links_badge] | [Firebase Dynamic Links][dynamic_links_product] | [`packages/firebase_dynamic_links`][dynamic_links_code] |
2526
| [firebase_messaging][messaging_pub] | ![pub package][messaging_badge] | [Firebase Cloud Messaging][messaging_product] | [`packages/firebase_messaging`][messaging_code] |
@@ -48,6 +49,11 @@ The plugins are still under development, and some APIs might not be available ye
4849
[core_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_core
4950
[core_badge]: https://img.shields.io/pub/v/firebase_core.svg
5051

52+
[crash_pub]: https://pub.dartlang.org/packages/firebase_crashlytics
53+
[crash_product]: https://firebase.google.com/products/crashlytics/
54+
[crash_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_crashlytics
55+
[crash_badge]: https://img.shields.io/pub/v/firebase_crashlytics.svg
56+
5157
[database_pub]: https://pub.dartlang.org/packages/firebase_database
5258
[database_product]: https://firebase.google.com/products/database/
5359
[database_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_database

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ These are the available plugins in this repository.
6565
| [firebase_analytics](./packages/firebase_analytics/) | [![pub package](https://img.shields.io/pub/v/firebase_analytics.svg)](https://pub.dartlang.org/packages/firebase_analytics) |
6666
| [firebase_auth](./packages/firebase_auth/) | [![pub package](https://img.shields.io/pub/v/firebase_auth.svg)](https://pub.dartlang.org/packages/firebase_auth) |
6767
| [firebase_core](./packages/firebase_core/) | [![pub package](https://img.shields.io/pub/v/firebase_core.svg)](https://pub.dartlang.org/packages/firebase_core) |
68+
| [firebase_crashlytics](./packages/firebase_crashlytics/) | [![pub package](https://img.shields.io/pub/v/firebase_crashlytics.svg)](https://pub.dartlang.org/packages/firebase_crashlytics) |
6869
| [firebase_database](./packages/firebase_database/) | [![pub package](https://img.shields.io/pub/v/firebase_database.svg)](https://pub.dartlang.org/packages/firebase_database) |
6970
| [firebase_dynamic_links](./packages/firebase_dynamic_links/) | [![pub package](https://img.shields.io/pub/v/firebase_dynamic_links.svg)](https://pub.dartlang.org/packages/firebase_dynamic_links) |
7071
| [firebase_messaging](./packages/firebase_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_messaging.svg)](https://pub.dartlang.org/packages/firebase_messaging) |

packages/android_alarm_manager/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## 0.4.1+6
2+
3+
* Bump the minimum Flutter version to 1.2.0.
4+
* Add template type parameter to `invokeMethod` calls.
5+
6+
## 0.4.1+5
7+
8+
* Update AlarmService to throw a `PluginRegistrantException` if
9+
`AlarmService.setPluginRegistrant` has not been called to set a
10+
PluginRegistrantCallback. This improves the error message seen when the
11+
`AlarmService.setPluginRegistrant` call is omitted.
12+
13+
## 0.4.1+4
14+
15+
* Updated example to remove dependency on Firebase.
16+
17+
## 0.4.1+3
18+
19+
* Update README.md to include instructions for setting the WAKE_LOCK permission.
20+
* Updated example application to use the WAKE_LOCK permission.
21+
122
## 0.4.1+2
223

324
* Include a missing API dependency.

0 commit comments

Comments
 (0)