Update Android Gradle Plugin

pull/492/head
Mattia Iavarone 6 years ago
parent 708598c0f3
commit 75adc900e7
  1. 2
      build.gradle
  2. 4
      cameraview/build.gradle
  3. 2
      gradle/wrapper/gradle-wrapper.properties

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { 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.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
} }

@ -8,7 +8,7 @@ group = 'com.otaliastudios'
//region android dependencies //region android dependencies
def travis = System.getenv("TRAVIS") def travis = true // TODO System.getenv("TRAVIS")
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
@ -188,7 +188,7 @@ task mergedCoverageReport(type: JacocoReport) {
// Merge unit tests and android tests data // Merge unit tests and android tests data
executionData = fileTree(dir: "$buildDir", includes: [ executionData = fileTree(dir: "$buildDir", includes: [
"jacoco/testDebugUnitTest.exec", // Unit tests "jacoco/testDebugUnitTest.exec", // Unit tests
"outputs/code-coverage/connected/*coverage.ec" // Android tests "outputs/code_coverage/debugAndroidTest/connected/*coverage.ec" // Android tests
]) ])
// Sources // Sources

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

Loading…
Cancel
Save