Skip to content

Commit

Permalink
Try to fix CI builds (airbnb#33)
Browse files Browse the repository at this point in the history
* Try to fix CI builds

* Another try
  • Loading branch information
felipecsl authored Jun 6, 2017
1 parent c2d14c4 commit 611f134
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
15 changes: 2 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,19 @@ android:
- platform-tools
- build-tools-25.0.3
- extra-android-m2repository
- android-22
- android-25
- sys-img-armeabi-v7a-android-22
licenses:
- 'android-sdk-license-.+'

jdk:
- oraclejdk8

before_script:
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &

after_success:
- .buildscript/deploy_snapshot.sh

env:
global:
- ARTIFACT_PATHS=okreplay-gradle-plugin/build/reports
- ARTIFACTS_KEY=
- ARTIFACTS_SECRET=
- ARTIFACTS_BUCKET=
- GRADLE_OPTS="-Xmx2048m -XX:MaxPermSize=1024m"
- secure: "KOweJZUuxJmrvFX6I3JiH5gGERCuCL/zxkgEsUUwJDD8JsdGqfpEBA2rzMykV+5lLjToZvlJixrkIUiSAqUM4BxTLcYS97iGF8lnRilZhrT+o6VGtcD78cX3eMs/ASuV890/D64qJheVzWS4qSL3Cw+nVdh0rD7wn+5z4MAX/2yC59eEnvyff+Epr4rYmF1Bi0fBpVP7pR2ZKmr9+oTBZ7rdn9tfEkK9HLjs4IzuPFCkBBWun4a3WSKoeQUaaCmJBVMVwdOlABakLZ4by2nzBAyQ0RuQeK/21horrGqbnvFeLMqoi1MhYVkuGsm9CvoaaevmuqRuiklEc//7yfQ5oGJu42lf5Cvcy6Vce4HhQp4ZoOaEKD0usuaTvaJFitxfXwON4etrzaTcfYboxcWl7LfbYBAv7rCYRdxMcVQjA3c09Fqt6fsvIhA8Xk314BoVR0rSvhpaIZQPkXFiinebdqYpVe6KTa82W2TMIY0J7Wald42MmJIFoDaOWRMQbubby4G2W8M2qbtDj7zXbu/gr1/q1rl04VeiD6QNct0drwmnQ6Hk2U1pgWtEoYvHtIv3AyHD9kQgZuN70UfolP/0IwLeTa3kG+90a7hgpJ+a4DL6eERg5+2IqSz/w469gfR+dPr5PDYutuyslyAlz/cLValzP8vHkXIiS3nkJCXHDGY="
- secure: "oH00sBHo0tBt8ROUq1CAf0ImZKgCbxuOQiRAXxcMXWpZXbuoeL4VP3vQMX89Ton3+ZcPp6+HEDyLeFYqLTpDC8sfIiMuHxUYZDEGogqA+BFEGizFB0Ucc6My2vNEe8nqgDLSNgkGjrpz5YkgCNPZi9cEXeoUUcVKKI+z4kxGq6icK5cKw0GgTMgvKP8EP36yCGotCgfU/Za2cuPHlVOgGgIgHK4ztaBtZOHJkJJ507Oy3WUlDQN9osJY6GeWglDD55xI8MhCC3XlhpnLcpKwno0wvIAJ0EpRFMcQCag6IZd9yK23g97+tY606QFWzt73C9nJaQyZiDPjNaiX+LCf0QChS6Sd+U8y2pibELev9OYa4hsUu0VE4f/FdTtU08cDJda7qU65VMb0WYB2yvpbm9ZvSltzFiQqIt9x6rHOvWpOT/P5vgamO1xVHcHLFaWsvUA4Smx99AShwZ0DynTkKl1LeGWtGs3i5hVv8OEoNVMtQ57DIqhnRhTJfqnojav1napVhnTv8OBTk2Xbxg0LDXuLRwpxth8OaOhNuCmmaRaDlEMhHAuvAzLW+Z2u6QztUg9Ia+KLCoxz20Hmh3+KHXkAfkUofph9BoXz7XEeRMkRd6J8zZFeJFw27Te5/YOhB3M6g/gZ6HTJrCQhxxuv+yjgtrCJsF5r/B/yMvEmMCQ="

Expand All @@ -41,7 +30,7 @@ notifications:
email: false

script:
- ./gradlew check --stacktrace
- ./gradlew connectedCheck --stacktrace --max-workers=2 -x okreplay-gradle-plugin:test -x okreplay-sample:connectedAndroidTest

sudo: false

Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ subprojects {
jcenter()
mavenLocal()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url 'https://maven.google.com' }
if (System.getenv("INTERNAL_MAVEN_URL")) {
maven { url INTERNAL_MAVEN_URL }
}
Expand All @@ -22,6 +23,7 @@ subprojects {
allprojects {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
if (System.getenv("INTERNAL_MAVEN_URL")) {
maven { url INTERNAL_MAVEN_URL }
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext.versions = [
// TODO: This is duplicated because the plugin unit tests cannot read VERSION_NAME from the
// gradle.properties file. Figure out a way to fix this.
okreplayVersion: '1.2.0-SNAPSHOT',
kotlinVersion : '1.1.2-3',
kotlinVersion : '1.1.2-4',
okhttpVersion : '3.4.2',
appCompatVersion: '25.3.1'
]
Expand All @@ -12,7 +12,7 @@ ext {
isCi = "true" == System.getenv('CI')

dep = [
androidPlugin: 'com.android.tools.build:gradle:2.3.1',
androidPlugin: 'com.android.tools.build:gradle:2.3.2',
groovyPlugin : 'org.codehaus.groovy:groovy-android-gradle-plugin:1.1.0',
nexusPlugin : 'com.bmuschko:gradle-nexus-plugin:2.3.1',
appcompat : "com.android.support:appcompat-v7:$versions.appCompatVersion",
Expand Down

0 comments on commit 611f134

Please sign in to comment.