Skip to content

Commit 76e6db3

Browse files
author
devrel-build
committed
Merge commit '32d929d6302bded7ddbebe3139ab3b8c9438a4ab' into HEAD
2 parents c97a690 + 32d929d commit 76e6db3

25 files changed

+86
-86
lines changed

‎admob/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -28,15 +28,15 @@ android {
2828
}
2929

3030
configurations.all {
31-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
31+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
3232
}
3333

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

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

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

‎admob/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -19,6 +19,6 @@ allprojects {
1919
repositories {
2020
jcenter()
2121
mavenLocal()
22-
google()
22+
maven { url 'https://maven.google.com' }
2323
}
2424
}

‎analytics/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -23,15 +23,15 @@ android {
2323
}
2424

2525
configurations.all {
26-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
26+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
2727
}
2828

2929
dependencies {
3030
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile 'com.android.support:appcompat-v7:25.3.1'
32-
compile 'com.android.support:support-v4:25.3.1'
31+
compile 'com.android.support:appcompat-v7:26.0.0'
32+
compile 'com.android.support:support-v4:26.0.0'
3333

34-
compile 'com.google.firebase:firebase-analytics:11.0.4'
34+
compile 'com.google.firebase:firebase-analytics:11.2.0'
3535

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

‎analytics/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -19,6 +19,6 @@ allprojects {
1919
repositories {
2020
jcenter()
2121
mavenLocal()
22-
google()
22+
maven { url 'https://maven.google.com' }
2323
}
2424
}

‎app-indexing/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -23,16 +23,16 @@ android {
2323
}
2424

2525
configurations.all {
26-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
26+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
2727
}
2828

2929
dependencies {
3030
// [START app_indexing_gradle_dep]
31-
compile 'com.google.firebase:firebase-appindexing:11.0.4'
31+
compile 'com.google.firebase:firebase-appindexing:11.2.0'
3232
// [END app_indexing_gradle_dep]
3333

34-
compile 'com.android.support:support-v4:25.3.1'
35-
compile 'com.android.support:appcompat-v7:25.3.1'
34+
compile 'com.android.support:support-v4:26.0.0'
35+
compile 'com.android.support:appcompat-v7:26.0.0'
3636

3737
// Testing
3838
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎app-indexing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -19,6 +19,6 @@ allprojects {
1919
repositories {
2020
jcenter()
2121
mavenLocal()
22-
google()
22+
maven { url 'https://maven.google.com' }
2323
}
2424
}

‎auth/app/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleMinSdkJellybeanDebugAndroidTest', 'assembleMinSdkIcsDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77
flavorDimensions "minSdkVersion"
88

@@ -44,20 +44,20 @@ android {
4444
}
4545

4646
configurations.all {
47-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
47+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
4848
}
4949

5050
dependencies {
51-
compile 'com.android.support:appcompat-v7:25.3.1'
52-
compile 'com.android.support:animated-vector-drawable:25.3.1'
53-
compile 'com.android.support:cardview-v7:25.3.1'
54-
compile 'com.android.support:design:25.3.1'
51+
compile 'com.android.support:appcompat-v7:26.0.0'
52+
compile 'com.android.support:animated-vector-drawable:26.0.0'
53+
compile 'com.android.support:cardview-v7:26.0.0'
54+
compile 'com.android.support:design:26.0.0'
5555

5656
// Firebase Authentication
57-
compile 'com.google.firebase:firebase-auth:11.0.4'
57+
compile 'com.google.firebase:firebase-auth:11.2.0'
5858

5959
// Google Sign In SDK (only required for Google Sign In)
60-
compile 'com.google.android.gms:play-services-auth:11.0.4'
60+
compile 'com.google.android.gms:play-services-auth:11.2.0'
6161

6262
// Firebase UI
6363
// Used in FirebaseUIActivity. The FirebaseUI-Android library has a minSdk level of 16
@@ -68,7 +68,7 @@ dependencies {
6868
// Used in FacebookLoginActivity. This is only compiled into the minSdkJellybean variant of this
6969
// app. You can build a 'minSdkGingerbread' variant to test on devices with 9 <= SDK <= 15.
7070
minSdkJellybeanCompile 'com.facebook.android:facebook-android-sdk:4.9.0'
71-
minSdkJellybeanCompile 'com.android.support:customtabs:25.3.1'
71+
minSdkJellybeanCompile 'com.android.support:customtabs:26.0.0'
7272

7373
// Twitter Android SDK (only required for Twitter Login)
7474
compile('com.twitter.sdk.android:twitter-core:1.6.6@aar') {

‎auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -16,7 +16,7 @@ allprojects {
1616
repositories {
1717
jcenter()
1818
mavenLocal()
19-
google()
19+
maven { url 'https://maven.google.com' }
2020
maven { url 'https://maven.fabric.io/public' }
2121
}
2222
}

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
repositories {
33
jcenter()
44
mavenLocal()
5-
google()
5+
maven { url 'https://maven.google.com' }
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -13,7 +13,7 @@ buildscript {
1313
allprojects {
1414
repositories {
1515
jcenter()
16-
google()
16+
maven { url 'https://maven.google.com' }
1717
mavenLocal()
1818
maven { url 'https://maven.fabric.io/public' }
1919
}

‎config/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -24,14 +24,14 @@ android {
2424
}
2525

2626
configurations.all {
27-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
27+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
2828
}
2929

3030
dependencies {
3131
compile fileTree(dir: 'libs', include: ['*.jar'])
32-
compile 'com.android.support:appcompat-v7:25.3.1'
32+
compile 'com.android.support:appcompat-v7:26.0.0'
3333

34-
compile 'com.google.firebase:firebase-config:11.0.4'
34+
compile 'com.google.firebase:firebase-config:11.2.0'
3535

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

‎config/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -19,6 +19,6 @@ allprojects {
1919
repositories {
2020
jcenter()
2121
mavenLocal()
22-
google()
22+
maven { url 'https://maven.google.com' }
2323
}
2424
}

‎crash/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -28,14 +28,14 @@ android {
2828
}
2929

3030
configurations.all {
31-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
31+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
3232
}
3333

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

38-
compile 'com.google.firebase:firebase-crash:11.0.4'
38+
compile 'com.google.firebase:firebase-crash:11.2.0'
3939

4040
testCompile 'junit:junit:4.12'
4141
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎crash/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -18,7 +18,7 @@ allprojects {
1818
repositories {
1919
jcenter()
2020
mavenLocal()
21-
google()
21+
maven { url 'https://maven.google.com' }
2222
}
2323
}
2424

‎database/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77

88
defaultConfig {
@@ -24,19 +24,19 @@ android {
2424
}
2525

2626
configurations.all {
27-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
27+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
2828
}
2929

3030
dependencies {
31-
compile 'com.android.support:appcompat-v7:25.3.1'
32-
compile 'com.android.support:recyclerview-v7:25.3.1'
33-
compile 'com.android.support:cardview-v7:25.3.1'
34-
compile 'com.android.support:design:25.3.1'
31+
compile 'com.android.support:appcompat-v7:26.0.0'
32+
compile 'com.android.support:recyclerview-v7:26.0.0'
33+
compile 'com.android.support:cardview-v7:26.0.0'
34+
compile 'com.android.support:design:26.0.0'
3535

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

38-
compile 'com.google.firebase:firebase-auth:11.0.4'
39-
compile 'com.google.firebase:firebase-database:11.0.4'
38+
compile 'com.google.firebase:firebase-auth:11.2.0'
39+
compile 'com.google.firebase:firebase-database:11.2.0'
4040

4141
testCompile 'junit:junit:4.12'
4242
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎database/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7-
google()
7+
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:2.3.3'
@@ -18,7 +18,7 @@ allprojects {
1818
repositories {
1919
jcenter()
2020
mavenLocal()
21-
google()
21+
maven { url 'https://maven.google.com' }
2222
}
2323
}
2424

‎dynamiclinks/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
check.dependsOn 'assembleMainDebugAndroidTest'
33

44
android {
5-
compileSdkVersion 25
5+
compileSdkVersion 26
66
buildToolsVersion "25.0.3"
77
flavorDimensions "irrelevant"
88

@@ -37,14 +37,14 @@ android {
3737
}
3838

3939
configurations.all {
40-
resolutionStrategy.force 'com.android.support:support-annotations:25.3.1'
40+
resolutionStrategy.force 'com.android.support:support-annotations:26.0.0'
4141
}
4242

4343
dependencies {
44-
compile 'com.android.support:appcompat-v7:25.3.1'
45-
compile 'com.android.support:design:25.3.1'
44+
compile 'com.android.support:appcompat-v7:26.0.0'
45+
compile 'com.android.support:design:26.0.0'
4646

47-
compile 'com.google.firebase:firebase-invites:11.0.4'
47+
compile 'com.google.firebase:firebase-invites:11.2.0'
4848

4949
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
5050
androidTestCompile 'com.android.support.test:runner:0.5'

0 commit comments

Comments
 (0)