Fix deprecations in gradle file

This commit is contained in:
Mygod
2021-05-19 11:47:35 -04:00
parent 85e076d530
commit 51361bb4f6

View File

@@ -11,25 +11,26 @@ plugins {
android { android {
val javaVersion = JavaVersion.VERSION_1_8 val javaVersion = JavaVersion.VERSION_1_8
val targetSdk = 29 val targetSdk = 29
buildToolsVersion("30.0.3") buildToolsVersion = "30.0.3"
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
} }
compileSdkVersion(30) compileSdk = 30
kotlinOptions.jvmTarget = javaVersion.toString() kotlinOptions.jvmTarget = javaVersion.toString()
defaultConfig { defaultConfig {
applicationId = "be.mygod.vpnhotspot" applicationId = "be.mygod.vpnhotspot"
minSdkVersion(21) minSdk = 21
targetSdkVersion(targetSdk) this.targetSdk = targetSdk
resConfigs(listOf("it", "ru", "zh-rCN", "zh-rTW")) resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW"))
versionCode = 259 versionCode = 259
versionName = "2.11.6" versionName = "2.11.6"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions.annotationProcessorOptions.arguments(mapOf( kapt.arguments {
"room.incremental" to "true", arg("room.incremental", true)
"room.schemaLocation" to "$projectDir/schemas")) arg("room.schemaLocation", "$projectDir/schemas")
}
buildConfigField("boolean", "DONATIONS", "true") buildConfigField("boolean", "DONATIONS", "true")
buildConfigField("int", "TARGET_SDK", targetSdk.toString()) buildConfigField("int", "TARGET_SDK", targetSdk.toString())
} }
@@ -47,14 +48,14 @@ android {
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
} }
} }
packagingOptions.exclude("**/*.kotlin_*") packagingOptions.resources.excludes.add("**/*.kotlin_*")
flavorDimensions("freedom") flavorDimensions.add("freedom")
productFlavors { productFlavors {
create("freedom") { create("freedom") {
setDimension("freedom") dimension = "freedom"
} }
create("google") { create("google") {
setDimension("freedom") dimension = "freedom"
buildConfigField("boolean", "DONATIONS", "false") buildConfigField("boolean", "DONATIONS", "false")
} }
} }