diff --git a/dependencies.gradle b/dependencies.gradle index 77d072e7c7..620b252cd1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ ext.versions = [ 'targetCompat' : JavaVersion.VERSION_11, ] -def gradle = "7.0.4" +def gradle = "7.1.0" // Ref: https://kotlinlang.org/releases.html def kotlin = "1.5.31" def kotlinCoroutines = "1.5.2" @@ -37,7 +37,6 @@ ext.libs = [ 'gradlePlugin' : "com.android.tools.build:gradle:$gradle", 'kotlinPlugin' : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin", 'hiltPlugin' : "com.google.dagger:hilt-android-gradle-plugin:$dagger" - ], jetbrains : [ 'coroutinesCore' : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines", diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 57f40d1889..7632de615a 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -62,8 +62,8 @@ android { } } - adbOptions { - installOptions "-g" + installation { + installOptions '-g' // timeOutInMs 350 * 1000 } diff --git a/vector/build.gradle b/vector/build.gradle index 1c65850a00..a69a095ddb 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -288,9 +288,8 @@ android { } } - lintOptions { - lintConfig file("lint.xml") - + lint { + lintConfig file('lint.xml') checkDependencies true abortOnError true }