Skip to content

Commit 4a684f3

Browse files
committed
Merge branch 'version-3.3.1-dev' into firestore-infinite-scroll
Change-Id: I863d67d604b1ef768a591d2456e71a7f94730a53
2 parents 45901b7 + 677e139 commit 4a684f3

File tree

194 files changed

+8415
-9105
lines changed

Some content is hidden

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

194 files changed

+8415
-9105
lines changed

README.md

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ A compatible FirebaseUI client is also available for [iOS](https://github.com/fi
1616
1. [Compatability](#compatibility-with-firebase--google-play-services-libraries)
1717
1. [Upgrading dependencies](#upgrading-dependencies)
1818
1. [Sample App](#sample-app)
19+
1. [Snapshot Builds](#snapshot-builds)
1920
1. [Contributing](#contributing)
2021
1. [Installing](#installing-locally)
2122
1. [Deploying](#deployment)
@@ -46,16 +47,16 @@ libraries.
4647
```groovy
4748
dependencies {
4849
// FirebaseUI for Firebase Realtime Database
49-
implementation 'com.firebaseui:firebase-ui-database:3.2.1'
50+
implementation 'com.firebaseui:firebase-ui-database:3.3.0'
5051
5152
// FirebaseUI for Cloud Firestore
52-
implementation 'com.firebaseui:firebase-ui-firestore:3.2.1'
53+
implementation 'com.firebaseui:firebase-ui-firestore:3.3.0'
5354
5455
// FirebaseUI for Firebase Auth
55-
implementation 'com.firebaseui:firebase-ui-auth:3.2.1'
56+
implementation 'com.firebaseui:firebase-ui-auth:3.3.0'
5657
5758
// FirebaseUI for Cloud Storage
58-
implementation 'com.firebaseui:firebase-ui-storage:3.2.1'
59+
implementation 'com.firebaseui:firebase-ui-storage:3.3.0'
5960
}
6061
```
6162

@@ -102,7 +103,8 @@ For convenience, here are some recent examples:
102103

103104
| FirebaseUI Version | Firebase/Play Services Version |
104105
|--------------------|--------------------------------|
105-
| 3.2.1 | 11.8.0 |
106+
| 3.3.0 | 12.0.1 |
107+
| 3.2.2 | 11.8.0 |
106108
| 3.1.3 | 11.8.0 |
107109
| 3.1.2 | 11.6.2 |
108110
| 3.1.0 | 11.4.2 |
@@ -199,6 +201,32 @@ and Gradle while trying to run the sample app, try disabling the Instant
199201
Run feature of Android Studio. Alternatively, update Android Studio and
200202
Gradle to their latest versions.
201203

204+
## Snapshot builds
205+
206+
Like to live on the cutting edge? Want to try the next release of FirebaseUI before anyone else? As of version `3.2.2`
207+
FirebaseUI hosts "snapshot" builds on oss.jfrog.org.
208+
209+
Just add the following to your `build.gradle`:
210+
211+
```groovy
212+
repositories {
213+
maven { url "https://oss.jfrog.org/artifactory/oss-release-local" }
214+
}
215+
```
216+
217+
Then you can depend on snapshot versions:
218+
219+
```groovy
220+
implementation 'com.firebaseui:firebase-ui-auth:3.2.2-SNAPSHOT`
221+
```
222+
223+
You can see which `SNAPSHOT` builds are avaiable here:
224+
https://oss.jfrog.org/webapp/#/artifacts/browse/tree/General/oss-snapshot-local/com/firebaseui
225+
226+
Snapshot builds come with absolutely no guarantees and we will close any issues asking to troubleshoot
227+
a snapshot report unless they identify a bug that should block the release launch. Experiment
228+
at your own risk!
229+
202230
## Contributing
203231

204232
### Installing locally

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ android {
3838
dependencies {
3939
implementation "com.google.firebase:firebase-core:$firebaseVersion"
4040
implementation "com.android.support:design:$supportLibraryVersion"
41-
implementation 'com.android.support:multidex:1.0.2'
41+
implementation 'com.android.support:multidex:1.0.3'
4242

4343
implementation project(path: ':auth')
4444
implementation project(path: ':firestore')
4545
implementation project(path: ':database')
4646
implementation project(path: ':storage')
4747

48-
implementation 'com.facebook.android:facebook-login:4.30.0'
48+
implementation 'com.facebook.android:facebook-login:4.31.0'
4949
// Needed to override Facebook
5050
implementation "com.android.support:cardview-v7:$supportLibraryVersion"
5151
implementation "com.android.support:customtabs:$supportLibraryVersion"
@@ -58,7 +58,7 @@ dependencies {
5858
// They are used to make some aspects of the demo app implementation simpler for
5959
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
6060
implementation "android.arch.lifecycle:runtime:$architectureVersion"
61-
implementation 'pub.devrel:easypermissions:1.1.3'
61+
implementation 'pub.devrel:easypermissions:1.2.0'
6262
implementation 'com.jakewharton:butterknife:8.8.1'
6363
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
6464
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import android.content.Intent;
1818
import android.os.Bundle;
19+
import android.support.annotation.Nullable;
1920
import android.support.annotation.StringRes;
2021
import android.support.v7.app.AppCompatActivity;
2122
import android.support.v7.widget.LinearLayoutManager;
@@ -39,7 +40,7 @@ public class ChooserActivity extends AppCompatActivity {
3940
RecyclerView mActivities;
4041

4142
@Override
42-
protected void onCreate(Bundle savedInstanceState) {
43+
protected void onCreate(@Nullable Bundle savedInstanceState) {
4344
super.onCreate(savedInstanceState);
4445
setContentView(R.layout.activity_chooser);
4546
ButterKnife.bind(this);

0 commit comments

Comments
 (0)