Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define SDK/build tool versions in buildSrc

Browse Source 
(cherry picked from commit ed1123feb0e12aaa270ddf9081a3778dd217c89c)

# Conflicts:
#	app/build.gradle
This commit is contained in:
arkon 2020-07-01 11:53:30 -04:00 committed by Jobobby04
parent 3d2636e2b8
commit fb33bc1cfb
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/build.gradle
View File

@ -34,14 +34,14 @@ ext {
} }
android { android {
compileSdkVersion 29 compileSdkVersion AndroidConfig.compileSdk
buildToolsVersion '29.0.3' buildToolsVersion AndroidConfig.buildTools
publishNonDefault true publishNonDefault true
defaultConfig { defaultConfig {
applicationId "eu.kanade.tachiyomi.sy" applicationId "eu.kanade.tachiyomi.sy"
minSdkVersion 21 minSdkVersion AndroidConfig.minSdk
targetSdkVersion 29 targetSdkVersion AndroidConfig.targetSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 1 versionCode 1
versionName "0.9.2.7" versionName "0.9.2.7"
@ -99,11 +99,6 @@ android {
} }
} }
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
packagingOptions { packagingOptions {
exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/DEPENDENCIES'
exclude 'LICENSE.txt' exclude 'LICENSE.txt'
@ -129,8 +124,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility = 1.8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = 1.8 targetCompatibility = JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {

6
buildSrc/src/main/kotlin/AndroidConfig.kt Normal file
View File

@ -0,0 +1,6 @@
object AndroidConfig {
const val compileSdk = 29
const val minSdk = 21
const val targetSdk = 29
const val buildTools = "29.0.3"
}