diff --git a/build.gradle b/build.gradle index 78d9e221..c8e3fee6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } diff --git a/cameraview/build.gradle b/cameraview/build.gradle index 497aa30d..fb795507 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -8,7 +8,7 @@ group = 'com.otaliastudios' //region android dependencies -def travis = System.getenv("TRAVIS") +def travis = true // TODO System.getenv("TRAVIS") android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -188,7 +188,7 @@ task mergedCoverageReport(type: JacocoReport) { // Merge unit tests and android tests data executionData = fileTree(dir: "$buildDir", includes: [ "jacoco/testDebugUnitTest.exec", // Unit tests - "outputs/code-coverage/connected/*coverage.ec" // Android tests + "outputs/code_coverage/debugAndroidTest/connected/*coverage.ec" // Android tests ]) // Sources diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 64dcec45..b5aa2c3d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip