From 8372a4be4feacd96e7a7d31007fdcc7e6783e526 Mon Sep 17 00:00:00 2001
From: William Billingsley <wbilling@une.edu.au>
Date: Fri, 3 Apr 2020 16:10:12 +1100
Subject: [PATCH] Update to Scala 2.13
---
.gitignore | 5 +++++
build.sbt | 12 +++++++-----
project/build.properties | 2 +-
src/main/scala/cosc250/boids/BoidsApp.scala | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 852f4ac..3d978db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,9 @@ lift_example
vagrant/.bashrc
vagrant/sbt-launch.jar
+# Metals
+.metals/
+.bloop/
+metals.sbt
+
tmp
diff --git a/build.sbt b/build.sbt
index f52594d..b690bb8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,10 +2,12 @@ lazy val root = (project in file(".")).
settings(
name := "Boids",
version := "1.0",
- scalaVersion := "2.12.8"
+ scalaVersion := "2.13.1"
)
-libraryDependencies += "org.scalafx" %% "scalafx" % "8.0.144-R12"
-libraryDependencies += "org.typelevel" %% "squants" % "1.3.0"
-libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.5"
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % "test"
+
+
+libraryDependencies += "org.scalafx" %% "scalafx" % "12.0.2-R18"
+libraryDependencies += "org.typelevel" %% "squants" % "1.6.0"
+libraryDependencies += "org.scalactic" %% "scalactic" % "3.1.1"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test"
diff --git a/project/build.properties b/project/build.properties
index c0bab04..a919a9b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8
diff --git a/src/main/scala/cosc250/boids/BoidsApp.scala b/src/main/scala/cosc250/boids/BoidsApp.scala
index 9cf3656..b034f8c 100644
--- a/src/main/scala/cosc250/boids/BoidsApp.scala
+++ b/src/main/scala/cosc250/boids/BoidsApp.scala
@@ -79,7 +79,7 @@ object BoidsApp {
container.add(controlsContainer, BorderLayout.EAST)
- window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE)
+ window.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE)
window.add(container)
window.setSize(container.getPreferredSize)
window.setVisible(true)
--
GitLab