diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 0ca5328c23..a2deca8c07 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -24,7 +24,7 @@ android { } defaultConfig { applicationId = "com.unciv.app" - minSdk = 14 + minSdk = 17 targetSdk = 30 // See #5044 versionCode = BuildConfig.appCodeNumber versionName = BuildConfig.appVersion @@ -60,8 +60,8 @@ android { disable("MissingTranslation") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } androidResources { // Don't add local save files and fonts to release, obviously @@ -122,6 +122,6 @@ tasks.register("run") { dependencies { // Updating to latest version would require upgrading sourceCompatability and targetCompatability to 1_8 - // run `./gradlew build --scan` to see details - implementation("androidx.core:core-ktx:1.3.2") - implementation("androidx.work:work-runtime-ktx:2.6.0-alpha02") + implementation("androidx.core:core-ktx:1.6.0") + implementation("androidx.work:work-runtime-ktx:2.6.0") } diff --git a/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt b/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt index 89dd78b9a4..d724daec6c 100644 --- a/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt +++ b/android/src/com/unciv/app/MultiplayerTurnCheckWorker.kt @@ -42,7 +42,6 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame private const val FAIL_COUNT = "FAIL_COUNT" private const val GAME_ID = "GAME_ID" - private const val GAME_NAMES = "GAME_NAMES" private const val USER_ID = "USER_ID" private const val CONFIGURED_DELAY = "CONFIGURED_DELAY" 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. notifyUserAboutTurn(applicationContext) } 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(PERSISTENT_NOTIFICATION_ENABLED, settings.multiplayerTurnCheckerPersistentNotificationEnabled)) @@ -227,7 +226,6 @@ class MultiplayerTurnCheckWorker(appContext: Context, workerParams: WorkerParame try { val gameIds = inputData.getStringArray(GAME_ID)!! - val gameNames = inputData.getStringArray(GAME_NAMES)!! var arrayIndex = 0 // 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 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 211f976c42..649c2ea3e2 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -1,7 +1,7 @@ package com.unciv.build object BuildConfig { - const val kotlinVersion = "1.4.30" + const val kotlinVersion = "1.5.30" const val appName = "Unciv" const val appCodeNumber = 621 const val appVersion = "3.16.12"