Skip to content

Commit b348218

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update and fix deps (#756)
1 parent 76c6762 commit b348218

11 files changed

+54
-36
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.DS_Store
77
build
88
google-services.json
9+
!/library/google-services.json
910

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

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ cache:
1010
- $HOME/.gradle/caches/
1111
- $HOME/.gradle/wrapper/
1212
- $HOME/.android/build-cache
13+
before_install:
14+
- mkdir "$ANDROID_HOME/licenses" || true
15+
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
16+
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
1317
android:
1418
components:
19+
# https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
1520
- tools
16-
- build-tools-25.0.3
17-
- android-25
18-
- platform-tools
19-
- extra-android-m2repository
20-
- extra-google-m2repository
21-
before_script: mv library/google-services.json app/google-services.json
21+
- tools
22+
before_script:
23+
- mv library/google-services.json app/google-services.json
24+
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository"
2225
script: ./gradlew clean assembleDebug check
2326
after_failure:
2427
# tests

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ dependencies {
3838
compile "com.google.firebase:firebase-database:$firebaseVersion"
3939
compile "com.google.firebase:firebase-storage:$firebaseVersion"
4040

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

4444
// The following dependencies are not required to use the Firebase UI library.
4545
// They are used to make some aspects of the demo app implementation simpler for
4646
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
47-
compile 'pub.devrel:easypermissions:0.4.0'
47+
compile 'pub.devrel:easypermissions:0.4.2'
4848
compile 'com.jakewharton:butterknife:8.5.1'
4949
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
5050
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ apply from: 'constants.gradle'
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
mavenLocal()
78
}
89

910
dependencies {
1011
classpath 'com.android.tools.build:gradle:2.3.1'
11-
classpath 'com.google.gms:google-services:3.0.0'
12+
classpath 'com.google.gms:google-services:3.1.0'
1213
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1314
}
1415
}
1516

1617
allprojects {
1718
repositories {
19+
google()
1820
jcenter()
1921
mavenLocal()
2022
mavenCentral()

constants.gradle

Lines changed: 2 additions & 2 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.3'
11+
buildTools = '25.0.3' // Remember to also update in .travis.yml
1212

1313
firebaseVersion = '11.0.1'
14-
supportLibraryVersion = '25.3.1'
14+
supportLibraryVersion = '25.4.0'
1515
}

gradle/wrapper/gradle-wrapper.jar

-77 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Apr 24 13:49:38 PDT 2017
1+
#Wed Jun 14 20:14:54 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.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

library/google-services.json

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,35 @@
11
{
22
"project_info": {
3-
"project_number": "",
4-
"firebase_url": "",
5-
"project_id": "",
6-
"storage_bucket": ""
3+
"project_number": "123456789000",
4+
"firebase_url": "https://firebase-ui.firebaseio.com",
5+
"project_id": "firebase-ui",
6+
"storage_bucket": "firebase-ui.appspot.com"
77
},
88
"client": [
99
{
1010
"client_info": {
11-
"mobilesdk_app_id": "",
11+
"mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
1212
"android_client_info": {
1313
"package_name": "com.firebase.uidemo"
1414
}
1515
},
1616
"oauth_client": [
1717
{
18-
"client_id": "",
18+
"client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com",
1919
"client_type": 1,
2020
"android_info": {
2121
"package_name": "com.firebase.uidemo",
22-
"certificate_hash": ""
22+
"certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7"
2323
}
2424
},
2525
{
26-
"client_id": "316052285104-forh4hpe453p0u45ij8j68hk61pjfnvf.apps.googleusercontent.com",
27-
"client_type": 1,
28-
"android_info": {
29-
"package_name": "com.firebase.uidemo",
30-
"certificate_hash": "FE3B409037A5F3C394E4DA3F697A1A737205EC67"
31-
}
32-
},
33-
{
34-
"client_id": "316052285104-rjq9h4q1gbv4cio1nbfht08p4fl3977d.apps.googleusercontent.com",
26+
"client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com",
3527
"client_type": 3
3628
}
3729
],
3830
"api_key": [
3931
{
40-
"current_key": ""
32+
"current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo"
4133
}
4234
],
4335
"services": {

library/quality/lint-baseline.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,25 @@
2929
column="13"/>
3030
</issue>
3131

32+
<issue
33+
id="UnusedResources"
34+
severity="Error"
35+
message="The resource `R.string.project_id` appears to be unused"
36+
category="Performance"
37+
priority="3"
38+
summary="Unused resources"
39+
explanation="Unused resources make applications larger and slow down builds."
40+
errorLine1=" &lt;string name=&quot;project_id&quot; translatable=&quot;false&quot;>fir-ui-playground&lt;/string>"
41+
errorLine2=" ~~~~~~~~~~~~~~~~~"
42+
quickfix="studio">
43+
<location
44+
file="build/generated/res/google-services/debug/values/values.xml"
45+
line="10"
46+
column="13"/>
47+
<location
48+
file="build/generated/res/google-services/release/values/values.xml"
49+
line="10"
50+
column="13"/>
51+
</issue>
52+
3253
</issues>

library/quality/quality.gradle

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

99
checkstyle {
10-
toolVersion = '7.7'
10+
toolVersion = '7.8'
1111
}
1212

1313
pmd {
14-
toolVersion = '5.6.0'
14+
toolVersion = '5.7.0'
1515
}
1616

1717
task checkstyle(type: Checkstyle) {

0 commit comments

Comments
 (0)