mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-23 01:14:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin 1.5.30 test (#5089)

Browse Source 
* Kotlin bump to 1.5.30

* Needed change due to (correct!) new compile error
This commit is contained in:
Yair Morgenstern 2021-09-05 00:28:21 +03:00 committed by GitHub
parent a1fdb612a9
commit f3a8188cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -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 // You'll still get kotlin-reflect-1.3.70.jar in your classpath, but will no longer be used
configurations.all { resolutionStrategy { configurations.all { resolutionStrategy {
force("org.jetbrains.kotlin:kotlin-reflect:1.4.30") force("org.jetbrains.kotlin:kotlin-reflect:${com.unciv.build.BuildConfig.kotlinVersion}")
} } } }

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 = 620 const val appCodeNumber = 620
const val appVersion = "3.16.11" const val appVersion = "3.16.11"

3
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -203,7 +203,8 @@ object NextTurnAutomation {
// Bonus for luxury resources we can get from them // Bonus for luxury resources we can get from them
value += cityState.detailedCivResources.count { it.resource.resourceType == ResourceType.Luxury value += cityState.detailedCivResources.count { it.resource.resourceType == ResourceType.Luxury
&& !(it.resource in civInfo.detailedCivResources) } && it.resource !in civInfo.detailedCivResources.map { it.resource }
}
return value return value
} }