diff --git a/build.sbt b/build.sbt index ae4de62..4a15600 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ocelot-desktop" version := "0.1" -scalaVersion := "2.13.2" +scalaVersion := "2.13.8" lazy val root = project.in(file(".")) .dependsOn(brain % "compile->compile") @@ -8,8 +8,8 @@ lazy val root = project.in(file(".")) lazy val brain = ProjectRef(file("lib/ocelot-brain"), "ocelot-brain") -libraryDependencies += "org.apache.logging.log4j" % "log4j-core" % "2.14.1" -libraryDependencies += "org.apache.logging.log4j" % "log4j-api" % "2.14.1" +libraryDependencies += "org.apache.logging.log4j" % "log4j-core" % "2.17.1" +libraryDependencies += "org.apache.logging.log4j" % "log4j-api" % "2.17.1" libraryDependencies += "li.flor" % "native-j-file-chooser" % "1.6.4" val lwjglVersion = "2.9.3" diff --git a/lib/ocelot-brain b/lib/ocelot-brain index c21eba0..2dc5aa8 160000 --- a/lib/ocelot-brain +++ b/lib/ocelot-brain @@ -1 +1 @@ -Subproject commit c21eba01e5840018df73b281765e787fb08dd0e1 +Subproject commit 2dc5aa8f8be915764220c50c893b4494853b1934 diff --git a/src/main/scala/ocelot/desktop/ui/widget/MenuBarSubmenu.scala b/src/main/scala/ocelot/desktop/ui/widget/MenuBarSubmenu.scala index e159387..6bc7e83 100644 --- a/src/main/scala/ocelot/desktop/ui/widget/MenuBarSubmenu.scala +++ b/src/main/scala/ocelot/desktop/ui/widget/MenuBarSubmenu.scala @@ -4,7 +4,7 @@ import ocelot.desktop.geometry.Vector2D import ocelot.desktop.ui.UiHandler import ocelot.desktop.ui.widget.contextmenu.ContextMenu -class MenuBarSubmenu(label: String, setup: ContextMenu => ()) extends MenuBarButton(label) { +class MenuBarSubmenu(label: String, setup: ContextMenu => Unit) extends MenuBarButton(label) { private var menuOpened = false override def onMouseLeave(): Unit = {