Skip to content

Commit 073fca5

Browse files
authored
Merge pull request #1 from flutter/master
Update master
2 parents c84a5c9 + b16af32 commit 073fca5

File tree

355 files changed

+5110
-2253
lines changed

Some content is hidden

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

355 files changed

+5110
-2253
lines changed

.cirrus.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ task:
1010
- git fetch origin master
1111
activate_script: pub global activate flutter_plugin_tools
1212
matrix:
13-
- name: hard_coded_version
14-
script: ./script/check_hard_coded_version.sh
1513
- name: publishable
1614
script: ./script/check_publish.sh
1715
- name: test+format
@@ -59,26 +57,21 @@ task:
5957
task:
6058
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
6159
osx_instance:
62-
image: mojave-xcode-10.1
63-
install_cocoapods_script:
64-
- sudo gem install cocoapods
60+
image: mojave-xcode-10.2-flutter
6561
setup_script:
66-
- brew update
67-
- brew install libimobiledevice
68-
- brew install ideviceinstaller
69-
- brew install ios-deploy
7062
- pod repo update
71-
- git clone https://github.com/flutter/flutter.git
63+
upgrade_script:
64+
- flutter channel master
65+
- flutter upgrade
7266
- git fetch origin master
73-
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
74-
- flutter doctor
67+
activate_script:
7568
- pub global activate flutter_plugin_tools
76-
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-1 | xargs xcrun simctl boot
69+
create_simulator_script:
70+
- xcrun simctl list
71+
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2 | xargs xcrun simctl boot
7772
matrix:
7873
- name: build_all_plugins_ipa
79-
script:
80-
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
81-
- ./script/build_all_plugins_app.sh ios --no-codesign
74+
script: ./script/build_all_plugins_app.sh ios --no-codesign
8275
- name: build-ipas+drive-examples
8376
env:
8477
PATH: $PATH:/usr/local/bin
@@ -89,6 +82,5 @@ task:
8982
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
9083
SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
9184
build_script:
92-
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
9385
- ./script/incremental_build.sh build-examples --ipa
9486
- ./script/incremental_build.sh drive-examples

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
.dart_tool/
99
pubspec.lock
1010

11+
examples/all_plugins/pubspec.yaml
12+
1113
Podfile
1214
Podfile.lock
1315
Pods/
@@ -33,3 +35,7 @@ GeneratedPluginRegistrant.m
3335
GeneratedPluginRegistrant.java
3436
build/
3537
.flutter-plugins
38+
39+
.project
40+
.classpath
41+
.settings

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ ko2ic <[email protected]>
3939
Jonathan Younger <[email protected]>
4040
Jose Sanchez <[email protected]>
4141
Debkanchan Samadder <[email protected]>
42+
Audrius Karosevicius <[email protected]>
43+
Lukasz Piliszczuk <[email protected]>
44+
SoundReply Solutions GmbH <[email protected]>

CODEOWNERS

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# reviewed by someone else.
66

77
packages/android_alarm_manager/* @bkonyi
8+
packages/android_intent/* @mklim
9+
packages/battery/* @amirh
810
packages/camera/* @bparrishMines @mklim
911
packages/cloud_firestore/* @collinjackson @kroikie
1012
packages/cloud_functions/* @collinjackson @kroikie
@@ -16,17 +18,20 @@ packages/firebase_core/* @collinjackson @kroikie
1618
packages/firebase_crashlytics/* @kroikie @collinjackson
1719
packages/firebase_database/* @collinjackson @kroikie
1820
packages/firebase_dynamic_links/* @bparrishMines
21+
packages/firebase_in_app_messaging/* @collinjackson
1922
packages/firebase_messaging/* @collinjackson @kroikie
2023
packages/firebase_ml_vision/* @bparrishMines
2124
packages/firebase_performance/* @bparrishMines @collinjackson
2225
packages/firebase_remote_config/* @collinjackson @kroikie
2326
packages/firebase_storage/* @collinjackson @kroikie
24-
packages/google_maps_flutter/* @amirh @iskakaushik
27+
packages/google_maps_flutter/* @iskakaushik
2528
packages/google_sign_in/* @cyanglaz @mehmetf
2629
packages/image_picker/* @cyanglaz
2730
packages/in_app_purchase/* @mklim @cyanglaz
2831
packages/package_info/* @cyanglaz
2932
packages/path_provider/* @collinjackson
33+
packages/quick_actions/* @collinjackson
3034
packages/shared_preferences/* @collinjackson
35+
packages/url_launcher/* @mklim
3136
packages/video_player/* @iskakaushik @cyanglaz
32-
packages/webview_flutter/* @amirh @iskakaushik
37+
packages/webview_flutter/* @amirh

CONTRIBUTING.md

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

44
[![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

8-
Things you will need
9-
--------------------
8+
## Things you will need
9+
1010

1111
* Linux, Mac OS X, or Windows.
1212
* git (used for source version control).
1313
* An ssh client (used to authenticate with GitHub).
1414

15-
Getting the code and configuring your environment
16-
-------------------------------------------------
15+
## Getting the code and configuring your environment
16+
1717

1818
* Ensure all the dependencies described in the previous section are installed.
1919
* Fork `https://github.com/flutter/plugins` into your own GitHub account. If
@@ -29,8 +29,8 @@ Getting the code and configuring your environment
2929
fetch from the master repository, not your clone, when running `git fetch`
3030
et al.)
3131

32-
Running the examples
33-
--------------------
32+
## Running the examples
33+
3434

3535
To run an example with a prebuilt binary from the cloud, switch to that
3636
example's directory, run `pub get` to make sure its dependencies have been
@@ -40,8 +40,7 @@ USB and debugging enabled on that device.
4040
* `cd packages/battery/example`
4141
* `flutter run`
4242

43-
Running the tests
44-
-----------------
43+
## Running the tests
4544

4645
Flutter plugins have both unit tests of their Dart API and integration tests that run on a virtual or actual device.
4746

@@ -58,8 +57,7 @@ cd example
5857
flutter drive test/<name_of_plugin>.dart
5958
```
6059

61-
Contributing code
62-
-----------------
60+
## Contributing code
6361

6462
We gladly accept contributions via GitHub pull requests.
6563

@@ -112,3 +110,20 @@ You must complete the
112110
You can do this online, and it only takes a minute.
113111
If you've never submitted code before, you must add your (or your
114112
organization's) name and contact info to the [AUTHORS](AUTHORS) file.
113+
114+
### The review process
115+
116+
* This is a new process we are currently experimenting with, feedback on the process is welcomed at the Gitter contributors channel. *
117+
118+
Reviewing PRs often requires a non trivial amount of time. We prioritize issues, not PRs, so that we use our maintainers' time in the most impactful way. Issues pertaining to this repository are managed in the [flutter/flutter issue tracker and are labeled with "plugin"](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Aplugin+sort%3Areactions-%2B1-desc). Non trivial PRs should have an associated issue that will be used for prioritization. See the [prioritization section](https://github.com/flutter/flutter/wiki/Issue-hygiene#prioritization) in the Flutter wiki to understand how issues are prioritized.
119+
120+
Newly opened PRs first go through initial triage which results in one of:
121+
* **Merging the PR** - if the PR can be quickly reviewed and looks good.
122+
* **Closing the PR** - if the PR maintainer decides that the PR should not be merged.
123+
* **Moving the PR to the backlog** - if the review requires non trivial effort and the issue isn't a priority; in this case the maintainer will:
124+
* Make sure that the PR has an associated issue labeled with "plugin".
125+
* Add the "backlog" label to the issue.
126+
* Leave a comment on the PR explaining that the review is not trivial and that the issue will be looked at according to priority order.
127+
* **Starting a non trivial review** - if the review requires non trivial effort and the issue is a priority; in this case the maintainer will:
128+
* Add the "in review" label to the issue.
129+
* Self assign the PR.

FlutterFire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The plugins are still under development, and some APIs might not be available ye
2323
| [firebase_crashlytics][crash_pub] | ![pub package][crash_badge] | [Firebase Crashlytics][crash_product] | [`packages/firebase_crashlytics`][crash_code] |
2424
| [firebase_database][database_pub] | ![pub package][database_badge] | [Firebase Realtime Database][database_product] | [`packages/firebase_database`][database_code] |
2525
| [firebase_dynamic_links][dynamic_links_pub] | ![pub package][dynamic_links_badge] | [Firebase Dynamic Links][dynamic_links_product] | [`packages/firebase_dynamic_links`][dynamic_links_code] |
26+
| [in_app_messaging][in_app_messaging_pub] | ![pub package][in_app_messaging_badge] | [Firebase In-App Messaging][in_app_messaging_product] | [`packages/firebase_in_app_messaging`][in_app_messaging_code] |
2627
| [firebase_messaging][messaging_pub] | ![pub package][messaging_badge] | [Firebase Cloud Messaging][messaging_product] | [`packages/firebase_messaging`][messaging_code] |
2728
| [firebase_ml_vision][ml_vision_pub] | ![pub package][ml_vision_badge] | [Firebase ML Kit][ml_vision_product] | [`packages/firebase_ml_vision`][ml_vision_code] |
2829
| [firebase_performance][performance_pub] | ![pub package][performance_badge] | [Firebase Performance Monitoring][performance_product] | [`packages/firebase_performance`][performance_code] |
@@ -74,6 +75,11 @@ The plugins are still under development, and some APIs might not be available ye
7475
[functions_code]: https://github.com/flutter/plugins/tree/master/packages/cloud_functions
7576
[functions_badge]: https://img.shields.io/pub/v/cloud_functions.svg
7677

78+
[in_app_messaging_pub]: https://pub.dartlang.org/packages/firebase_in_app_messaging
79+
[in_app_messaging_product]: https://firebase.google.com/products/in-app-messaging/
80+
[in_app_messaging_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_in_app_messaging
81+
[in_app_messaging_badge]: https://img.shields.io/pub/v/firebase_in_app_messaging.svg
82+
7783
[messaging_pub]: https://pub.dartlang.org/packages/firebase_messaging
7884
[messaging_product]: https://firebase.google.com/products/cloud-messaging/
7985
[messaging_code]: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ These are the available plugins in this repository.
4747
| [google_maps_flutter](./packages/google_maps_flutter) | [![pub package](https://img.shields.io/pub/v/google_maps_flutter.svg)](https://pub.dev/packages/google_maps_flutter) |
4848
| [google_sign_in](./packages/google_sign_in/) | [![pub package](https://img.shields.io/pub/v/google_sign_in.svg)](https://pub.dev/packages/google_sign_in) |
4949
| [image_picker](./packages/image_picker/) | [![pub package](https://img.shields.io/pub/v/image_picker.svg)](https://pub.dev/packages/image_picker) |
50+
| [in_app_purchase](./packages/in_app_purchase/) | [![pub package](https://img.shields.io/pub/v/in_app_purchase.svg)](https://pub.dev/packages/in_app_purchase) |
5051
| [local_auth](./packages/local_auth/) | [![pub package](https://img.shields.io/pub/v/local_auth.svg)](https://pub.dev/packages/local_auth) |
5152
| [package_info](./packages/package_info/) | [![pub package](https://img.shields.io/pub/v/package_info.svg)](https://pub.dev/packages/package_info) |
5253
| [path_provider](./packages/path_provider/) | [![pub package](https://img.shields.io/pub/v/path_provider.svg)](https://pub.dev/packages/path_provider) |
@@ -68,6 +69,7 @@ These are the available plugins in this repository.
6869
| [firebase_crashlytics](./packages/firebase_crashlytics/) | [![pub package](https://img.shields.io/pub/v/firebase_crashlytics.svg)](https://pub.dev/packages/firebase_crashlytics) |
6970
| [firebase_database](./packages/firebase_database/) | [![pub package](https://img.shields.io/pub/v/firebase_database.svg)](https://pub.dev/packages/firebase_database) |
7071
| [firebase_dynamic_links](./packages/firebase_dynamic_links/) | [![pub package](https://img.shields.io/pub/v/firebase_dynamic_links.svg)](https://pub.dev/packages/firebase_dynamic_links) |
72+
| [firebase_in_app_messaging](./packages/firebase_in_app_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_in_app_messaging.svg)](https://pub.dev/packages/firebase_in_app_messaging) |
7173
| [firebase_messaging](./packages/firebase_messaging/) | [![pub package](https://img.shields.io/pub/v/firebase_messaging.svg)](https://pub.dev/packages/firebase_messaging) |
7274
| [firebase_ml_vision](./packages/firebase_ml_vision/) | [![pub package](https://img.shields.io/pub/v/firebase_ml_vision.svg)](https://pub.dev/packages/firebase_ml_vision) |
7375
| [firebase_performance](./packages/firebase_performance/) | [![pub package](https://img.shields.io/pub/v/firebase_performance.svg)](https://pub.dev/packages/firebase_performance) |

examples/all_plugins/android/app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ android {
3535
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3636
applicationId "io.plugins.all_plugins"
3737
minSdkVersion 16
38+
multiDexEnabled true
3839
targetSdkVersion 28
3940
versionCode flutterVersionCode.toInteger()
4041
versionName flutterVersionName
41-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
42+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4243
}
4344

4445
buildTypes {
@@ -56,6 +57,7 @@ flutter {
5657

5758
dependencies {
5859
testImplementation 'junit:junit:4.12'
59-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
60+
androidTestImplementation 'androidx.test:runner:1.1.0'
61+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
62+
api 'androidx.exifinterface:exifinterface:1.0.0'
6163
}

examples/all_plugins/android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.plugins.all_plugins">
2+
package="io.plugins.all_plugins"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-sdk tools:overrideLibrary="io.flutter.plugins.camera"/>
36

47
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
58
calls FlutterMain.startInitialization(this); in its onCreate method.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true
13
org.gradle.jvmargs=-Xmx1536M
24

0 commit comments

Comments
 (0)