Skip to content

Commit 5d114a6

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update deps (#703)
1 parent e26e858 commit 5d114a6

File tree

10 files changed

+29
-28
lines changed

10 files changed

+29
-28
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cache:
1313
android:
1414
components:
1515
- tools
16-
- build-tools-25.0.2
16+
- build-tools-25.0.3
1717
- android-25
1818
- platform-tools
1919
- extra-android-m2repository

app/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.neenbedankt.android-apt'
32
apply from: '../library/quality/quality.gradle'
43

54
android {
@@ -42,12 +41,12 @@ dependencies {
4241
// The following dependencies are not required to use the Firebase UI library.
4342
// They are used to make some aspects of the demo app implementation simpler for
4443
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
45-
compile 'pub.devrel:easypermissions:0.3.0'
44+
compile 'pub.devrel:easypermissions:0.4.0'
4645
compile 'com.jakewharton:butterknife:8.5.1'
47-
apt 'com.jakewharton:butterknife-compiler:8.5.1'
46+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
4847
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
49-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
50-
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
48+
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
49+
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
5150
}
5251

5352
apply plugin: 'com.google.gms.google-services'

auth/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ dependencies {
4444
compile "com.google.firebase:firebase-auth:$firebaseVersion"
4545
compile "com.google.android.gms:play-services-auth:$firebaseVersion"
4646

47-
compile 'com.facebook.android:facebook-android-sdk:4.20.0'
48-
compile("com.twitter.sdk.android:twitter:2.3.1@aar") { transitive = true }
47+
compile 'com.facebook.android:facebook-android-sdk:4.22.1'
48+
compile("com.twitter.sdk.android:twitter:2.3.2@aar") { transitive = true }
4949

5050
// The following libraries are needed to prevent incompatibilities with the facebook
5151
// library when updating com.android.support libraries:
5252
compile "com.android.support:cardview-v7:$supportLibraryVersion"
5353

5454
testCompile 'junit:junit:4.12'
55-
//noinspection NewerVersionAvailable, GradleDynamicVersion
56-
testCompile 'org.mockito:mockito-core:2.7.+'
55+
//noinspection GradleDynamicVersion
56+
testCompile 'org.mockito:mockito-core:2.8.+'
5757
testCompile 'org.robolectric:robolectric:3.2.2'
5858
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5959
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'

build.gradle

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

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:2.3.0'
11+
classpath 'com.android.tools.build:gradle:2.3.1'
1212
classpath 'com.google.gms:google-services:3.0.0'
1313
classpath 'io.fabric.tools:gradle:1.+'
14-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1514
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1615
}
1716
}
@@ -57,7 +56,7 @@ allprojects { project ->
5756
project.apply plugin: 'com.android.library'
5857
android {
5958
compileSdkVersion compileSdk
60-
buildToolsVersion "${buildTools}"
59+
buildToolsVersion buildTools
6160
}
6261

6362
// Task to generate sources JAR

constants.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ project.ext {
88
targetSdk = 25
99
minSdk = 14
1010

11-
buildTools = '25.0.2'
11+
buildTools = '25.0.3'
1212

13-
firebaseVersion = '10.2.1'
14-
supportLibraryVersion = '25.3.0'
13+
firebaseVersion = '10.2.4'
14+
supportLibraryVersion = '25.3.1'
1515
}

database/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ android {
2222
}
2323

2424
dependencies {
25-
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
2625
compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
26+
// Needed to override play services
27+
compile "com.android.support:support-v4:$supportLibraryVersion"
2728

2829
compile "com.google.firebase:firebase-database:$firebaseVersion"
2930

3031
androidTestCompile 'junit:junit:4.12'
31-
androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion"
3232
androidTestCompile 'com.android.support.test:runner:0.5'
3333
androidTestCompile 'com.android.support.test:rules:0.5'
3434
}

gradle/wrapper/gradle-wrapper.jar

575 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 04 16:24:17 SGT 2017
1+
#Mon Apr 24 13:49:38 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

library/quality/lint-baseline.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<location file="src/main/AndroidManifest.xml"/>
1313
</issue>
1414

15+
<!-- These ids are used in the AuthMethodPickerActivityTest.java tests -->
1516
<issue
1617
id="SelectableText"
1718
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
18-
errorLine1=" &lt;TextView
19-
"
19+
errorLine1=" &lt;TextView"
2020
errorLine2=" ^">
2121
<location
2222
file="src/main/res/layout/register_email_layout.xml"
@@ -27,8 +27,7 @@
2727
<issue
2828
id="SelectableText"
2929
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
30-
errorLine1=" &lt;TextView
31-
"
30+
errorLine1=" &lt;TextView"
3231
errorLine2=" ^">
3332
<location
3433
file="src/main/res/layout/welcome_back_idp_prompt_layout.xml"
@@ -39,8 +38,7 @@
3938
<issue
4039
id="SelectableText"
4140
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
42-
errorLine1=" &lt;TextView
43-
"
41+
errorLine1=" &lt;TextView"
4442
errorLine2=" ^">
4543
<location
4644
file="src/main/res/layout/welcome_back_password_prompt_layout.xml"

library/quality/quality.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ def configDir = "${project.rootDir}/library/quality"
77
def reportsDir = "${project.buildDir}/reports"
88

99
checkstyle {
10-
toolVersion = '7.4'
10+
toolVersion = '7.7'
11+
}
12+
13+
pmd {
14+
toolVersion = '5.6.0'
1115
}
1216

1317
task checkstyle(type: Checkstyle) {
@@ -72,7 +76,8 @@ android {
7276
// We have okio as a transitive dependency, which causes some lint errors due to
7377
// using Java 8 nio packages. Safely downgrading them to warning.
7478
// https://github.com/square/okio/issues/58
75-
disable 'InvalidPackage', 'NewerVersionAvailable', 'GradleDependency'
79+
disable 'InvalidPackage',
80+
'NewerVersionAvailable', 'GradleDependency' // For reproducible builds
7681

7782
baseline file("$configDir/lint-baseline.xml")
7883
checkAllWarnings true

0 commit comments

Comments
 (0)