mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-24 10:01:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reinstated desugaring since it broke the build

Browse Source
This commit is contained in:
Yair Morgenstern 2022-08-05 16:10:56 +03:00
parent 6309bbdcb6
commit b14870fbc5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/build.gradle.kts
View File

@ -27,7 +27,7 @@ android {
defaultConfig { defaultConfig {
applicationId = "com.unciv.app" applicationId = "com.unciv.app"
minSdk = 21 minSdk = 21
targetSdk = 31 // See #5044 targetSdk = 30 // See #5044
versionCode = BuildConfig.appCodeNumber versionCode = BuildConfig.appCodeNumber
versionName = BuildConfig.appVersion versionName = BuildConfig.appVersion
@ -65,6 +65,8 @@ android {
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
isCoreLibraryDesugaringEnabled = true
} }
androidResources { androidResources {
// Don't add local save files and fonts to release, obviously // Don't add local save files and fonts to release, obviously
@ -129,4 +131,6 @@ dependencies {
// Known Android Lint warning: "GradleDependency" // Known Android Lint warning: "GradleDependency"
implementation("androidx.core:core-ktx:1.6.0") implementation("androidx.core:core-ktx:1.6.0")
implementation("androidx.work:work-runtime-ktx:2.6.0") implementation("androidx.work:work-runtime-ktx:2.6.0")
// Needed to convert e.g. Android 26 API calls to Android 21
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
} }