Merge pull request #603 from ultrasonic/gradle72

Update Gradle and ktlint
This commit is contained in:
Nite 2021-10-14 18:05:01 +02:00 committed by GitHub
commit 6905c68898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -3,13 +3,13 @@ ext.versions = [
targetSdk : 29, targetSdk : 29,
compileSdk : 29, compileSdk : 29,
// You need to run ./gradlew wrapper after updating the version // You need to run ./gradlew wrapper after updating the version
gradle : '7.0', gradle : '7.2',
navigation : "2.3.5", navigation : "2.3.5",
gradlePlugin : "4.2.2", gradlePlugin : "4.2.2",
androidxcore : "1.5.0", androidxcore : "1.5.0",
ktlint : "0.37.1", ktlint : "0.37.1",
ktlintGradle : "9.2.1", ktlintGradle : "10.2.0",
detekt : "1.18.1", detekt : "1.18.1",
jacoco : "0.8.7", jacoco : "0.8.7",
preferences : "1.1.1", preferences : "1.1.1",

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -32,9 +32,9 @@ ext {
jacocoTestReport { jacocoTestReport {
reports { reports {
html.enabled true html.required = true
csv.enabled false xml.required = false
xml.enabled true csv.required = false
} }
afterEvaluate { afterEvaluate {