DSL value has shorter alias now

This commit is contained in:
Benoit Marty 2021-09-08 23:10:45 +02:00 committed by Benoit Marty
parent 529a7aedcb
commit 5a5d4fda2d
6 changed files with 18 additions and 19 deletions

View File

@ -18,11 +18,11 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 30 compileSdk 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdk 21
targetSdkVersion 30 targetSdk 30
} }
buildTypes { buildTypes {

View File

@ -20,12 +20,11 @@ plugins {
} }
android { android {
compileSdkVersion 30 compileSdk 30
buildToolsVersion "30.0.3"
defaultConfig { defaultConfig {
minSdkVersion 21 minSdk 21
targetSdkVersion 30 targetSdk 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

View File

@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
android { android {
compileSdkVersion 30 compileSdk 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdk 21
targetSdkVersion 30 targetSdk 30
// Multidex is useful for tests // Multidex is useful for tests
multiDexEnabled true multiDexEnabled true

View File

@ -14,12 +14,12 @@ buildscript {
} }
android { android {
compileSdkVersion 30 compileSdk 30
testOptions.unitTests.includeAndroidResources = true testOptions.unitTests.includeAndroidResources = true
defaultConfig { defaultConfig {
minSdkVersion 21 minSdk 21
targetSdkVersion 30 targetSdk 30
// Multidex is useful for tests // Multidex is useful for tests
multiDexEnabled true multiDexEnabled true

View File

@ -19,11 +19,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize' apply plugin: 'kotlin-parcelize'
android { android {
compileSdkVersion 30 compileSdk 30
defaultConfig { defaultConfig {
minSdkVersion 19 minSdk 19
targetSdkVersion 30 targetSdk 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'

View File

@ -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 def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0
android { 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 // 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 // Ref: https://issuetracker.google.com/issues/144111441
@ -111,8 +111,8 @@ android {
defaultConfig { defaultConfig {
applicationId "im.vector.app" applicationId "im.vector.app"
// Set to API 21: see #405 // Set to API 21: see #405
minSdkVersion 21 minSdk 21
targetSdkVersion 30 targetSdk 30
multiDexEnabled true multiDexEnabled true
renderscriptTargetApi 24 renderscriptTargetApi 24