From f3a8188cb1efbd535bdd67719a0085e7fd804781 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 5 Sep 2021 00:28:21 +0300 Subject: [PATCH] Kotlin 1.5.30 test (#5089) * Kotlin bump to 1.5.30 * Needed change due to (correct!) new compile error --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/BuildConfig.kt | 2 +- core/src/com/unciv/logic/automation/NextTurnAutomation.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 111887ab53..2d1be98815 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ import com.unciv.build.BuildConfig.roboVMVersion // You'll still get kotlin-reflect-1.3.70.jar in your classpath, but will no longer be used configurations.all { resolutionStrategy { - force("org.jetbrains.kotlin:kotlin-reflect:1.4.30") + force("org.jetbrains.kotlin:kotlin-reflect:${com.unciv.build.BuildConfig.kotlinVersion}") } } diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 82d9a4511e..64e3d262b0 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 = 620 const val appVersion = "3.16.11" diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index 8853545fe2..10911cc5c8 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -203,7 +203,8 @@ object NextTurnAutomation { // Bonus for luxury resources we can get from them value += cityState.detailedCivResources.count { it.resource.resourceType == ResourceType.Luxury - && !(it.resource in civInfo.detailedCivResources) } + && it.resource !in civInfo.detailedCivResources.map { it.resource } + } return value }