From 5a5d4fda2dbf7112e2397a14c7b82f29450ada90 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 8 Sep 2021 23:10:45 +0200
Subject: [PATCH] DSL value has shorter alias now

---
 attachment-viewer/build.gradle     | 6 +++---
 library/ui-styles/build.gradle     | 7 +++----
 matrix-sdk-android-rx/build.gradle | 6 +++---
 matrix-sdk-android/build.gradle    | 6 +++---
 multipicker/build.gradle           | 6 +++---
 vector/build.gradle                | 6 +++---
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index fe71b41247..82e208d47e 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -18,11 +18,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
     }
 
     buildTypes {
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index 0806a07721..069becba0d 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -20,12 +20,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 30
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index ab72bcf427..0d2ddee2e0 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
 
         // Multidex is useful for tests
         multiDexEnabled true
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 4bfaca5084..956ac24c79 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -14,12 +14,12 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
     testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
 
         // Multidex is useful for tests
         multiDexEnabled true
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 73b4b124dd..64460f6721 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -19,11 +19,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdk 19
+        targetSdk 30
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/vector/build.gradle b/vector/build.gradle
index 9576ba86c0..7a9016f3b4 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -102,7 +102,7 @@ ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].
 def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
 
     // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use
     // Ref: https://issuetracker.google.com/issues/144111441
@@ -111,8 +111,8 @@ android {
     defaultConfig {
         applicationId "im.vector.app"
         // Set to API 21: see #405
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk 21
+        targetSdk 30
         multiDexEnabled true
 
         renderscriptTargetApi 24