Merge pull request #56 from dbuschman7/master

upgraded Scala version to latest versions
2025-12-12 04:12:13 +00:00 · 2017-02-14 09:10:49 +01:00 · 2017-02-14 09:10:49 +01:00 · e916fdd8ac
commit e916fdd8ac
parent f453de354f 267e4112c4
4 changed files with 24 additions and 2 deletions
--- a/scala/.gitignore
+++ b/scala/.gitignore
@ -0,0 +1,19 @@
+/bin/
+
+# OSX Finder
+.DS_Store
+
+# IntelliJ
+.idea
+*.iml
+
+# Eclipse
+.worksheet
+.settings
+.cache
+.cache-main
+.cache-tests
+.project
+.classpath
+
+target/
--- a/scala/build.sbt
+++ b/scala/build.sbt
@ -2,6 +2,6 @@ name := "GildedRose"

 version := "1.0"

-scalaVersion := "2.10.2"
+scalaVersion := "2.12.1"

-libraryDependencies += "org.scalatest" % "scalatest_2.10" % "2.0"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1"
--- a/scala/project/.gitignore
+++ b/scala/project/.gitignore
@ -0,0 +1,2 @@
+project/
+target/
--- a/scala/project/build.properties
+++ b/scala/project/build.properties
@ -0,0 +1 @@
+sbt.version=0.13.13