Skip to content

Commit 816ac10

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update dependencies and fix lint stuff (#511)
* Update android gradle plugin Signed-off-by: Alex Saveau <[email protected]> * Cleanup Signed-off-by: Alex Saveau <[email protected]> * Better lint InvalidPackage handling Signed-off-by: Alex Saveau <[email protected]> * Update dependencies Signed-off-by: Alex Saveau <[email protected]> * Remove explicit glide dep in sample Signed-off-by: Alex Saveau <[email protected]> * Hmmm, I guess you can't override lint options Signed-off-by: Alex Saveau <[email protected]>
1 parent 56a45e3 commit 816ac10

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencies {
4343
// The following dependencies are not required to use the Firebase UI library.
4444
// They are used to make some aspects of the demo app implementation simpler for
4545
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
46-
compile 'com.github.bumptech.glide:glide:3.7.0'
4746
compile 'pub.devrel:easypermissions:0.2.1'
4847
compile 'com.jakewharton:butterknife:8.4.0'
4948
apt 'com.jakewharton:butterknife-compiler:8.4.0'

auth/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ android {
2727
}
2828
}
2929
}
30-
31-
lintOptions {
32-
// We have okio as a transitive dependency, which causes some lint errors due to
33-
// using Java 8 nio packages. Safely downgrading them to warning.
34-
// https://github.com/square/okio/issues/58
35-
warning 'InvalidPackage'
36-
}
3730
}
3831

3932
dependencies {

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:2.3.0-beta1'
11+
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
1212
classpath 'com.google.gms:google-services:3.0.0'
1313
classpath 'io.fabric.tools:gradle:1.+'
1414
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
15-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
15+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1616
}
1717
}
1818

library/quality/quality.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ task pmd(type: Pmd) {
6969

7070
android {
7171
lintOptions {
72-
disable 'InvalidPackage', 'RestrictedApi'
72+
// We have okio as a transitive dependency, which causes some lint errors due to
73+
// using Java 8 nio packages. Safely downgrading them to warning.
74+
// https://github.com/square/okio/issues/58
75+
disable 'InvalidPackage'
76+
7377
baseline file("$configDir/lint-baseline.xml")
7478
checkAllWarnings true
7579
warningsAsErrors true

0 commit comments

Comments
 (0)