summaryrefslogtreecommitdiff
path: root/sw-engine
diff options
context:
space:
mode:
Diffstat (limited to 'sw-engine')
-rw-r--r--sw-engine/build.gradle.kts8
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt1
3 files changed, 5 insertions, 8 deletions
diff --git a/sw-engine/build.gradle.kts b/sw-engine/build.gradle.kts
index e85d396f..9e6da395 100644
--- a/sw-engine/build.gradle.kts
+++ b/sw-engine/build.gradle.kts
@@ -1,6 +1,6 @@
plugins {
- id("org.jetbrains.kotlin.jvm")
- id("org.jlleitschuh.gradle.ktlint") version "7.1.0"
+ kotlin("jvm")
+ id("org.jlleitschuh.gradle.ktlint")
}
dependencies {
@@ -10,7 +10,3 @@ dependencies {
testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit"))
}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
- kotlinOptions.jvmTarget = "1.8"
-}
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
index a63ccdd6..82075d5c 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
@@ -1,11 +1,10 @@
package org.luxons.sevenwonders.game
-import org.junit.Test
import org.luxons.sevenwonders.game.api.Action
-import org.luxons.sevenwonders.game.cards.HandCard
import org.luxons.sevenwonders.game.api.PlayedMove
import org.luxons.sevenwonders.game.api.PlayerMove
import org.luxons.sevenwonders.game.api.PlayerTurnInfo
+import org.luxons.sevenwonders.game.cards.HandCard
import org.luxons.sevenwonders.game.cards.TableCard
import org.luxons.sevenwonders.game.data.GameDefinition
import org.luxons.sevenwonders.game.data.LAST_AGE
@@ -13,6 +12,7 @@ import org.luxons.sevenwonders.game.moves.MoveType
import org.luxons.sevenwonders.game.resources.ResourceTransactions
import org.luxons.sevenwonders.game.resources.noTransactions
import org.luxons.sevenwonders.game.test.testCustomizableSettings
+import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
index 78386b3d..ba6c1727 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
@@ -18,6 +18,7 @@ import org.luxons.sevenwonders.game.effects.Effect
import org.luxons.sevenwonders.game.effects.ScienceProgress
import org.luxons.sevenwonders.game.moves.Move
import org.luxons.sevenwonders.game.moves.MoveType
+import org.luxons.sevenwonders.game.moves.resolve
import org.luxons.sevenwonders.game.resources.Production
import org.luxons.sevenwonders.game.resources.Provider
import org.luxons.sevenwonders.game.resources.ResourceTransaction
bgstack15