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/dependencies.gradle b/dependencies.gradle index f02355d0..69ade4df 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,18 +5,18 @@ ext.versions = [ minSdk : 14, targetSdk : 22, compileSdk : 27, - gradle : '4.4.1', + gradle : '4.5.1', androidTools : "3.0.1", - ktlint : "0.14.0", - ktlintGradle : "2.3.0", - detekt : "1.0.0.RC6", + ktlint : "0.15.1", + ktlintGradle : "3.0.1", + detekt : "1.0.0.RC6-3", jacoco : "0.7.9", jacocoAndroid : "0.1.2", androidSupport : "22.2.1", - kotlin : "1.2.10", + kotlin : "1.2.21", retrofit : "2.1.0", jackson : "2.9.0", 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 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 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 } }