diff --git a/scala/build.sbt b/scala/build.sbt index 6df3d754..d628c9f4 100644 --- a/scala/build.sbt +++ b/scala/build.sbt @@ -2,6 +2,7 @@ name := "GildedRose" version := "1.0" -scalaVersion := "2.12.1" +scalaVersion := "2.13.1" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" +resolvers += DefaultMavenRepository +libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test" diff --git a/scala/project/build.properties b/scala/project/build.properties index d6e35076..06703e34 100644 --- a/scala/project/build.properties +++ b/scala/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.3.9 diff --git a/scala/src/test/scala/com/gildedrose/GildedRoseTest.scala b/scala/src/test/scala/com/gildedrose/GildedRoseTest.scala index b1a4acc4..c0ce6b23 100644 --- a/scala/src/test/scala/com/gildedrose/GildedRoseTest.scala +++ b/scala/src/test/scala/com/gildedrose/GildedRoseTest.scala @@ -1,12 +1,13 @@ package com.gildedrose -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class GildedRoseTest extends FlatSpec with Matchers { +class GildedRoseTest extends AnyFlatSpec with Matchers { it should "foo" in { - var items = Array[Item](new Item("foo", 0, 0)) + val items = Array[Item](new Item("foo", 0, 0)) val app = new GildedRose(items) app.updateQuality() - (app.items(0).name) should equal ("fixme") + app.items(0).name should equal ("fixme") } } \ No newline at end of file diff --git a/scala/src/test/scala/com/gildedrose/TexttestFixture.scala b/scala/src/test/scala/com/gildedrose/TexttestFixture.scala index 340bafad..1d00808c 100644 --- a/scala/src/test/scala/com/gildedrose/TexttestFixture.scala +++ b/scala/src/test/scala/com/gildedrose/TexttestFixture.scala @@ -2,7 +2,7 @@ package com.gildedrose object TexttestFixture { def main(args: Array[String]): Unit = { - var items = Array[Item]( + val items = Array[Item]( new Item("+5 Dexterity Vest", 10, 20), new Item("Aged Brie", 2, 0), new Item("Elixir of the Mongoose", 5, 7),