Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
.DS_Store
build
google-services.json

crashlytics-build.properties
auth/src/main/res/values/com_crashlytics_export_strings.xml

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ libraries.
```groovy
dependencies {
// FirebaseUI Database only
compile 'com.firebaseui:firebase-ui-database:2.0.0'
compile 'com.firebaseui:firebase-ui-database:2.0.1'

// FirebaseUI Auth only
compile 'com.firebaseui:firebase-ui-auth:2.0.0'
compile 'com.firebaseui:firebase-ui-auth:2.0.1'

// FirebaseUI Storage only
compile 'com.firebaseui:firebase-ui-storage:2.0.0'
compile 'com.firebaseui:firebase-ui-storage:2.0.1'

// Single target that includes all FirebaseUI libraries above
compile 'com.firebaseui:firebase-ui:2.0.0'
compile 'com.firebaseui:firebase-ui:2.0.1'
}
```

Expand All @@ -63,7 +63,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
If you are using an old version of FirebaseUI and upgrading, please see the appropriate
migration guide:

* [Upgrade from 1.2.0 to 2.0](./docs/upgrade-to-2.0.md)
* [Upgrade from 1.2.0 to 2.0.x](./docs/upgrade-to-2.0.md)

## Dependencies

Expand Down Expand Up @@ -91,7 +91,7 @@ For convenience, here are some recent examples:

| FirebaseUI Version | Firebase/Play Services Version |
|--------------------|--------------------------------|
| 2.0.0 | 11.0.0 |
| 2.0.1 | 11.0.1 |
| 1.2.0 | 10.2.0 |
| 1.1.1 | 10.0.0 or 10.0.1 |
| 1.0.1 | 10.0.0 or 10.0.1 |
Expand Down
2 changes: 1 addition & 1 deletion auth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Gradle, add the dependency:
```groovy
dependencies {
// ...
compile 'com.firebaseui:firebase-ui-auth:2.0.0'
compile 'com.firebaseui:firebase-ui-auth:2.0.1'

// Required only if Facebook login support is required
compile('com.facebook.android:facebook-android-sdk:4.22.1')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
case RC_IDP_SIGNIN:
case RC_AUTH_METHOD_PICKER:
case RC_EMAIL_FLOW:
case RC_PHONE_FLOW:
finish(resultCode, data);
break;
default:
Expand Down
4 changes: 2 additions & 2 deletions constants.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project.ext {
submodules = ['database', 'auth', 'storage']
group = 'com.firebaseui'
version = '2.0.0'
version = '2.0.1'
pomdesc = 'Firebase UI Android'

compileSdk = 25
Expand All @@ -10,6 +10,6 @@ project.ext {

buildTools = '25.0.3'

firebaseVersion = '11.0.0'
firebaseVersion = '11.0.1'
supportLibraryVersion = '25.3.1'
}