From b6c5ca3a754e763e9f6444da06d4e0bb0754796d Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 25 Jun 2020 15:51:22 +0300 Subject: [PATCH] constants to root extensions --- android-configs/app-config.gradle | 2 +- android-configs/common-config.gradle | 16 ++++++++++------ .../main/kotlin/plugins/lib-settings.gradle.kts | 6 +----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android-configs/app-config.gradle b/android-configs/app-config.gradle index 2d0cbf8..cf6759d 100644 --- a/android-configs/app-config.gradle +++ b/android-configs/app-config.gradle @@ -4,4 +4,4 @@ apply from: '../RoboSwag/android-configs/common-config.gradle' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' \ No newline at end of file +apply plugin: 'kotlin-kapt' diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle index cda3a5c..4949440 100644 --- a/android-configs/common-config.gradle +++ b/android-configs/common-config.gradle @@ -1,13 +1,18 @@ apply plugin: 'kotlin-android' +rootProject.ext { + compileSdk = 29 + + minSdk = 21 + targetSdk = 29 +} + android { - compileSdkVersion 29 + compileSdkVersion rootProject.ext.compileSdk defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - - multiDexEnabled = true + minSdkVersion rootProject.ext.minSdk + targetSdkVersion rootProject.ext.targetSdk } compileOptions { @@ -18,5 +23,4 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - } diff --git a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts index ff0c3cd..016b271 100644 --- a/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts +++ b/android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts @@ -1,4 +1,3 @@ - plugins { id("com.android.application") apply false id("kotlin-android") @@ -10,9 +9,7 @@ android { defaultConfig { minSdkVersion(21) - targetSdkVersion(29) - - multiDexEnabled = true + targetSdkVersion(29) } compileOptions { @@ -23,5 +20,4 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - }