AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-upgraded Kotlin to 1.5.30, and together with it - minSdk and source&target compatibility to 1.8.

Browse Source 
We've finally advanced to 2015 (when 1.7 was deprecated)
This commit is contained in:
yairm210 2021-09-05 19:36:35 +03:00
parent a28feda692
commit 2474c6a635
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/build.gradle.kts
View File

@ -24,7 +24,7 @@ android {
} }
defaultConfig { defaultConfig {
applicationId = "com.unciv.app" applicationId = "com.unciv.app"
minSdk = 14 minSdk = 17
targetSdk = 30 // See #5044 targetSdk = 30 // See #5044
versionCode = BuildConfig.appCodeNumber versionCode = BuildConfig.appCodeNumber
versionName = BuildConfig.appVersion versionName = BuildConfig.appVersion
@ -60,8 +60,8 @@ android {
disable("MissingTranslation") disable("MissingTranslation")
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_8
} }
androidResources { androidResources {
// Don't add local save files and fonts to release, obviously // Don't add local save files and fonts to release, obviously
@ -122,6 +122,6 @@ tasks.register<JavaExec>("run") {
dependencies { dependencies {
// Updating to latest version would require upgrading sourceCompatability and targetCompatability to 1_8 - // Updating to latest version would require upgrading sourceCompatability and targetCompatability to 1_8 -
// run `./gradlew build --scan` to see details // run `./gradlew build --scan` to see details
implementation("androidx.core:core-ktx:1.3.2") implementation("androidx.core:core-ktx:1.6.0")
implementation("androidx.work:work-runtime-ktx:2.6.0-alpha02") implementation("androidx.work:work-runtime-ktx:2.6.0")
} }

4
android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt
View File

@ -42,7 +42,6 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
private const val FAIL_COUNT = "FAIL_COUNT" private const val FAIL_COUNT = "FAIL_COUNT"
private const val GAME_ID = "GAME_ID" private const val GAME_ID = "GAME_ID"
private const val GAME_NAMES = "GAME_NAMES"
private const val USER_ID = "USER_ID" private const val USER_ID = "USER_ID"
private const val CONFIGURED_DELAY = "CONFIGURED_DELAY" private const val CONFIGURED_DELAY = "CONFIGURED_DELAY"
private const val PERSISTENT_NOTIFICATION_ENABLED = "PERSISTENT_NOTIFICATION_ENABLED" private const val PERSISTENT_NOTIFICATION_ENABLED = "PERSISTENT_NOTIFICATION_ENABLED"
@ -184,7 +183,7 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
// May be useful to remind a player that he forgot to complete his turn. // May be useful to remind a player that he forgot to complete his turn.
notifyUserAboutTurn(applicationContext) notifyUserAboutTurn(applicationContext)
} else { } else {
val inputData = workDataOf(Pair(FAIL_COUNT, 0), Pair(GAME_ID, gameIds), Pair(GAME_NAMES, gameNames), val inputData = workDataOf(Pair(FAIL_COUNT, 0), Pair(GAME_ID, gameIds),
Pair(USER_ID, settings.userId), Pair(CONFIGURED_DELAY, settings.multiplayerTurnCheckerDelayInMinutes), Pair(USER_ID, settings.userId), Pair(CONFIGURED_DELAY, settings.multiplayerTurnCheckerDelayInMinutes),
Pair(PERSISTENT_NOTIFICATION_ENABLED, settings.multiplayerTurnCheckerPersistentNotificationEnabled)) Pair(PERSISTENT_NOTIFICATION_ENABLED, settings.multiplayerTurnCheckerPersistentNotificationEnabled))
@ -227,7 +226,6 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame
try { try {
val gameIds = inputData.getStringArray(GAME_ID)!! val gameIds = inputData.getStringArray(GAME_ID)!!
val gameNames = inputData.getStringArray(GAME_NAMES)!!
var arrayIndex = 0 var arrayIndex = 0
// We only want to notify the user or update persisted notification once but still want // We only want to notify the user or update persisted notification once but still want
// to download all games to update the files hence this bool // to download all games to update the files hence this bool

2
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -1,7 +1,7 @@
package com.unciv.build package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.4.30" const val kotlinVersion = "1.5.30"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 621 const val appCodeNumber = 621
const val appVersion = "3.16.12" const val appVersion = "3.16.12"