Skip to content

Update and fix deps #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 15, 2017
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.DS_Store
build
google-services.json
!/library/google-services.json

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

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
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
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ apply from: 'constants.gradle'

buildscript {
repositories {
google()
jcenter()
mavenLocal()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.google.gms:google-services:3.1.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

allprojects {
repositories {
google()
jcenter()
mavenLocal()
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions constants.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ project.ext {
targetSdk = 25
minSdk = 14

buildTools = '25.0.3'
buildTools = '25.0.3' // Remember to also update in .travis.yml

firebaseVersion = '11.0.1'
supportLibraryVersion = '25.3.1'
supportLibraryVersion = '25.4.0'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Apr 24 13:49:38 PDT 2017
#Wed Jun 14 20:14:54 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
26 changes: 9 additions & 17 deletions library/google-services.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,35 @@
{
"project_info": {
"project_number": "",
"firebase_url": "",
"project_id": "",
"storage_bucket": ""
"project_number": "123456789000",
"firebase_url": "https://firebase-ui.firebaseio.com",
"project_id": "firebase-ui",
"storage_bucket": "firebase-ui.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "",
"mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
"android_client_info": {
"package_name": "com.firebase.uidemo"
}
},
"oauth_client": [
{
"client_id": "",
"client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.firebase.uidemo",
"certificate_hash": ""
"certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7"
}
},
{
"client_id": "316052285104-forh4hpe453p0u45ij8j68hk61pjfnvf.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.firebase.uidemo",
"certificate_hash": "FE3B409037A5F3C394E4DA3F697A1A737205EC67"
}
},
{
"client_id": "316052285104-rjq9h4q1gbv4cio1nbfht08p4fl3977d.apps.googleusercontent.com",
"client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": ""
"current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo"
}
],
"services": {
Expand Down
21 changes: 21 additions & 0 deletions library/quality/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,25 @@
column="13"/>
</issue>

<issue
id="UnusedResources"
severity="Error"
message="The resource `R.string.project_id` appears to be unused"
category="Performance"
priority="3"
summary="Unused resources"
explanation="Unused resources make applications larger and slow down builds."
errorLine1=" &lt;string name=&quot;project_id&quot; translatable=&quot;false&quot;>fir-ui-playground&lt;/string>"
errorLine2=" ~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="build/generated/res/google-services/debug/values/values.xml"
line="10"
column="13"/>
<location
file="build/generated/res/google-services/release/values/values.xml"
line="10"
column="13"/>
</issue>

</issues>
4 changes: 2 additions & 2 deletions library/quality/quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ def configDir = "${project.rootDir}/library/quality"
def reportsDir = "${project.buildDir}/reports"

checkstyle {
toolVersion = '7.7'
toolVersion = '7.8'
}

pmd {
toolVersion = '5.6.0'
toolVersion = '5.7.0'
}

task checkstyle(type: Checkstyle) {
Expand Down