From cf0baece8237e098f0832aff9ceec566e6f7c875 Mon Sep 17 00:00:00 2001 From: bezmian Date: Mon, 13 Feb 2017 11:10:19 +0100 Subject: [PATCH] Add Jacoco support * buildToolsVersion set to 25.0.2 --- .travis.yml | 28 ++++++++++++++++++++++++++-- app/build.gradle | 3 ++- build.gradle | 2 ++ jacoco-android.gradle | 15 +++++++++++++++ material-intro-screen/build.gradle | 3 ++- 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 jacoco-android.gradle diff --git a/.travis.yml b/.travis.yml index 1b500a5..809eaf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,11 @@ language: android jdk: - oraclejdk8 +env: + global: + - ANDROID_TARGET=android-19 + - ANDROID_ABI=armeabi-v7a + android: components: - tools @@ -13,10 +18,21 @@ android: - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - -licenses: + licenses: - '.+' +branches: + except: + - gh-pages + +before_script: + # Create and start an emulator for instrumentation tests. + - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI + - emulator -avd test -no-audio -no-window & + - android-wait-for-emulator + - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v + - adb shell input keyevent 82 + before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ @@ -25,12 +41,20 @@ cache: directories: - $HOME/.m2 - $HOME/.gradle + - $HOME/.android/build-cache before_install: + - chmod +x gradlew - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" +script: + - ./gradlew build jacocoTestReport assembleAndroidTest connectedCheck + +after_success: + - bash <(curl -s https://codecov.io/bash) + notifications: slack: secure: qIOOj57yVyinyTs9SinZmp/aVN5Or/9LDg+l9SYMqVCaqM9zDk7s1/m/L7VNPdWCuWOzLf9g1+0ReBcwZ6vh+HWBQ4T1V4HQd09whhUGyW9kMj3BKE0gWpIJLYKuhM551auv3FVzTp3u27q4W0zgiXB8qHWatTQu9rcPumG+IJaZD1uHsbhrQq0RLD8n8hWjQAdkRKRtSo4UR55sTK35uGRZbMFcyJSiStBXRP43w2kTR1MxIst4r9NeOx/sjebBQ/XxabKJgqAHhue80O3Cy8s0u59NDHOMpqJOu00cdKbtmhePQsY0FUl5/689Xdc+bDs3OcwGWbokaFEjXLwA1De+CIz0NMjgdtyHIbEGWcYav8jujke4wYaAtQRPgKHtVL9EpIUX07jPznstRNV8T3H1qrf2S5xHW6elZ7nLOnYuDKsgETmEuDQLAg8ibYQTF4zNBYGFwvC3GOJCqCu+o40OwmFghyohmXxSmo8Cg019V/hOtmYThaFcyDQhN8QGkUSqHrjDNRxyyye2JHvU+bJlTshonZlPh2gM9NA9Tf/3fMEobtnA5XYurntj43UhdZ4HdsYjbrFhbOrXEBRx1mG8gcCFgexz/3E9wq7GN0fqm6LMB8radqUbP0hAd2cADlN9suCWWLVnufLAiS5iqo55M2e9u749p+e+ESCLXIo= \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index be9973a..dc2becc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,11 @@ apply plugin: 'com.android.application' +apply from: '../jacoco-android.gradle' apply from: "$rootDir/versions.gradle" android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { applicationId "agency.tango.materialintro" minSdkVersion 15 diff --git a/build.gradle b/build.gradle index 53501fc..3908003 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.novoda:bintray-release:0.3.4' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' + classpath 'com.palantir:jacoco-coverage:0.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/jacoco-android.gradle b/jacoco-android.gradle new file mode 100644 index 0000000..883d587 --- /dev/null +++ b/jacoco-android.gradle @@ -0,0 +1,15 @@ +apply plugin: 'jacoco-android' + +jacoco { + toolVersion = "0.7.7.201606060606" +} + +android { + testOptions { + unitTests.all { + jacoco { + includeNoLocationClasses = true + } + } + } +} diff --git a/material-intro-screen/build.gradle b/material-intro-screen/build.gradle index a7beb54..1e2af2e 100644 --- a/material-intro-screen/build.gradle +++ b/material-intro-screen/build.gradle @@ -1,10 +1,11 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' +apply from: '../jacoco-android.gradle' apply from: "$rootDir/versions.gradle" android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" resourcePrefix 'mis_' defaultConfig {