diff --git a/.gitignore b/.gitignore index 852f4ac5deda1bcb736b7e54a89e7c9d716a6b7c..3d978db2d5876c85c964a16d171a05875353abef 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 f52594d142080971c1e02e0024c908a0f3967d5a..b690bb80ae8365170d4f74bac97688ef05437571 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 c0bab04941d74f9690e3610772090bfa4af33c37..a919a9b5f46b9db33340d3d997ac6f0f258a7662 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 9cf3656ab87c6a73f81dc6c620f7963a52c2660b..b034f8ce0aa0760c17b6c3c038a48209720de7c7 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)