Skip to content

Commit c32d401

Browse files
author
devrel-build
committed
Merge commit 'ca278b1b46c07f14d85bb7b2e621975c0017b42a' into HEAD
2 parents a994e3a + ca278b1 commit c32d401

24 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎admob/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ android {
2727
}
2828

2929
configurations.all {
30-
resolutionStrategy.force 'com.android.support:support-annotations:25.0.1'
30+
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
3131
}
3232

3333
dependencies {
3434
compile fileTree(dir: 'libs', include: ['*.jar'])
3535
// AppCompat
36-
compile 'com.android.support:appcompat-v7:25.0.1'
36+
compile 'com.android.support:appcompat-v7:25.3.1'
3737

3838
// [START gradle_play_config]
39-
compile 'com.google.firebase:firebase-ads:10.2.1'
39+
compile 'com.google.firebase:firebase-ads:10.2.6'
4040
// [END gradle_play_config]
4141

4242
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎admob/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:2.3.1'
10-
classpath 'com.google.gms:google-services:3.0.0'
10+
classpath 'com.google.gms:google-services:3.1.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎analytics/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Firebase Analytics Quickstart
2-
==============================
1+
Google Analytics for Firebase Quickstart
2+
========================================
33

44
Introduction
55
------------
66

7-
- [Read more about Firebase Analytics](https://firebase.google.com/docs/analytics)
7+
- [Read more about Google Analytics for Firebase](https://firebase.google.com/docs/analytics)
88

99
Getting Started
1010
---------------
@@ -23,7 +23,7 @@ favorite food is. This choice will be logged to Firebase
2323
Analytics as a [User Property][user-props].
2424

2525
As you swipe between tabs in the app, `SELECT_CONTENT` events
26-
are logged to Firebase Analytics. You can see these events in
26+
are logged to Analytics. You can see these events in
2727
real time using [Debug View][debug-view].
2828

2929
Support

‎analytics/app/build.gradle‎

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

2424
configurations.all {
25-
resolutionStrategy.force 'com.android.support:support-annotations:25.0.1'
25+
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
2626
}
2727

2828
dependencies {
2929
compile fileTree(dir: 'libs', include: ['*.jar'])
30-
compile 'com.android.support:appcompat-v7:25.0.1'
31-
compile 'com.android.support:support-v4:25.0.1'
30+
compile 'com.android.support:appcompat-v7:25.3.1'
31+
compile 'com.android.support:support-v4:25.3.1'
3232

33-
compile 'com.google.firebase:firebase-analytics:10.2.1'
33+
compile 'com.google.firebase:firebase-analytics:10.2.6'
3434

3535
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
3636
androidTestCompile 'com.android.support.test:runner:0.5'

‎analytics/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:2.3.1'
10-
classpath 'com.google.gms:google-services:3.0.0'
10+
classpath 'com.google.gms:google-services:3.1.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎app-indexing/app/build.gradle‎

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

2424
configurations.all {
25-
resolutionStrategy.force 'com.android.support:support-annotations:25.0.1'
25+
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
2626
}
2727

2828
dependencies {
2929
// [START app_indexing_gradle_dep]
30-
compile 'com.google.firebase:firebase-appindexing:10.2.1'
30+
compile 'com.google.firebase:firebase-appindexing:10.2.6'
3131
// [END app_indexing_gradle_dep]
32-
compile 'com.android.support:support-v4:25.0.1'
33-
compile 'com.android.support:appcompat-v7:25.0.1'
32+
compile 'com.android.support:support-v4:25.3.1'
33+
compile 'com.android.support:appcompat-v7:25.3.1'
3434

3535
// Testing
3636
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎app-indexing/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:2.3.1'
10-
classpath 'com.google.gms:google-services:3.0.0'
10+
classpath 'com.google.gms:google-services:3.1.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎auth/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ android {
4040
}
4141

4242
configurations.all {
43-
resolutionStrategy.force 'com.android.support:support-annotations:25.0.1'
43+
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
4444
}
4545

4646
dependencies {
47-
compile 'com.android.support:appcompat-v7:25.0.1'
47+
compile 'com.android.support:appcompat-v7:25.3.1'
4848

4949
// Firebase Authentication
50-
compile 'com.google.firebase:firebase-auth:10.2.1'
50+
compile 'com.google.firebase:firebase-auth:10.2.6'
5151

5252
// Google Sign In SDK (only required for Google Sign In)
53-
compile 'com.google.android.gms:play-services-auth:10.2.1'
53+
compile 'com.google.android.gms:play-services-auth:10.2.6'
5454

5555
// Firebase UI
5656
// Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16
5757
// so this library is only included in the minSdkJellybean variant.
58-
minSdkJellybeanCompile 'com.firebaseui:firebase-ui-auth:1.0.0'
58+
minSdkJellybeanCompile 'com.firebaseui:firebase-ui-auth:1.2.0'
5959

6060
// Facebook Android SDK (only required for Facebook Login)
6161
// Used in FacebookLoginActivity. This is only compiled into the minSdkJellybean variant of this

‎auth/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
dependencies {
99
classpath 'com.android.tools.build:gradle:2.2.1'
10-
classpath 'com.google.gms:google-services:3.0.0'
10+
classpath 'com.google.gms:google-services:3.1.0'
1111
}
1212
}
1313

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
dependencies {
77
classpath 'com.android.tools.build:gradle:2.3.1'
8-
classpath 'com.google.gms:google-services:3.0.0'
8+
classpath 'com.google.gms:google-services:3.1.0'
99
}
1010
}
1111

0 commit comments

Comments
 (0)