mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 13:49:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

increased kotlin version to latest 1.7.0 (#7151)

Browse Source 
* updated to 1.7.0

* change to empty else

* bumped ios java to 1.8
This commit is contained in:
alexban011
2022-06-14 21:10:44 +03:00
committed by GitHub
parent 07b7d91107
commit 59e4eb8373
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.6.21" const val kotlinVersion = "1.7.0"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 724 const val appCodeNumber = 724
const val appVersion = "4.1.10" const val appVersion = "4.1.10"

3
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -71,7 +71,7 @@ object UnitActions {
addTriggerUniqueActions(unit, actionList) addTriggerUniqueActions(unit, actionList)
addAddInCapitalAction(unit, actionList, tile) addAddInCapitalAction(unit, actionList, tile)
addWaitAction(unit, actionList, worldScreen); addWaitAction(unit, actionList, worldScreen)
addToggleActionsAction(unit, actionList, unitTable) addToggleActionsAction(unit, actionList, unitTable)
@ -574,6 +574,7 @@ object UnitActions {
}.takeIf { canConductTradeMission } }.takeIf { canConductTradeMission }
) )
} }
else -> {}
} }
} }

2
ios/build.gradle.kts
View File

@ -8,7 +8,7 @@ sourceSets {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_8
} }
tasks { tasks {