aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Welsh <noelwelsh@gmail.com>2018-02-16 11:26:51 -0500
committerGitHub <noreply@github.com>2018-02-16 11:26:51 -0500
commit82fdb0dee1f3a85b127a71a0c952eadd45b70215 (patch)
tree51e5cc5397ef2d33f6354508537af5a60fc808df
parent424b242e7cc6ac4f79ce712461725471cd3ccbe4 (diff)
parentbab1121b29d3f8078020fd1bd2d4453387fe4d3b (diff)
downloadcreative-scala-template-82fdb0dee1f3a85b127a71a0c952eadd45b70215.tar.gz
creative-scala-template-82fdb0dee1f3a85b127a71a0c952eadd45b70215.tar.bz2
creative-scala-template-82fdb0dee1f3a85b127a71a0c952eadd45b70215.zip
Merge pull request #2 from pwdd/update/sbt-and-scala-versions
Update/sbt and scala versions
-rw-r--r--build.sbt2
-rw-r--r--project/build.properties2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index 371bce9..3b03318 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.4"
resolvers += Resolver.bintrayRepo("underscoreio", "training")
diff --git a/project/build.properties b/project/build.properties
index 59e7c05..66fe511 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11 \ No newline at end of file
+sbt.version=1.1.0 \ No newline at end of file