From 59fa86e5fe20c20361ebf31e96986c726cdb1ba1 Mon Sep 17 00:00:00 2001 From: Carlos Martinez Date: Tue, 15 Jun 2021 20:55:44 -0400 Subject: [PATCH] Update: app build.gradle to use versions.gradle --- app/build.gradle | 37 +++++++++++++++++++++++++++++-------- base.gradle | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 base.gradle diff --git a/app/build.gradle b/app/build.gradle index 97fc1a7..f7fa9a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,39 +1,60 @@ +apply from: '../versions.gradle' + plugins { id 'com.android.application' id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion build_versions.target_sdk + buildToolsVersion build_versions.build_tools defaultConfig { applicationId "dev.carlos.acronyms" - minSdkVersion 21 - targetSdkVersion 30 + minSdkVersion build_versions.min_sdk + targetSdkVersion build_versions.target_sdk versionCode 1 versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField "String", "BASE_ENDPOINT", '"http://www.nactem.ac.uk/software/acromine/"' } buildTypes { + debug { + applicationIdSuffix '.debug' + debuggable true + signingConfig signingConfigs.debug + } release { - minifyEnabled false + debuggable false + minifyEnabled true + signingConfig signingConfigs.debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { - jvmTarget = '1.8' + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + + testOptions { + unitTests.returnDefaultValues = true + } + + lintOptions { + abortOnError false } } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.1' implementation 'androidx.appcompat:appcompat:1.2.0' diff --git a/base.gradle b/base.gradle new file mode 100644 index 0000000..81761df --- /dev/null +++ b/base.gradle @@ -0,0 +1,37 @@ +apply from: '../versions.gradle' +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion build_versions.target_sdk + buildToolsVersion build_versions.build_tools + + defaultConfig { + minSdkVersion build_versions.min_sdk + targetSdkVersion build_versions.target_sdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + + testOptions { + unitTests.returnDefaultValues = true + } + + lintOptions { + abortOnError false + } +} + +dependencies { + kapt deps.room.compiler +}