Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into flutter/plugins#849
Browse files Browse the repository at this point in the history
  • Loading branch information
collinjackson committed Aug 26, 2019
2 parents 53095f7 + 4157ee3 commit 296cd49
Show file tree
Hide file tree
Showing 170 changed files with 2,565 additions and 343 deletions.
11 changes: 11 additions & 0 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

FROM cirrusci/flutter:latest

RUN yes | sdkmanager \
"platforms;android-27" \
"build-tools;27.0.3" \
"extras;google;m2repository" \
"extras;android;m2repository" \
"system-images;android-21;default;armeabi-v7a"

RUN yes | sdkmanager --licenses
4 changes: 0 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ task:
test_script: ./script/incremental_build.sh test
- name: analyze
script: ./script/incremental_build.sh analyze
- name: build_all_plugins_apk
script: ./script/build_all_plugins_app.sh apk
- name: build-apks+java-test+drive-examples
env:
matrix:
Expand Down Expand Up @@ -70,8 +68,6 @@ task:
- xcrun simctl list
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-12-2 | xargs xcrun simctl boot
matrix:
- name: build_all_plugins_ipa
script: ./script/build_all_plugins_app.sh ios --no-codesign
- name: build-ipas+drive-examples
env:
PATH: $PATH:/usr/local/bin
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Does your PR require plugin users to manually update their apps to accommodate y

<!-- Links -->
[issue database]: https://github.com/flutter/flutter/issues
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
[Contributor Guide]: https://github.com/FirebaseExtended/flutterfire/blob/master/CONTRIBUTING.md
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
[CLA]: https://cla.developers.google.com/
16 changes: 0 additions & 16 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
# These names are just suggestions. It is fine to have your changes
# reviewed by someone else.

packages/android_alarm_manager/* @bkonyi
packages/android_intent/* @mklim
packages/battery/* @amirh
packages/camera/* @bparrishMines @mklim
packages/cloud_firestore/* @collinjackson @kroikie
packages/cloud_functions/* @collinjackson @kroikie
packages/connectivity/* @cyanglaz
packages/firebase_admob/* @amirh @bparrishMines
packages/firebase_analytics/* @collinjackson @kroikie
packages/firebase_auth/* @collinjackson @kroikie
Expand All @@ -24,14 +19,3 @@ packages/firebase_ml_vision/* @bparrishMines
packages/firebase_performance/* @bparrishMines @collinjackson
packages/firebase_remote_config/* @collinjackson @kroikie
packages/firebase_storage/* @collinjackson @kroikie
packages/google_maps_flutter/* @iskakaushik
packages/google_sign_in/* @cyanglaz @mehmetf
packages/image_picker/* @cyanglaz
packages/in_app_purchase/* @mklim @cyanglaz
packages/package_info/* @cyanglaz
packages/path_provider/* @collinjackson
packages/quick_actions/* @collinjackson
packages/shared_preferences/* @collinjackson
packages/url_launcher/* @mklim
packages/video_player/* @iskakaushik @cyanglaz
packages/webview_flutter/* @amirh
19 changes: 9 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Contributing to Flutter Plugins
# Contributing to FlutterFire


[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
[![Build Status](https://api.cirrus-ci.com/github/FirebaseExtended/flutterfire.svg)](https://cirrus-ci.com/github/FirebaseExtended/flutterfire/master)

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

Expand All @@ -16,16 +15,16 @@ _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#cod


* Ensure all the dependencies described in the previous section are installed.
* Fork `https://github.com/flutter/plugins` into your own GitHub account. If
* Fork `https://github.com/FirebaseExtended/flutterfire` into your own GitHub account. If
you already have a fork, and are now installing a development environment on
a new machine, make sure you've updated your fork so that you don't use stale
configuration options from long ago.
* If you haven't configured your machine with an SSH key that's known to github, then
follow [GitHub's directions](https://help.github.com/articles/generating-ssh-keys/)
to generate an SSH key.
* `git clone [email protected]:<your_name_here>/plugins.git`
* `git clone [email protected]:<your_name_here>/flutterfire.git`
* `cd plugins`
* `git remote add upstream [email protected]:flutter/plugins.git` (So that you
* `git remote add upstream [email protected]:FirebaseExtended/flutterfire.git` (So that you
fetch from the master repository, not your clone, when running `git fetch`
et al.)

Expand All @@ -37,7 +36,7 @@ example's directory, run `pub get` to make sure its dependencies have been
downloaded, and use `flutter run`. Make sure you have a device connected over
USB and debugging enabled on that device.

* `cd packages/battery/example`
* `cd packages/cloud_firestore/example`
* `flutter run`

## Running the tests
Expand All @@ -61,8 +60,8 @@ flutter drive test/<name_of_plugin>.dart

We gladly accept contributions via GitHub pull requests.

Please peruse our
[style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo) and
Please peruse the
[Flutter style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo) and
[design principles](https://flutter.io/design-principles/) before
working on anything non-trivial. These guidelines are intended to
keep the code consistent and avoid common pitfalls.
Expand All @@ -85,7 +84,7 @@ pub global run flutter_plugin_tools test --plugins plugin_name
To send us a pull request:

* `git pull-request` (if you are using [Hub](http://github.com/github/hub/)) or
go to `https://github.com/flutter/plugins` and click the
go to `https://github.com/FirebaseExtended/flutterfire` and click the
"Compare & pull request" button

Please make sure all your checkins have detailed commit messages explaining the patch.
Expand Down
107 changes: 0 additions & 107 deletions FlutterFire.md

This file was deleted.

Loading

0 comments on commit 296cd49

Please sign in to comment.