From 0c159e587d83737b46e1f02c371beeb5f8a3f79d Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Mon, 2 Mar 2020 19:58:15 +0100 Subject: [PATCH] upgrade Gradle and Android plugin (#1709) * upgrade Gradle and Android plugin * upgrade Android Gradle plugin to 3.6.1 --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 17952bd8d..a71af6f14 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle.properties b/gradle.properties index d3ea8914f..8144ece09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ org.gradle.jvmargs=-Xmx4096m # use parallel execution org.gradle.parallel=true -android.enableUnitTestBinaryResources=true android.enableR8.fullMode=true +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..6254d2d4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists