Skip to content

Update deps #703

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 28 commits into from
May 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4776096
Update deps
SUPERCILEX Mar 18, 2017
1d9c471
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into update
SUPERCILEX Apr 24, 2017
51b932f
Moar updates
SUPERCILEX Apr 24, 2017
0c1f207
Even moaaar updates
SUPERCILEX Apr 24, 2017
de8d549
Use new annotation processor
SUPERCILEX Apr 25, 2017
9138349
Fix annoying errors in build logs
SUPERCILEX Apr 25, 2017
13d2444
Fix quality checks
SUPERCILEX Apr 25, 2017
364958b
Fix more quality checks
SUPERCILEX Apr 25, 2017
b4097c2
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into update
SUPERCILEX Apr 26, 2017
d499c8c
Update LeakCanary
SUPERCILEX Apr 28, 2017
77b7a0a
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into update
SUPERCILEX May 2, 2017
0b2a480
Merge remote-tracking branch 'origin/update' into update
SUPERCILEX May 2, 2017
6361699
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into update
SUPERCILEX May 9, 2017
d7fd275
Update styles.xml
SUPERCILEX May 10, 2017
bb1c258
Update constants.gradle
SUPERCILEX May 10, 2017
6758f08
Update build.gradle
SUPERCILEX May 10, 2017
6c0b4c6
Update .travis.yml
SUPERCILEX May 10, 2017
695db3d
Merge remote-tracking branch 'upstream/version-2.0.0-dev' into update
SUPERCILEX May 11, 2017
60def93
Merge remote-tracking branch 'origin/update' into update
SUPERCILEX May 11, 2017
bab6218
Fix stuff?
SUPERCILEX May 11, 2017
c992923
Cleanup
SUPERCILEX May 11, 2017
b537809
Update checkstyle
SUPERCILEX May 11, 2017
80a0b4e
Downgrade Gradle plugin to fix tests
SUPERCILEX May 11, 2017
5ead48f
Remove unnecessarily disabled checks now that the Gradle plugin is do…
SUPERCILEX May 11, 2017
ef9c256
Update EasyPermissions
SUPERCILEX May 11, 2017
542b36c
Undo changes lint isn't complaining about anymore
SUPERCILEX May 11, 2017
0f0b667
Add back changes that are needed with the old gradle plugin
SUPERCILEX May 11, 2017
6b11ab4
Hmmm, it looks like Facebook didn't fix it after all
SUPERCILEX May 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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cache:
android:
components:
- tools
- build-tools-25.0.2
- build-tools-25.0.3
- android-25
- platform-tools
- extra-android-m2repository
Expand Down
9 changes: 4 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply from: '../library/quality/quality.gradle'

android {
Expand Down Expand Up @@ -42,12 +41,12 @@ 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 'pub.devrel:easypermissions:0.3.0'
compile 'pub.devrel:easypermissions:0.4.0'
compile 'com.jakewharton:butterknife:8.5.1'
apt 'com.jakewharton:butterknife-compiler:8.5.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
}

apply plugin: 'com.google.gms.google-services'
8 changes: 4 additions & 4 deletions auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ dependencies {
compile "com.google.firebase:firebase-auth:$firebaseVersion"
compile "com.google.android.gms:play-services-auth:$firebaseVersion"

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

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

testCompile 'junit:junit:4.12'
//noinspection NewerVersionAvailable, GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.7.+'
//noinspection GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.8.+'
testCompile 'org.robolectric:robolectric:3.2.2'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.1'
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.3'
}
}
Expand Down Expand Up @@ -57,7 +56,7 @@ allprojects { project ->
project.apply plugin: 'com.android.library'
android {
compileSdkVersion compileSdk
buildToolsVersion "${buildTools}"
buildToolsVersion buildTools
}

// Task to generate sources JAR
Expand Down
6 changes: 3 additions & 3 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.2'
buildTools = '25.0.3'

firebaseVersion = '10.2.1'
supportLibraryVersion = '25.3.0'
firebaseVersion = '10.2.4'
supportLibraryVersion = '25.3.1'
}
4 changes: 2 additions & 2 deletions database/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ android {
}

dependencies {
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ouch, we were unnecessarily pulling in appcompat. 😕

Copy link
Contributor

Choose a reason for hiding this comment

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

Yikes! Good catch.

compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
// Needed to override play services
compile "com.android.support:support-v4:$supportLibraryVersion"

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

androidTestCompile 'junit:junit:4.12'
androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion"
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
}
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 @@
#Sat Mar 04 16:24:17 SGT 2017
#Mon Apr 24 13:49:38 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
10 changes: 4 additions & 6 deletions library/quality/lint-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<location file="src/main/AndroidManifest.xml"/>
</issue>

<!-- These ids are used in the AuthMethodPickerActivityTest.java tests -->
<issue
id="SelectableText"
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
errorLine1=" &lt;TextView
"
errorLine1=" &lt;TextView"
errorLine2=" ^">
<location
file="src/main/res/layout/register_email_layout.xml"
Expand All @@ -27,8 +27,7 @@
<issue
id="SelectableText"
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
errorLine1=" &lt;TextView
"
errorLine1=" &lt;TextView"
errorLine2=" ^">
<location
file="src/main/res/layout/welcome_back_idp_prompt_layout.xml"
Expand All @@ -39,8 +38,7 @@
<issue
id="SelectableText"
message="Consider making the text value selectable by specifying `android:textIsSelectable=&quot;true&quot;`"
errorLine1=" &lt;TextView
"
errorLine1=" &lt;TextView"
errorLine2=" ^">
<location
file="src/main/res/layout/welcome_back_password_prompt_layout.xml"
Expand Down
9 changes: 7 additions & 2 deletions library/quality/quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ def configDir = "${project.rootDir}/library/quality"
def reportsDir = "${project.buildDir}/reports"

checkstyle {
toolVersion = '7.4'
toolVersion = '7.7'
}

pmd {
toolVersion = '5.6.0'
}

task checkstyle(type: Checkstyle) {
Expand Down Expand Up @@ -72,7 +76,8 @@ android {
// 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', 'NewerVersionAvailable', 'GradleDependency'
disable 'InvalidPackage',
'NewerVersionAvailable', 'GradleDependency' // For reproducible builds

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