mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-10 15:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded mockito versions.

Browse Source 
Instead of forcing reflection to depend on latest kotlin version, I have a feeling the dependency is due to older mockito depending on older reflection.
This commit is contained in:
yairm210
2021-08-20 15:45:46 +03:00
parent 85ed8a27d3
commit 5779bdaa4f
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -113,13 +113,13 @@ project(":core") {
"implementation"(project(":core")) "implementation"(project(":core"))
"implementation"("junit:junit:4.13.1") "implementation"("junit:junit:4.13.1")
"implementation"("org.mockito:mockito-all:1.9.5") "implementation"("org.mockito:mockito-all:1.10.19")
"implementation"("com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion") "implementation"("com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion")
"implementation"("com.badlogicgames.gdx:gdx:$gdxVersion") "implementation"("com.badlogicgames.gdx:gdx:$gdxVersion")
"testImplementation"("junit:junit:4.13.1") "testImplementation"("junit:junit:4.13.1")
"testImplementation"("org.mockito:mockito-all:1.9.5") "testImplementation"("org.mockito:mockito-all:1.10.19")
"testImplementation"("io.mockk:mockk:1.9.3") "testImplementation"("io.mockk:mockk:1.9.3")
"testImplementation"("com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion") "testImplementation"("com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion")

8
core/build.gradle.kts
View File

@ -8,14 +8,6 @@ java {
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_7
} }
tasks {
compileJava {
options.encoding = "UTF-8"
}
compileTestJava {
options.encoding = "UTF-8"
}
}
sourceSets { sourceSets {
main { main {

6
tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
View File

@ -115,13 +115,9 @@ class UnitMovementAlgorithmsTests {
for (type in ruleSet.unitTypes) { for (type in ruleSet.unitTypes) {
unit.baseUnit = BaseUnit().apply { unitType = type.key; ruleset = ruleSet } unit.baseUnit = BaseUnit().apply { unitType = type.key; ruleset = ruleSet }
unit.updateUniques() unit.updateUniques()
println(type.key + " " + unit.movement.canPassThrough(tile))
println()
Assert.assertTrue("$type cannot be in Ice", ( Assert.assertTrue("$type cannot be in Ice", (
type.value.uniques.contains("Can enter ice tiles")) type.value.uniques.contains("Can enter ice tiles"))
|| type.value.uniques.contains("Can pass through impassable tiles" || type.value.uniques.contains("Can pass through impassable tiles"
) == unit.movement.canPassThrough(tile)) ) == unit.movement.canPassThrough(tile))