Skip to content

Update dependencies and fix lint stuff #511

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.

Sign up for GitHub

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 11 commits into from
Jan 11, 2017
Merged

Update dependencies and fix lint stuff #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1838e3
Merge remote-tracking branch 'firebase/version-1.1.0-dev' into email-…
SUPERCILEX Dec 16, 2016
f846de5
Update android gradle plugin
SUPERCILEX Dec 16, 2016
942f14e
Cleanup
SUPERCILEX Dec 16, 2016
021860b
Better lint InvalidPackage handling
SUPERCILEX Dec 17, 2016
5a9f18c
Merge remote-tracking branch 'firebase/version-1.1.0-dev' into quality
SUPERCILEX Dec 22, 2016
c507e3e
Merge remote-tracking branch 'firebase/version-1.1.0-dev' into email-…
SUPERCILEX Dec 22, 2016
6d964c4
Update dependencies
SUPERCILEX Dec 22, 2016
d862880
Merge branch 'email-refactor' into quality
SUPERCILEX Dec 22, 2016
54f624e
Merge remote-tracking branch 'firebase/version-1.1.0-dev' into quality
SUPERCILEX Jan 11, 2017
485ce98
Remove explicit glide dep in sample
SUPERCILEX Jan 11, 2017
97f6810
Hmmm, I guess you can't override lint options
SUPERCILEX Jan 11, 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
1 change: 0 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ dependencies {
// 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 'com.github.bumptech.glide:glide:3.7.0'
compile 'pub.devrel:easypermissions:0.2.1'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The following dependencies are not required to use the Firebase UI library.

That's no longer true: Glide is included in firebase-ui-storage.

compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
Expand Down
7 changes: 0 additions & 7 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ android {
}
}
}

lintOptions {
// We have okio as a transitive dependency, which causes some lint errors due to
// using Java 8 nio packages. Safely downgrading them to warning.
// https://github.com/square/okio/issues/58
warning 'InvalidPackage'
}
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'io.fabric.tools:gradle:1.+'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

Expand Down
6 changes: 5 additions & 1 deletion library/quality/quality.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ task pmd(type: Pmd) {

android {
lintOptions {
disable 'InvalidPackage', 'RestrictedApi'
// We have okio as a transitive dependency, which causes some lint errors due to
// using Java 8 nio packages. Safely downgrading them to warning.
// https://github.com/square/okio/issues/58
disable 'InvalidPackage'

baseline file("$configDir/lint-baseline.xml")
checkAllWarnings true
warningsAsErrors true
Expand Down