Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master' into gerrit-master
Browse files Browse the repository at this point in the history
Change-Id: I7615e0daaf8218d0d6a0037715c23dc4b5072713
  • Loading branch information
samtstern committed Aug 3, 2017
2 parents 0f464c0 + aa6d547 commit c97a690
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion admob/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'

// [START gradle_play_config]
compile 'com.google.firebase:firebase-ads:11.0.1'
compile 'com.google.firebase:firebase-ads:11.0.4'
// [END gradle_play_config]

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
Expand Down
2 changes: 1 addition & 1 deletion analytics/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'

compile 'com.google.firebase:firebase-analytics:11.0.1'
compile 'com.google.firebase:firebase-analytics:11.0.4'

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test:runner:0.5'
Expand Down
2 changes: 1 addition & 1 deletion app-indexing/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configurations.all {

dependencies {
// [START app_indexing_gradle_dep]
compile 'com.google.firebase:firebase-appindexing:11.0.1'
compile 'com.google.firebase:firebase-appindexing:11.0.4'
// [END app_indexing_gradle_dep]

compile 'com.android.support:support-v4:25.3.1'
Expand Down
4 changes: 2 additions & 2 deletions auth/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ dependencies {
compile 'com.android.support:design:25.3.1'

// Firebase Authentication
compile 'com.google.firebase:firebase-auth:11.0.1'
compile 'com.google.firebase:firebase-auth:11.0.4'

// Google Sign In SDK (only required for Google Sign In)
compile 'com.google.android.gms:play-services-auth:11.0.1'
compile 'com.google.android.gms:play-services-auth:11.0.4'

// Firebase UI
// Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16
Expand Down
2 changes: 1 addition & 1 deletion config/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'

compile 'com.google.firebase:firebase-config:11.0.1'
compile 'com.google.firebase:firebase-config:11.0.4'

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test:runner:0.5'
Expand Down
2 changes: 1 addition & 1 deletion crash/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'

compile 'com.google.firebase:firebase-crash:11.0.1'
compile 'com.google.firebase:firebase-crash:11.0.4'

testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
Expand Down
4 changes: 2 additions & 2 deletions database/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ dependencies {

compile 'com.firebaseui:firebase-ui-database:1.2.0'

compile 'com.google.firebase:firebase-auth:11.0.1'
compile 'com.google.firebase:firebase-database:11.0.1'
compile 'com.google.firebase:firebase-auth:11.0.4'
compile 'com.google.firebase:firebase-database:11.0.4'

testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
Expand Down
2 changes: 1 addition & 1 deletion dynamiclinks/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'

compile 'com.google.firebase:firebase-invites:11.0.1'
compile 'com.google.firebase:firebase-invites:11.0.4'

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test:runner:0.5'
Expand Down
2 changes: 1 addition & 1 deletion invites/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'

compile 'com.google.firebase:firebase-invites:11.0.1'
compile 'com.google.firebase:firebase-invites:11.0.4'

// UiAutomatorTesting
androidTestCompile 'com.android.support.test:runner:0.5'
Expand Down
2 changes: 1 addition & 1 deletion messaging/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
compile 'com.android.support:animated-vector-drawable:26.0.0'
compile 'com.android.support:support-compat:26.0.0'

compile 'com.google.firebase:firebase-messaging:11.0.2'
compile 'com.google.firebase:firebase-messaging:11.0.4'
compile 'com.firebase:firebase-jobdispatcher:0.6.0'

// Testing dependencies
Expand Down
4 changes: 2 additions & 2 deletions perf/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android.applicationVariants.all {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile 'com.google.firebase:firebase-core:11.0.1'
compile 'com.google.firebase:firebase-perf:11.0.1'
compile 'com.google.firebase:firebase-core:11.0.4'
compile 'com.google.firebase:firebase-perf:11.0.4'

compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
Expand Down
4 changes: 2 additions & 2 deletions storage/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ configurations.all {
dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'

compile 'com.google.firebase:firebase-auth:11.0.1'
compile 'com.google.firebase:firebase-storage:11.0.1'
compile 'com.google.firebase:firebase-auth:11.0.4'
compile 'com.google.firebase:firebase-storage:11.0.4'

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
Expand Down

0 comments on commit c97a690

Please sign in to comment.