From 5c9f10fa508c11d38665c27080bb8673cf75164d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 3 Apr 2018 16:10:56 +0200 Subject: [PATCH] Update gradle to 4.4 (#75) --- .gitignore | 2 ++ app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- jacoco.gradle | 6 +++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3b524b65..eec8adbe 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,8 @@ local.properties .idea/tasks.xml .idea/vcs.xml .idea/workspace.xml +.idea/caches/ +.idea/codeStyles/ *.iml # OS-specific files diff --git a/app/build.gradle b/app/build.gradle index 252021af..ac4485f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ apply from: '../android-sonarqube.gradle' android { compileSdkVersion 26 - buildToolsVersion "26.0.3" + buildToolsVersion '27.0.3' defaultConfig { applicationId "io.github.wulkanowy" testApplicationId "io.github.tests.wulkanowy" diff --git a/build.gradle b/build.gradle index 28748fc0..f0827365 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28bd184f..8a440624 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 27 17:19:04 CEST 2017 +#Tue Mar 27 02:10:44 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/jacoco.gradle b/jacoco.gradle index 47a077ca..84a0ce97 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -1,7 +1,11 @@ apply plugin: "jacoco" jacoco { - toolVersion "0.7.4.201502262128" + toolVersion "0.8.1" +} + +tasks.withType(Test) { + jacoco.includeNoLocationClasses = true } // run ./gradlew clean createDebugCoverageReport jacocoTestReport