From 8e645453b140d12981fbdcc34766315fe5f5e992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 2 May 2014 17:42:40 +0200 Subject: [PATCH] Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint --- OpenKeychain-API/example-app/build.gradle | 2 +- .../libraries/openkeychain-api-library/build.gradle | 2 +- .../libraries/openpgp-api-library/build.gradle | 2 +- OpenKeychain/build.gradle | 13 ++++++++++++- README.md | 5 +++++ build.gradle | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/OpenKeychain-API/example-app/build.gradle b/OpenKeychain-API/example-app/build.gradle index e7a25e689..f1b5a1086 100644 --- a/OpenKeychain-API/example-app/build.gradle +++ b/OpenKeychain-API/example-app/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.9.0' + classpath 'com.android.tools.build:gradle:0.10.0' } } diff --git a/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle index 98c9a3bd6..69b937c1a 100644 --- a/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle +++ b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.9.0' + classpath 'com.android.tools.build:gradle:0.10.0' } } diff --git a/OpenKeychain-API/libraries/openpgp-api-library/build.gradle b/OpenKeychain-API/libraries/openpgp-api-library/build.gradle index 98c9a3bd6..69b937c1a 100644 --- a/OpenKeychain-API/libraries/openpgp-api-library/build.gradle +++ b/OpenKeychain-API/libraries/openpgp-api-library/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.9.0' + classpath 'com.android.tools.build:gradle:0.10.0' } } diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 32ce30ea2..393a18d08 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -80,9 +80,12 @@ android { buildTypes.release.signingConfig = null } - // Do not abort build if lint finds errors + // NOTE: Lint is disabled because it slows down builds, + // to enable it comment out the code at the bottom of this build.gradle lintOptions { + // Do not abort build if lint finds errors abortOnError false + checkAllWarnings true htmlReport true htmlOutput file("lint-report.html") @@ -103,4 +106,12 @@ task localTest(type: Test, dependsOn: assemble) { classpath = sourceSets.testLocal.runtimeClasspath } +// NOTE: This disables Lint! +tasks.whenTaskAdded { task -> + if (task.name.equals("lint")) { + task.enabled = false + } +} + +// NOTE: tests disabled! //check.dependsOn localTest diff --git a/README.md b/README.md index 0bfc156d4..abc75dd1f 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,11 @@ When changing build files or dependencies, respect the following requirements: * run ./gradlew wrapper twice to update gradle and download the new gradle jar file * commit the new gradle jar and property files +### Slow Gradle? + +* https://www.timroes.de/2013/09/12/speed-up-gradle/ +* Disable Lint checking if it is enabled in build.gradle + ### Translations Translations are hosted on Transifex, which is configured by ".tx/config". diff --git a/build.gradle b/build.gradle index 25651cd5a..dc6f12f08 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.9.0' + classpath 'com.android.tools.build:gradle:0.10.0' } }