Skip to content

Commit 05dd082

Browse files
cbenhagencbenhagen
committed
Merge branch 'master' of https://github.com/FirebaseExtended/flutterfire into firebase_auth_macos
2 parents ddd3450 + 424b5d0 commit 05dd082

File tree

246 files changed

+7048
-1070
lines changed

Some content is hidden

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

246 files changed

+7048
-1070
lines changed

‎.cirrus.yml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ task:
9090
activate_script: pub global activate flutter_plugin_tools
9191
create_simulator_script:
9292
- xcrun simctl list
93-
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
93+
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
9494
matrix:
9595
- name: build-ipas+drive-examples
9696
env:
@@ -110,3 +110,28 @@ task:
110110
- flutter channel $CHANNEL
111111
- ./script/incremental_build.sh build-examples --ipa
112112
- ./script/incremental_build.sh drive-examples
113+
114+
task:
115+
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
116+
only_if: $CIRRUS_TAG == ''
117+
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
118+
osx_instance:
119+
image: mojave-xcode-11.3-flutter
120+
setup_script:
121+
- pod repo update
122+
- flutter config --enable-macos-desktop
123+
upgrade_script:
124+
- flutter channel master
125+
- flutter upgrade
126+
- git fetch origin master
127+
activate_script: pub global activate flutter_plugin_tools
128+
matrix:
129+
- name: lint_darwin_plugins
130+
script: ./script/lint_darwin_plugins.sh
131+
- name: build-apps+drive-examples
132+
env:
133+
PATH: $PATH:/usr/local/bin
134+
build_script:
135+
- flutter channel master
136+
- ./script/incremental_build.sh build-examples --macos --no-ipa
137+
- ./script/incremental_build.sh drive-examples --macos

‎.github/move.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Configuration for move-issues - https://github.com/dessant/move-issues
2+
3+
# Delete the command comment when it contains no other content.
4+
deleteCommand: true
5+
6+
# Close the source issue after moving.
7+
closeSourceIssue: true
8+
9+
# Lock the source issue after moving.
10+
lockSourceIssue: false
11+
12+
# Mention issue and comment authors.
13+
mentionAuthors: true
14+
15+
# Preserve mentions in the issue content.
16+
keepContentMentions: true

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ GeneratedPluginRegistrant.m
3636
GeneratedPluginRegistrant.java
3737
build/
3838
.flutter-plugins
39+
.flutter-plugins-dependencies
3940

4041
.project
4142
.classpath

‎AUTHORS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ Audrius Karosevicius <[email protected]>
4343
Lukasz Piliszczuk <[email protected]>
4444
SoundReply Solutions GmbH <[email protected]>
4545
Michel Feinstein <[email protected]>
46-
Tobias Löfstrand <[email protected]>
46+
Tobias Löfstrand <[email protected]>
47+
Stephen Beitzel <[email protected]>
48+
Mark Veenstra <[email protected]>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ that enable Flutter apps to use [Firebase](https://firebase.google.com/) service
1414

1515
| Plugin | Version | Firebase feature | Source code | Web? |
1616
|---|---|---|---|---|
17-
| [cloud_firestore][firestore_pub] | ![pub package][firestore_badge] | [Cloud Firestore][firestore_product] | [`cloud_firestore`][firestore_code] | |
18-
| [cloud_functions][functions_pub] | ![pub package][functions_badge] | [Cloud Functions][functions_product] | [`cloud_functions`][functions_code] | |
17+
| [cloud_firestore][firestore_pub] | ![pub package][firestore_badge] | [Cloud Firestore][firestore_product] | [`cloud_firestore`][firestore_code] | <img src="https://user-images.githubusercontent.com/394889/70172910-9174c880-1686-11ea-8e2e-3d8c1cc78cce.png" alt="hummingbird" width="25"> |
18+
| [cloud_functions][functions_pub] | ![pub package][functions_badge] | [Cloud Functions][functions_product] | [`cloud_functions`][functions_code] | <img src="https://user-images.githubusercontent.com/394889/70172910-9174c880-1686-11ea-8e2e-3d8c1cc78cce.png" alt="hummingbird" width="25"> |
1919
| [firebase_admob][admob_pub] | ![pub package][admob_badge] | [Firebase AdMob][admob_product] | [`firebase_admob`][admob_code] | |
2020
| [firebase_analytics][analytics_pub] | ![pub package][analytics_badge] | [Firebase Analytics][analytics_product] | [`firebase_analytics`][analytics_code] | |
2121
| [firebase_auth][auth_pub] | ![pub package][auth_badge] | [Firebase Authentication][auth_product] | [`firebase_auth`][auth_code] | <img src="https://user-images.githubusercontent.com/394889/70172910-9174c880-1686-11ea-8e2e-3d8c1cc78cce.png" alt="hummingbird" width="25"> |

‎packages/cloud_firestore/cloud_firestore/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
ios/Classes/UserAgent.h
2+
.flutter-plugins-dependencies
3+
generated_plugin_registrant.dart

‎packages/cloud_firestore/cloud_firestore/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## 0.13.2+1
2+
3+
* Add Web integration documentation to README.
4+
5+
## 0.13.2
6+
7+
* Add web support by default.
8+
* Require Flutter SDK 1.12.13+hotfix.4 or later
9+
* Add web support to the example app.
10+
11+
## 0.13.1+1
12+
13+
* Fixed crashes when using `Query#where` with `DocumentReference` objects
14+
15+
## 0.13.1
16+
17+
* Migrate to `cloud_firestore_platform_interface`.
18+
19+
## 0.13.0+2
20+
21+
* Fixed `persistenceEnabled`, `sslEnabled`, and `timestampsInSnapshotsEnabled` on iOS.
22+
123
## 0.13.0+1
224

325
* Remove the deprecated `author:` field from pubspec.yaml

‎packages/cloud_firestore/cloud_firestore/README.md‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,28 @@ For Flutter plugins for other Firebase products, see [README.md](https://github.
1010

1111
To use this plugin:
1212

13-
1. Using the [Firebase Console](http://console.firebase.google.com/), add an Android app to your project:
14-
Follow the assistant, download the generated google-services.json file and place it inside android/app. Next,
15-
modify the android/build.gradle file and the android/app/build.gradle file to add the Google services plugin
16-
as described by the Firebase assistant. Ensure that your `android/build.gradle` file contains the
13+
1. Add `cloud_firestore` as a [dependency in your pubspec.yaml file](https://flutter.dev/docs/development/packages-and-plugins/using-packages).
14+
15+
### Android
16+
17+
1. Using the [Firebase Console](http://console.firebase.google.com/), add an Android app to your project.
18+
2. Follow the assistant, and download the generated `google-services.json` file and place it inside `android/app`.
19+
3. Modify the `android/build.gradle` file and the `android/app/build.gradle` file to add the Google services plugin as described by the Firebase assistant. Ensure that your `android/build.gradle` file contains the
1720
`maven.google.com` as [described here](https://firebase.google.com/docs/android/setup#add_the_sdk).
18-
1. Using the [Firebase Console](http://console.firebase.google.com/), add an iOS app to your project:
19-
Follow the assistant, download the generated GoogleService-Info.plist file, open ios/Runner.xcworkspace
20-
with Xcode, and within Xcode place the file inside ios/Runner. Don't follow the steps named
21-
"Add Firebase SDK" and "Add initialization code" in the Firebase assistant.
22-
1. Add `cloud_firestore` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
21+
22+
### iOS
23+
24+
1. Using the [Firebase Console](http://console.firebase.google.com/), add an iOS app to your project.
25+
2. Follow the assistant, download the generated `GoogleService-Info.plist` file. Do **NOT** follow the steps named _"Add Firebase SDK"_ and _"Add initialization code"_ in the Firebase assistant.
26+
3. Open `ios/Runner.xcworkspace` with Xcode, and **within Xcode** place the `GoogleService-Info.plist` file inside `ios/Runner`.
27+
28+
### Web
29+
30+
In addition to the `cloud_firestore` dependency, you'll need to modify the `web/index.html` of your app following the Firebase setup instructions:
31+
32+
* [Add Firebase to your JavaScript project](https://firebase.google.com/docs/web/setup#from-the-cdn).
33+
34+
Read more in the [`cloud_firestore_web` README](https://github.com/FirebaseExtended/flutterfire/blob/master/packages/cloud_firestore/cloud_firestore_web/README.md).
2335

2436
## Usage
2537

‎packages/cloud_firestore/cloud_firestore/analysis_options.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# This is a temporary file to allow us to land a new set of linter rules in a
2-
# series of manageable patches instead of one gigantic PR. It disables some of
3-
# the new lints that are already failing on this plugin, for this plugin. It
4-
# should be deleted and the failing lints addressed as soon as possible.
5-
61
include: ../../../analysis_options.yaml
72

83
analyzer:

‎packages/cloud_firestore/cloud_firestore/example/android/gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
3-
android.enableJetifier=true
3+
android.enableJetifier=true
4+
android.enableR8=true

0 commit comments

Comments
 (0)