Skip to content

Commit a979874

Browse files
committed
Merge branch 'master' into release
2 parents b16b926 + dd57d66 commit a979874

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
99
// JAR_BUILT_BY - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
1010
//
1111

12-
val projectVersion = "0.10.0"
12+
val projectVersion = "0.10.0.1-SNAPSHOT"
1313
val versionTagDir = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
14-
val _scalaVersions = Seq("3.3.3", "2.13.14", "2.12.19")
14+
val _scalaVersions = Seq("3.3.4", "2.13.15", "2.12.20")
1515
val _scalaVersion = _scalaVersions.head
1616

1717
ThisBuild / version := projectVersion
@@ -22,11 +22,11 @@ ThisBuild / organization := "org.scalafx"
2222
publishArtifact := false
2323
publish / skip := true
2424

25-
lazy val libEnumeratum = "com.beachape" %% "enumeratum" % "1.7.4"
26-
lazy val libLogbackClassic = "ch.qos.logback" % "logback-classic" % "1.5.6"
25+
lazy val libEnumeratum = "com.beachape" %% "enumeratum" % "1.7.5"
26+
lazy val libLogbackClassic = "ch.qos.logback" % "logback-classic" % "1.5.11"
2727
lazy val libParadise = "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full
2828
lazy val libScalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
29-
lazy val libScalaFX = "org.scalafx" %% "scalafx" % "22.0.0-R33"
29+
lazy val libScalaFX = "org.scalafx" %% "scalafx" % "23.0.1-R34"
3030
lazy val libScalaFXML = "org.scalafx" %% "scalafxml-core-sfx8" % "0.5"
3131
lazy val libScalaTest = "org.scalatest" %% "scalatest" % "3.2.19"
3232
lazy val libScalaReflect = "org.scala-lang" % "scala-reflect"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2525
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626
#
27-
sbt.version=1.10.1
27+
sbt.version=1.10.3
2828

0 commit comments

Comments
 (0)