fix: solve rebase issues

jahrim · Mar 6, 2023 · a86aa12 · a86aa12
1 parent b23c23f
commit a86aa12
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/chess/src/main/scala/io/github/chess/engine/model/moves/DoubleMove.scala b/chess/src/main/scala/io/github/chess/engine/model/moves/DoubleMove.scala
@@ -6,7 +6,8 @@
  */
 package io.github.chess.engine.model.moves
 
-import io.github.chess.engine.model.board.{Position, Team}
+import io.github.chess.engine.model.board.Position
+import io.github.chess.engine.model.game.Team
 import io.github.chess.engine.model.pieces.Piece
 
 /** Represents the moving of a pawn by two steps forward. */

diff --git a/chess/src/main/scala/io/github/chess/engine/model/rules/chess/BaseCaptureRule.scala b/chess/src/main/scala/io/github/chess/engine/model/rules/chess/BaseCaptureRule.scala
diff --git a/chess/src/main/scala/io/github/chess/engine/model/rules/chess/pawn/EnPassantFilterRule.scala b/chess/src/main/scala/io/github/chess/engine/model/rules/chess/pawn/EnPassantFilterRule.scala
@@ -11,7 +11,6 @@ import io.github.chess.engine.model.game.{ChessGameStatus, Team}
 import io.github.chess.engine.model.moves.{DoubleMove, EnPassantMove, Move}
 import io.github.chess.engine.model.rules.chess.{ChessRule, RuleShorthands}
 
-
 /** Mixin that checks whether the "en passant" rule can be applied. */
 trait EnPassantFilterRule extends ChessRule with RuleShorthands:
 

diff --git a/chess/src/main/scala/io/github/chess/engine/model/rules/chess/pawn/PawnCaptureRule.scala b/chess/src/main/scala/io/github/chess/engine/model/rules/chess/pawn/PawnCaptureRule.scala
@@ -6,7 +6,7 @@
  */
 package io.github.chess.engine.model.rules.chess.pawn
 
-import io.github.chess.model.rules.chess.OnlyCaptureEnemies
+import io.github.chess.engine.model.rules.chess.OnlyCaptureEnemies
 
 /** The rule that analyzes Pawn base capture rule to say if it can perform it or not. */
 class PawnCaptureRule extends PawnCaptureMoves with OnlyCaptureEnemies
diff --git a/...s/src/test/scala/io/github/chess/engine/model/rules/chess/pawn/PawnCaptureMovesSpec.scala b/...s/src/test/scala/io/github/chess/engine/model/rules/chess/pawn/PawnCaptureMovesSpec.scala
@@ -4,10 +4,10 @@
  *
  * Full license description available at: https://github.com/jahrim/PPS-22-chess/blob/master/LICENSE
  */
-package io.github.chess.model.rules.chess.pawn
+package io.github.chess.engine.model.rules.chess.pawn
 
-import io.github.chess.model.Team
-import io.github.chess.model.pieces.Pawn
+import io.github.chess.engine.model.game.Team
+import io.github.chess.engine.model.pieces.Pawn
 
 /** Test suit for the rule that finds the possible capture moves of a [[io.github.chess.model.pieces.Pawn]]. */
 class PawnCaptureMovesSpec extends AbstractPawnSpec: