From b5ba2ab49311d0f83e2c749c6e36a0ffa511addd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Oct 2020 17:46:27 +0200
Subject: [PATCH] Upgrade things as per Element Android
---
build.gradle | 7 +++----
gradle/wrapper/gradle-wrapper.properties | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2991170b..a4840681 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.3.72'
+ ext.kotlin_version = '1.4.10'
+ ext.kotlin_coroutines_version = "1.3.9"
repositories {
google()
jcenter()
@@ -10,9 +11,7 @@ buildscript {
}
}
dependencies {
- // Warning: 3.6.3 leads to infinite gradle builds. Stick to 3.5.3 for the moment
- classpath 'com.android.tools.build:gradle:3.5.3'
- classpath "com.airbnb.okreplay:gradle-plugin:1.5.0"
+ classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4da2435f..99d667cc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 02 12:33:07 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
--
GitLab