Update to compile against API 31

This commit is contained in:
Mygod
2021-07-14 21:47:14 -04:00
parent 556ae9eb45
commit 1280df3d0c
3 changed files with 4 additions and 5 deletions

View File

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath(kotlin("gradle-plugin", "1.5.20")) classpath(kotlin("gradle-plugin", "1.5.21"))
classpath("com.android.tools.build:gradle:7.0.0-beta05") classpath("com.android.tools.build:gradle:7.0.0-beta05")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
classpath("com.google.android.gms:oss-licenses-plugin:0.10.4") classpath("com.google.android.gms:oss-licenses-plugin:0.10.4")

View File

@@ -13,7 +13,6 @@ android.databinding.incremental=true
android.enableJetifier=true android.enableJetifier=true
android.enableR8.fullMode=true android.enableR8.fullMode=true
android.enableResourceOptimizations=false android.enableResourceOptimizations=false
android.injected.testOnly=false
android.useAndroidX=true android.useAndroidX=true
kapt.incremental.apt=true kapt.incremental.apt=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m

View File

@@ -11,18 +11,18 @@ plugins {
android { android {
val javaVersion = JavaVersion.VERSION_1_8 val javaVersion = JavaVersion.VERSION_1_8
val targetSdk = 29 val targetSdk = 29
buildToolsVersion = "31.0.0-rc5" buildToolsVersion = "31.0.0"
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
} }
compileSdkPreview = "android-S" compileSdk = 31
kotlinOptions.jvmTarget = javaVersion.toString() kotlinOptions.jvmTarget = javaVersion.toString()
defaultConfig { defaultConfig {
applicationId = "be.mygod.vpnhotspot" applicationId = "be.mygod.vpnhotspot"
minSdk = 21 minSdk = 21
if (targetSdk == 31) targetSdkPreview = "S" else this.targetSdk = targetSdk this.targetSdk = targetSdk
resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW")) resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW"))
versionCode = 275 versionCode = 275
versionName = "2.12.4" versionName = "2.12.4"