Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f56a7d4
First pass at adding GitHub IDP
SUPERCILEX May 13, 2017
b62eeb7
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into github
SUPERCILEX Jun 2, 2017
4e7bce1
Merge pull request #748 from firebase/version-2.0.0-dev
samtstern Jun 12, 2017
28c68a4
Version 2.0.0
samtstern Jun 12, 2017
cffc660
Mention phone numbers
samtstern Jun 12, 2017
20ca9a6
Update style guide (#712)
SUPERCILEX Jun 12, 2017
c7abbad
Make onActivityResult called from phone flow (#750) (#751)
samtstern Jun 13, 2017
80738f9
Version 2.0.1
samtstern Jun 13, 2017
76c6762
Merge pull request #752 from firebase/version-2.0.1-dev
samtstern Jun 15, 2017
b348218
Update and fix deps (#756)
SUPERCILEX Jun 15, 2017
9bbcf8d
Add support for night mode (#749)
SUPERCILEX Jun 15, 2017
c131402
Changed order of parameters in constructor of "Chat" class (#758)
pizza Jun 15, 2017
c449be1
edit Readme.md (#762)
GlenMonad Jun 19, 2017
7330b45
Merge branch 'master' into version-2.1.0-dev
samtstern Jun 21, 2017
6d2c1ae
Update FirebaseListAdapter to use Context in constructor and layout i…
WillieCubed Jun 22, 2017
baa2d51
When linking two accounts, use the provider the user last added to th…
SUPERCILEX Jun 27, 2017
b9a2fa4
Kill BaseHelper and friends (#777)
samtstern Jun 27, 2017
19132d0
Fix Fragment getContext NPE (#781)
SUPERCILEX Jun 29, 2017
6ed22ad
Merge remote-tracking branch 'upstream/version-2.1.0-dev' into github
SUPERCILEX Jul 3, 2017
ab7d490
YAAASSSSSSSSSS QUEEEEEN!!! It works!
SUPERCILEX Jul 3, 2017
3237b6e
Finalize scope management
SUPERCILEX Jul 3, 2017
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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
.gradle
*.iml
/local.properties
.idea
.idea/**
!.idea/codeStyleSettings.xml
.DS_Store
build
google-services.json
!/library/google-services.json

crashlytics-build.properties
auth/src/main/res/values/com_crashlytics_export_strings.xml
211 changes: 207 additions & 4 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ cache:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
android:
components:
# https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
- tools
- build-tools-25.0.3
- android-25
- platform-tools
- extra-android-m2repository
- extra-google-m2repository
before_script: mv library/google-services.json app/google-services.json
- tools
before_script:
- mv library/google-services.json app/google-services.json
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository"
script: ./gradlew clean assembleDebug check
after_failure:
# tests
Expand Down
11 changes: 6 additions & 5 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:1.2.0'
compile 'com.firebaseui:firebase-ui-database:2.0.1'

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

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

// Single target that includes all FirebaseUI libraries above
compile 'com.firebaseui:firebase-ui:1.2.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,6 +91,7 @@ For convenience, here are some recent examples:

| FirebaseUI Version | Firebase/Play Services Version |
|--------------------|--------------------------------|
| 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
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ dependencies {
compile "com.google.firebase:firebase-database:$firebaseVersion"
compile "com.google.firebase:firebase-storage:$firebaseVersion"

compile('com.facebook.android:facebook-android-sdk:4.22.1')
compile('com.facebook.android:facebook-android-sdk:4.23.0')
compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }

// The following dependencies are not required to use the Firebase UI library.
// They are used to make some aspects of the demo app implementation simpler for
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
compile 'pub.devrel:easypermissions:0.4.0'
compile 'pub.devrel:easypermissions:0.4.2'
compile 'com.jakewharton:butterknife:8.5.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

<application
android:name=".auth.LeakCatcher"
android:name=".auth.FirebaseUIDemo"
android:allowBackup="true"
android:fullBackupContent="true"
android:icon="@mipmap/ic_launcher"
Expand Down
Loading