Define SDK/build tool versions in buildSrc
(cherry picked from commit ed1123feb0e12aaa270ddf9081a3778dd217c89c) # Conflicts: # app/build.gradle
This commit is contained in:
parent
3d2636e2b8
commit
fb33bc1cfb
@ -34,14 +34,14 @@ ext {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion '29.0.3'
|
||||
compileSdkVersion AndroidConfig.compileSdk
|
||||
buildToolsVersion AndroidConfig.buildTools
|
||||
publishNonDefault true
|
||||
|
||||
defaultConfig {
|
||||
applicationId "eu.kanade.tachiyomi.sy"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
minSdkVersion AndroidConfig.minSdk
|
||||
targetSdkVersion AndroidConfig.targetSdk
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
versionCode 1
|
||||
versionName "0.9.2.7"
|
||||
@ -99,11 +99,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility 1.8
|
||||
targetCompatibility 1.8
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/DEPENDENCIES'
|
||||
exclude 'LICENSE.txt'
|
||||
@ -129,8 +124,8 @@ android {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
|
6
buildSrc/src/main/kotlin/AndroidConfig.kt
Normal file
6
buildSrc/src/main/kotlin/AndroidConfig.kt
Normal 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"
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user