Skip to content

Commit f227399

Browse files
committed
updated to scala 2.13
1 parent 29ec72c commit f227399

File tree

16 files changed

+20
-485
lines changed

16 files changed

+20
-485
lines changed

build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "CodinGame-Scala-Kit"
22
version := "0.1.0"
3-
scalaVersion := "2.12.4"
3+
scalaVersion := "2.13.1"
44

55
// solve a weird issue with java dependencies (trait Approving)
66
// see https://stackoverflow.com/questions/43751394/package-cats-contains-object-and-package-with-same-name-implicits &
@@ -10,11 +10,9 @@ scalacOptions := Seq("-Yresolve-term-conflict:object")
1010

1111
resolvers += Resolver.mavenLocal
1212

13-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
13+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % "test"
1414
libraryDependencies += "com.github.writethemfirst" % "approvals-java" % "0.4" % "test"
15-
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.12.4" % "test"
16-
libraryDependencies += "com.geirsson" %% "scalafmt-core" % "1.3.0"
17-
libraryDependencies += "com.geirsson" %% "scalafmt-cli" % "1.3.0"
15+
libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.13.1" % "test"
1816

1917
enablePlugins(JmhPlugin)
2018
enablePlugins(JavaAppPackaging)

src/main/scala/com/truelaurel/algorithm/graph/BreathFirstShortestPathFinder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class BreathFirstShortestPathFinder[T](graph: Map[T, Vector[T]], obstacles: Set[
99
}
1010

1111
def findPaths(source: T, targets: Set[T]): Paths = {
12-
path(targets, Map(source -> Vector.empty), Set.empty, Map.empty).mapValues(_.reverse)
12+
path(targets, Map(source -> Vector.empty), Set.empty, Map.empty).mapValues(_.reverse).toMap
1313
}
1414

1515
private def path(targets: Set[T], paths: Paths, visited: Set[T], found: Paths): Paths = {

src/main/scala/com/truelaurel/algorithm/graph/FloydWarshall.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ object ShortestPath {
4141
}
4242

4343
// Extract paths.
44-
val itenearies = mutable.Map[Int, Map[Int, Seq[Int]]]()
44+
val itenearies = mutable.Map[Int, Map[Int, ArrayBuffer[Int]]]()
4545
for (i <- 0 until n) {
46-
val ps = mutable.Map[Int, Seq[Int]]()
46+
val ps = mutable.Map[Int, ArrayBuffer[Int]]()
4747
for (j <- 0 until n)
4848
if (ds(i)(j) != inf) {
4949
val p = new ArrayBuffer[Int]()

src/main/scala/com/truelaurel/codingame/tool/bundle/Bundler.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ case class Bundler(fileName: String, io: BundlerIo) {
99

1010
def bundle(): Unit = {
1111
val outputFileContent = buildOutput
12-
val formattedOutputFileContent = org.scalafmt.Scalafmt.format(outputFileContent).get
13-
io.save(fileName, formattedOutputFileContent)
12+
io.save(fileName, outputFileContent)
1413
}
1514

1615
def buildOutput: String = {

src/main/scala/com/truelaurel/collection/IterableUtil.scala

Lines changed: 0 additions & 77 deletions
This file was deleted.

src/main/scala/com/truelaurel/samplegames/stirfry/Card.scala

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/scala/com/truelaurel/samplegames/stirfry/CardStack.scala

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/scala/com/truelaurel/samplegames/stirfry/FryBoard.scala

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/main/scala/com/truelaurel/samplegames/stirfry/FryDemo.scala

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/scala/com/truelaurel/samplegames/stirfry/FryMove.scala

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)