Update to Kotlin 1.5.20, Android Gradle plugin 4.2.2 and Gradle 6.7.1.

upstream-sync
Sebastian Kaspari 3 years ago committed by mergify[bot]
parent 8b5aef7def
commit 140274c192

@ -579,6 +579,10 @@ if (project.hasProperty("coverage")) {
jacoco.includeNoLocationClasses = true
}
jacoco {
toolVersion = "0.8.7"
}
android.applicationVariants.all { variant ->
tasks.register("jacoco${variant.name.capitalize()}TestReport", JacocoReport) {
dependsOn "test${variant.name.capitalize()}UnitTest"

@ -35,6 +35,7 @@ buildscript {
includeGroupByRegex RepoMatching.androidx
includeGroupByRegex RepoMatching.comGoogleAndroid
includeGroupByRegex RepoMatching.comGoogleFirebase
includeGroupByRegex RepoMatching.comGoogleTesting
includeGroupByRegex RepoMatching.comAndroid
}
}

@ -3,12 +3,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object Versions {
const val kotlin = "1.5.10"
const val kotlin = "1.5.20"
const val coroutines = "1.5.0"
// These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
// https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
const val android_gradle_plugin = "4.0.1"
const val android_gradle_plugin = "4.2.2"
const val android_lint_api = "27.0.1"
const val sentry = "1.7.10"
@ -243,6 +243,7 @@ object RepoMatching {
const val androidx = "androidx\\..*"
const val comAndroid = "com\\.android.*"
const val comGoogleFirebase = "com\\.google\\.firebase"
const val comGoogleTesting = "com\\.google\\.testing\\..*"
/**
* A matcher for com.google.android.* with one exception: the espresso-contrib dependency includes the

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

Loading…
Cancel
Save