Update to Gradle 6.7. (#1066)

Also enable Gradle parallel flag and caching flags.
This commit is contained in:
Nelson Osacky 2020-10-18 04:57:22 +02:00 committed by GitHub
parent 52fec8cffd
commit 010b63a5c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 13 deletions

View file

@ -1,4 +1,5 @@
import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
import com.google.gms.googleservices.GoogleServicesPlugin.GoogleServicesPluginConfig
plugins {
id("com.android.application")
@ -7,6 +8,7 @@ plugins {
id("kotlin-android-extensions")
id("com.google.firebase.appdistribution")
id("com.github.triplet.play") version "3.0.0"
id("com.google.gms.google-services")
}
android {
@ -166,6 +168,7 @@ dependencies {
implementation(Config.Dependency.Misc.exoUi)
}
// This plugin must stay at the bottom
// https://developers.google.com/android/guides/google-services-plugin
apply(plugin = "com.google.gms.google-services")
// Disable to fix memory leak and be compatible with the configuration cache.
configure<GoogleServicesPluginConfig> {
disableVersionCheck = true
}

View file

@ -2,20 +2,20 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
id("com.github.ben-manes.versions") version "0.33.0"
}
buildscript {
repositories {
google()
jcenter()
maven(url = Config.Repository.gradle)
gradlePluginPortal()
}
dependencies {
classpath(Config.Plugin.android)
classpath(Config.Plugin.kotlin)
classpath(Config.Plugin.google)
classpath(Config.Plugin.appDistribution)
classpath(Config.Plugin.ktlint)
classpath(Config.Plugin.androidJunit5)
}
}

View file

@ -5,13 +5,7 @@ object Config {
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependency.Kotlin.version}"
const val google = "com.google.gms:google-services:4.3.4"
const val appDistribution = "com.google.firebase:firebase-appdistribution-gradle:1.4.0"
const val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.1"
const val androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.6.0.0"
}
object Repository {
const val gradle = "https://plugins.gradle.org/m2/"
const val lokalize = "https://maven.lokalise.co"
const val androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.6.2.0"
}
object Android {

View file

@ -20,3 +20,9 @@ android.useAndroidX = true
# Override these in your ${GRADLE_USER_HOME}/gradle.properties file if needed.
homeAssistantAndroidPushUrl=https://mobile-apps.home-assistant.io/api/sendPush/android/v1
homeAssistantAndroidRateLimitUrl=https://mobile-apps.home-assistant.io/api/checkRateLimits
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=true
android.nonTransitiveRClass=true

View file

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