MirrorDimension/ocelot-desktop
1
0
Fork 0
mirror of https://gitlab.com/cc-ru/ocelot/ocelot-desktop.git synced 2025-12-20 02:59:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency versions (including new Scala and patched log4j)

Browse Source
This commit is contained in:
UnicornFreedom 2022-03-24 02:19:07 +01:00
parent 3de6f32606
commit d25f8816df
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -1,6 +1,6 @@
name := "ocelot-desktop" name := "ocelot-desktop"
version := "0.1" version := "0.1"
scalaVersion := "2.13.2" scalaVersion := "2.13.8"
lazy val root = project.in(file(".")) lazy val root = project.in(file("."))
.dependsOn(brain % "compile->compile") .dependsOn(brain % "compile->compile")
@ -8,8 +8,8 @@ lazy val root = project.in(file("."))
lazy val brain = ProjectRef(file("lib/ocelot-brain"), "ocelot-brain") 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-core" % "2.17.1"
libraryDependencies += "org.apache.logging.log4j" % "log4j-api" % "2.14.1" libraryDependencies += "org.apache.logging.log4j" % "log4j-api" % "2.17.1"
libraryDependencies += "li.flor" % "native-j-file-chooser" % "1.6.4" libraryDependencies += "li.flor" % "native-j-file-chooser" % "1.6.4"
val lwjglVersion = "2.9.3" val lwjglVersion = "2.9.3"

2
lib/ocelot-brain

@ -1 +1 @@
Subproject commit c21eba01e5840018df73b281765e787fb08dd0e1 Subproject commit 2dc5aa8f8be915764220c50c893b4494853b1934

2
src/main/scala/ocelot/desktop/ui/widget/MenuBarSubmenu.scala
View File

@ -4,7 +4,7 @@ import ocelot.desktop.geometry.Vector2D
import ocelot.desktop.ui.UiHandler import ocelot.desktop.ui.UiHandler
import ocelot.desktop.ui.widget.contextmenu.ContextMenu 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 private var menuOpened = false
override def onMouseLeave(): Unit = { override def onMouseLeave(): Unit = {