Skip to content

Commit 5d5440d

Browse files
committed
Merge branch 'master' into version-2.2.1-dev
2 parents 944d125 + de16b18 commit 5d5440d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android:
2121
- tools
2222
before_script:
2323
- 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"
24+
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
2525
script: ./gradlew clean assembleDebug check
2626
after_failure:
2727
# tests

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ you need to make sure that you use the same version that your chosen version of
9090
For convenience, here are some recent examples:
9191

9292
| FirebaseUI Version | Firebase/Play Services Version |
93-
|--------------------|--------------------------------|\
93+
|--------------------|--------------------------------|
9494
| 2.2.0 | 11.0.4 |
9595
| 2.1.1 | 11.0.2 |
9696
| 2.0.1 | 11.0.1 |

constants.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ project.ext {
44
version = '2.2.0'
55
pomdesc = 'Firebase UI Android'
66

7-
compileSdk = 25
8-
targetSdk = 25
7+
compileSdk = 26
8+
targetSdk = 26
99
minSdk = 14
1010

11-
buildTools = '25.0.3' // Remember to also update in .travis.yml
11+
buildTools = '26.0.1' // Remember to also update in .travis.yml
1212

1313
firebaseVersion = '11.0.4'
14-
supportLibraryVersion = '25.4.0'
14+
supportLibraryVersion = '26.0.0'
1515
}

0 commit comments

Comments
 (0)