From 5e716f5026b15737a8b055c900e07e832a6689bf Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 25 Feb 2018 22:11:47 +0100 Subject: [PATCH 1/5] Update kotlin to 1.20.21 version. Signed-off-by: Yahor Berdnikau --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index f02355d0..26cddb96 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,7 +16,7 @@ ext.versions = [ androidSupport : "22.2.1", - kotlin : "1.2.10", + kotlin : "1.2.21", retrofit : "2.1.0", jackson : "2.9.0", From 9b4155c06f720dc3bed9197dda598993dc2bd341 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 25 Feb 2018 22:16:30 +0100 Subject: [PATCH 2/5] Update gradle to 4.5.1 version. Signed-off-by: Yahor Berdnikau --- dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 26cddb96..6bab1eb5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ ext.versions = [ minSdk : 14, targetSdk : 22, compileSdk : 27, - gradle : '4.4.1', + gradle : '4.5.1', androidTools : "3.0.1", ktlint : "0.14.0", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57c7d2d2..8941bfbb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip From e59acc880e82d34dc6ea2fcc06eb32180c0f28ef Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 25 Feb 2018 22:19:56 +0100 Subject: [PATCH 3/5] Update ktlint to 0.15.1 version. Also update gradle plugin to 3.0.1 version. Signed-off-by: Yahor Berdnikau --- dependencies.gradle | 4 ++-- gradle_scripts/code_quality.gradle | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6bab1eb5..c412021d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,8 +8,8 @@ ext.versions = [ gradle : '4.5.1', androidTools : "3.0.1", - ktlint : "0.14.0", - ktlintGradle : "2.3.0", + ktlint : "0.15.1", + ktlintGradle : "3.0.1", detekt : "1.0.0.RC6", jacoco : "0.7.9", jacocoAndroid : "0.1.2", diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle index 3992a621..9b9a5308 100644 --- a/gradle_scripts/code_quality.gradle +++ b/gradle_scripts/code_quality.gradle @@ -7,6 +7,7 @@ if (isCodeQualityEnabled) { ktlint { version = versions.ktlint + outputToConsole = true android = true } } From 29f2d1eea8edcf01071b52a23ab2fd60b7e18077 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 25 Feb 2018 22:23:55 +0100 Subject: [PATCH 4/5] Update detekt to 1.0.0.RC6-3 version. Signed-off-by: Yahor Berdnikau --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c412021d..69ade4df 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,7 +10,7 @@ ext.versions = [ androidTools : "3.0.1", ktlint : "0.15.1", ktlintGradle : "3.0.1", - detekt : "1.0.0.RC6", + detekt : "1.0.0.RC6-3", jacoco : "0.7.9", jacocoAndroid : "0.1.2", From da7c8dee2cf0107e0142e9e2f4d7c5d3bbe24baa Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 25 Feb 2018 22:35:48 +0100 Subject: [PATCH 5/5] Add more build improvements into gradle.properties. Signed-off-by: Yahor Berdnikau --- .circleci/config.yml | 3 +++ gradle.properties | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1876534..8fea41d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,9 @@ jobs: - checkout - restore_cache: key: gradle-cache-{{ checksum "dependencies.gradle" }} + - run: + name: clean gradle.properties + command: echo "" > gradle.properties - run: name: checkstyle command: ./gradlew -Pqc ktlintCheck diff --git a/gradle.properties b/gradle.properties index 68967e5e..c56ddc2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,10 @@ org.gradle.parallel=true +org.gradle.daemon=true org.gradle.configureondemand=true -org.gradle.caching=true \ No newline at end of file +org.gradle.caching=true + +kotlin.incremental=true +kotlin.caching.enabled=true +kotlin.incremental.usePreciseJavaTracking=true + +android.enableBuildCache=true