Skip to content

Commit 6480ddd

Browse files
author
Jorge Costa
committed
Updated library versions
1 parent 4948b01 commit 6480ddd

4 files changed

Lines changed: 60 additions & 35 deletions

File tree

.travis.yml

Lines changed: 56 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,65 @@
1-
language: android
2-
cache: false
1+
# Tutorial here: https://medium.com/@harmittaa/travis-ci-android-example-357f6e632fc4
32

3+
language: android
44
sudo: false
5-
android:
6-
components:
7-
- tools
8-
- build-tools-26.0.1
9-
- platform-tools
10-
- extra-android-m2repository
11-
- extra-google-m2repository
12-
- extra-google-android-support
13-
- android-26
14-
- sys-img-armeabi-v7a-android-26
15-
165
jdk: oraclejdk8
17-
os:
18-
- linux
19-
20-
licenses:
21-
- 'android-sdk-preview-license-.+'
22-
- 'android-sdk-license-.+'
23-
- 'google-gdk-license-.+'
246

257
branches:
26-
only:
27-
- master
28-
- develop
29-
- config_travis
8+
only:
9+
- master
10+
- develop
11+
- config_travis
12+
13+
before_cache:
14+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
15+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
16+
17+
cache:
18+
directories:
19+
- $HOME/.gradle/caches/
20+
- $HOME/.gradle/wrapper/
21+
22+
env:
23+
global:
24+
- ANDROID_API=26
25+
- EMULATOR_API=22
26+
- ANDROID_BUILD_TOOLS=26.0.2
27+
- ADB_INSTALL_TIMEOUT=5 # minutes
28+
- ANDROID_ABI=armeabi-v7a
29+
- ANDROID_TAG=google_apis
30+
31+
android:
32+
components:
33+
- tools
34+
- platform-tools
35+
- build-tools-$ANDROID_BUILD_TOOLS
36+
- android-$ANDROID_API
37+
- android-$EMULATOR_API
38+
- extra-google-m2repository
39+
- extra-android-m2repository # for design library
40+
- extra-google-google_play_services
41+
- sys-img-armeabi-v7a-google_apis-$ANDROID_API
42+
- sys-img-armeabi-v7a-google_apis-$EMULATOR_API
43+
44+
licenses:
45+
- android-sdk-preview-license-.+
46+
- android-sdk-license-.+
47+
- google-gdk-license-.+
3048

31-
install:
32-
# Ensure Gradle wrapper is executable, download wrapper and show version
33-
- chmod +x ./gradlew;
49+
before_install:
50+
- mkdir "$ANDROID_HOME/licenses" || true
51+
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
52+
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
53+
- chmod +x gradlew
54+
- ./gradlew dependencies || true # DON'T ADD unless you are getting "Install missing components using SDK manager"
55+
#Source: https://medium.com/@oldergod/constraint-layout-and-circleci-travis-d50342696d2
3456

3557
before_script:
36-
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
37-
- emulator -avd test -no-skin -no-audio -no-window &
38-
- android-wait-for-emulator
39-
- adb shell input keyevent 82 &
58+
- android list target
59+
- echo no | android create avd --force -n test -t "android-"$EMULATOR_API --abi $ANDROID_ABI --tag $ANDROID_TAG
60+
- emulator -avd test -no-skin -no-audio -no-window &
61+
- android-wait-for-emulator
62+
- adb shell input keyevent 82 &
4063

41-
script: ./gradlew build connectedCheck
64+
script:
65+
- "./gradlew clean build connectedCheck -PdisablePreDex --stacktrace"

activity-fragment-manager/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ android {
5555

5656
dependencies {
5757
compile fileTree(include: ['*.jar'], dir: 'libs')
58-
compile 'com.android.support:appcompat-v7:26.0.1'
58+
compile 'com.android.support:appcompat-v7:26.0.2'
5959

6060
lintRules project(':lint')
6161
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ buildscript {
4949
}
5050
}
5151
dependencies {
52-
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
52+
classpath 'com.android.tools.build:gradle:3.0.0-beta5'
5353
classpath 'com.novoda:bintray-release:0.5.0'
5454
classpath 'pt.simdea.verifier:verifier:3.5.8'
5555
classpath 'gradle.plugin.com.kageiit:lintrules:1.1.2'

sample/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ android {
4848

4949
dependencies {
5050
compile fileTree(include: ['*.jar'], dir: 'libs')
51-
compile 'com.android.support:appcompat-v7:26.0.1'
51+
compile 'com.android.support:appcompat-v7:26.0.2'
52+
compile 'com.android.support:design:26.0.2'
5253
compile 'android.arch.lifecycle:extensions:1.0.0-alpha9'
5354
compile 'com.massivedisaster.adal:adal-fragments:0.1.15'
5455
compile 'com.massivedisaster.adal:adal-adapters:0.1.15'

0 commit comments

Comments
 (0)