diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 7ce2b19a76..067fc4e6f0 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.6.21" + const val kotlinVersion = "1.7.0" const val appName = "Unciv" const val appCodeNumber = 724 const val appVersion = "4.1.10" diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 7f8d7518de..c03cddf5c8 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -71,7 +71,7 @@ object UnitActions { addTriggerUniqueActions(unit, actionList) addAddInCapitalAction(unit, actionList, tile) - addWaitAction(unit, actionList, worldScreen); + addWaitAction(unit, actionList, worldScreen) addToggleActionsAction(unit, actionList, unitTable) @@ -574,6 +574,7 @@ object UnitActions { }.takeIf { canConductTradeMission } ) } + else -> {} } } diff --git a/ios/build.gradle.kts b/ios/build.gradle.kts index 03bd0c7df6..ea3f9aa5dd 100644 --- a/ios/build.gradle.kts +++ b/ios/build.gradle.kts @@ -8,7 +8,7 @@ sourceSets { } java { - sourceCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 } tasks { @@ -36,4 +36,4 @@ robovm { eclipse.project { name = "${BuildConfig.appName}-ios" natures("org.robovm.eclipse.RoboVMNature") -} \ No newline at end of file +}