Update gradle libraries

This commit is contained in:
yairm210 2024-09-05 21:50:18 +03:00
parent 16bca8d562
commit c9f5b94993
2 changed files with 35 additions and 30 deletions

View File

@ -3,12 +3,7 @@ import com.unciv.build.BuildConfig.coroutinesVersion
import com.unciv.build.BuildConfig.gdxVersion import com.unciv.build.BuildConfig.gdxVersion
import com.unciv.build.BuildConfig.kotlinVersion import com.unciv.build.BuildConfig.kotlinVersion
import com.unciv.build.BuildConfig.ktorVersion import com.unciv.build.BuildConfig.ktorVersion
import com.unciv.build.BuildConfig.appVersion
// 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:$kotlinVersion")
} }
buildscript { buildscript {
@ -36,16 +31,15 @@ kotlin {
// Plugins used for serialization of JSON for networking // Plugins used for serialization of JSON for networking
plugins { plugins {
id("io.gitlab.arturbosch.detekt").version("1.23.0-RC3") id("io.gitlab.arturbosch.detekt").version("1.23.0-RC3")
kotlin("multiplatform") version "1.8.10" kotlin("multiplatform") version com.unciv.build.BuildConfig.kotlinVersion
kotlin("plugin.serialization") version "1.8.10" kotlin("plugin.serialization") version com.unciv.build.BuildConfig.kotlinVersion
} }
allprojects { allprojects {
apply(plugin = "eclipse") apply(plugin = "eclipse")
apply(plugin = "idea") apply(plugin = "idea")
version = appVersion
version = "1.0.1"
repositories { repositories {
// Chinese mirrors for quicker loading for chinese devs - uncomment if you're chinese // Chinese mirrors for quicker loading for chinese devs - uncomment if you're chinese
@ -71,8 +65,10 @@ project(":desktop") {
exclude("com.badlogicgames.gdx", "gdx-backend-lwjgl") exclude("com.badlogicgames.gdx", "gdx-backend-lwjgl")
} }
// Needed to display "Playing Unciv" in Discord
"implementation"("com.github.MinnDevelopment:java-discord-rpc:v2.0.1") "implementation"("com.github.MinnDevelopment:java-discord-rpc:v2.0.1")
// Needed for Windows turn notifiers
"implementation"("net.java.dev.jna:jna:5.11.0") "implementation"("net.java.dev.jna:jna:5.11.0")
"implementation"("net.java.dev.jna:jna-platform:5.11.0") "implementation"("net.java.dev.jna:jna-platform:5.11.0")
} }
@ -144,7 +140,7 @@ project(":core") {
"implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") "implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
"implementation"("junit:junit:4.13.2") "implementation"("junit:junit:4.13.2")
"implementation"("org.mockito:mockito-core:5.1.1") "implementation"("org.mockito:mockito-core:5.13.0")
"implementation"("com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion") "implementation"("com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion")
"implementation"("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop") "implementation"("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop")

View File

@ -1073,11 +1073,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Cannot be hurried" ??? example "Cannot be hurried"
Applicable to: Tech, Building Applicable to: Tech, Building
@ -1099,11 +1099,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
## Policy uniques ## Policy uniques
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "[relativeAmount]% weight to this choice for AI decisions" ??? example "[relativeAmount]% weight to this choice for AI decisions"
Example: "[+20]% weight to this choice for AI decisions" Example: "[+20]% weight to this choice for AI decisions"
@ -1141,7 +1141,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Will not be displayed in Civilopedia" ??? example "Will not be displayed in Civilopedia"
Applicable to: Nation, Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, UnitType, Promotion, Terrain, Improvement, Resource, Ruins, Speed Applicable to: Nation, Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, UnitType, Promotion, Terrain, Improvement, Resource, Ruins, Speed
@ -1379,7 +1379,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Earn [amount]% of [mapUnitFilter] unit's [costOrStrength] as [civWideStat] when killed within 4 tiles of a city following this religion" ??? example "Earn [amount]% of [mapUnitFilter] unit's [costOrStrength] as [civWideStat] when killed within 4 tiles of a city following this religion"
Example: "Earn [3]% of [Wounded] unit's [Cost] as [Gold] when killed within 4 tiles of a city following this religion" Example: "Earn [3]% of [Wounded] unit's [Cost] as [Gold] when killed within 4 tiles of a city following this religion"
@ -1436,11 +1436,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Excess Food converted to Production when under construction" ??? example "Excess Food converted to Production when under construction"
Applicable to: Building, Unit Applicable to: Building, Unit
@ -1654,11 +1654,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Excess Food converted to Production when under construction" ??? example "Excess Food converted to Production when under construction"
Applicable to: Building, Unit Applicable to: Building, Unit
@ -2154,11 +2154,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
## Promotion uniques ## Promotion uniques
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Doing so will consume this opportunity to choose a Promotion" ??? example "Doing so will consume this opportunity to choose a Promotion"
Applicable to: Promotion Applicable to: Promotion
@ -2399,11 +2399,11 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Must be next to [tileFilter]" ??? example "Must be next to [tileFilter]"
Example: "Must be next to [Farm]" Example: "Must be next to [Farm]"
@ -2609,11 +2609,11 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet
## Ruins uniques ## Ruins uniques
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Free [unit] found in the ruins" ??? example "Free [unit] found in the ruins"
Example: "Free [Musketman] found in the ruins" Example: "Free [Musketman] found in the ruins"
@ -2729,11 +2729,20 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet
## Event uniques ## Event uniques
??? example "Only available" ??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable" ??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>". Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
## EventChoice uniques
??? example "Only available"
Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>". Only allows Building when ALL conditionals are met. Will also block Upgrade and Transform actions. See also CanOnlyBeBuiltWhen
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
??? example "Unavailable"
Meant to be used together with conditionals, like "Unavailable <after generating a Great Prophet>".
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins, Event, EventChoice
## Conditional uniques ## Conditional uniques
!!! note "" !!! note ""