From 1fb1d5db1f21857662675297c04b333ae1a866e7 Mon Sep 17 00:00:00 2001 From: Sarah Gerweck Date: Wed, 4 May 2016 21:00:56 -0700 Subject: [PATCH] Update to ScalaFX for Java 1.8.0u92 Also, update the version number of Gerweck Utils. --- project/Build.scala | 4 ++-- src/main/scala/org/gerweck/scalafx/util/scene.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index c462676..2ae72e8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -223,7 +223,7 @@ object Dependencies { final val groovyVersion = "2.4.4" final val scalaParserVersion = "1.0.4" final val scalaXmlVersion = "1.0.5" - final val gerweckUtilVersion = "1.6.0" + final val gerweckUtilVersion = "1.7.0" final val scalazVersion = "7.2.2" final val shapelessVersion = "2.3.0" final val scallopVersion = "0.9.5" @@ -281,7 +281,7 @@ object Dependencies { /* ********************************************************************** */ /* ScalaFX */ /* ********************************************************************** */ - final val scalaFxVersion = "8.0.60-R9" + final val scalaFxVersion = "8.0.92-R10" val scalaFx = "org.scalafx" %% "scalafx" % scalaFxVersion diff --git a/src/main/scala/org/gerweck/scalafx/util/scene.scala b/src/main/scala/org/gerweck/scalafx/util/scene.scala index d05a920..74dc5ca 100644 --- a/src/main/scala/org/gerweck/scalafx/util/scene.scala +++ b/src/main/scala/org/gerweck/scalafx/util/scene.scala @@ -1,10 +1,10 @@ package org.gerweck.scalafx.util -import scalafx.geometry.Orientation._ +import scalafx.geometry.Orientation.{ Horizontal, Vertical } import scalafx.scene.control._ object Separators { - def vertical() = new Separator { orientation = VERTICAL } - def horizontal() = new Separator { orientation = HORIZONTAL } + def vertical() = new Separator { orientation = Vertical } + def horizontal() = new Separator { orientation = Horizontal } }