Skip to content

Commit 62968e5

Browse files
committed
Merge branch 'master' into version-3.1.2-dev
Change-Id: I8f6fb05d26f1d7d6ab8da911fc635ea781886b94
2 parents 2e3cd37 + 405615d commit 62968e5

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

.travis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ cache:
1212
- $HOME/.android/build-cache
1313
before_install:
1414
- mkdir "$ANDROID_HOME/licenses" || true
15-
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
16-
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
15+
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
16+
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
1717
android:
1818
components:
1919
# https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
2020
- tools
2121
- tools
22-
- platform-tools
23-
- android-26
24-
- build-tools-26.0.1
25-
before_script:
26-
- mv library/google-services.json app/google-services.json
27-
- echo y | ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.2" "platforms;android-26"
22+
before_script: mv library/google-services.json app/google-services.json
2823
script: ./gradlew clean assembleDebug check
2924
after_failure:
3025
# tests

constants.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ project.ext {
99
minSdk = 14
1010

1111
firebaseVersion = '11.6.2'
12-
supportLibraryVersion = '27.0.1'
12+
supportLibraryVersion = '27.0.2'
1313
architectureVersion = '1.0.0'
1414
}

0 commit comments

Comments
 (0)