From 66b0e8d0d338b25332c4b21ba8f5560458777c30 Mon Sep 17 00:00:00 2001 From: Adrian Healey Date: Sat, 4 Apr 2020 19:49:14 +0200 Subject: [PATCH 1/3] Update SBT version to 1.3.9 --- scala/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 516e639b620df2fe229c412b9b7ec16ee73299be Mon Sep 17 00:00:00 2001 From: Adrian Healey Date: Sat, 4 Apr 2020 19:50:09 +0200 Subject: [PATCH 2/3] Update Scala version to 2.13.1 --- scala/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala/build.sbt b/scala/build.sbt index 6df3d754..2b2a661d 100644 --- a/scala/build.sbt +++ b/scala/build.sbt @@ -2,6 +2,6 @@ name := "GildedRose" version := "1.0" -scalaVersion := "2.12.1" +scalaVersion := "2.13.1" libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" From c0b6069c0923454bd45e8823174573dac96b82d3 Mon Sep 17 00:00:00 2001 From: Adrian Healey Date: Sun, 5 Apr 2020 13:17:19 +0200 Subject: [PATCH 3/3] Update ScalaTest version to 3.1.1 --- scala/build.sbt | 3 ++- scala/src/test/scala/com/gildedrose/GildedRoseTest.scala | 9 +++++---- .../src/test/scala/com/gildedrose/TexttestFixture.scala | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scala/build.sbt b/scala/build.sbt index 2b2a661d..d628c9f4 100644 --- a/scala/build.sbt +++ b/scala/build.sbt @@ -4,4 +4,5 @@ version := "1.0" 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/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),