From 95e33fd0d759ddea03afe63fa188935db4990780 Mon Sep 17 00:00:00 2001 From: "Michael D. McCray" Date: Sun, 29 Mar 2020 12:37:08 -0500 Subject: [PATCH] update dependencies for 2.13 --- project/Dependencies.scala | 15 ++++++++------- project/ProjectSettings.scala | 6 +++--- project/build.properties | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f0ea828..3b7fa81 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ object Dependencies { /* ********************************************************************** */ /* Akka */ /* ********************************************************************** */ - final val akkaVersion = "2.5.12" + final val akkaVersion = "2.5.26" val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaStream = "com.typesafe.akka" %% "akka-stream" % akkaVersion @@ -12,18 +12,18 @@ object Dependencies { /* ********************************************************************** */ /* Utility Dependencies */ /* ********************************************************************** */ - final val slf4jVersion = "1.7.25" - final val log4sVersion = "1.6.1" + final val slf4jVersion = "1.7.28" + final val log4sVersion = "1.8.2" final val logbackVersion = "1.2.3" final val commonsVfsVersion = "2.2" final val commonsIoVersion = "2.4" final val spireVersion = "0.13.0" final val groovyVersion = "2.4.13" - final val scalaJava8Version = "0.8.0" + final val scalaJava8Version = "0.9.1" final val scalaParserVersion = "1.0.4" final val scalaXmlVersion = "1.0.5" - final val gerweckUtilVersion = "4.0.1" - final val catsVersion = "1.1.0" + final val gerweckUtilVersion = "5.0.1" + final val catsVersion = "2.1.1" final val shapelessVersion = "2.3.3" final val scallopVersion = "1.0.1" @@ -81,7 +81,8 @@ object Dependencies { /* ********************************************************************** */ /* ScalaFX */ /* ********************************************************************** */ - final val scalaFxVersion = "8.0.144-R12" + // final val scalaFxVersion = "8.0.144-R12" + final val scalaFxVersion = "12.0.2-R18" val scalaFx = "org.scalafx" %% "scalafx" % scalaFxVersion diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala index b69a49f..16e2c99 100644 --- a/project/ProjectSettings.scala +++ b/project/ProjectSettings.scala @@ -11,11 +11,11 @@ trait ProjectSettings override final val githubOrganization = "sarahgerweck" override final val githubProject = "scalafx-utils" - override final val buildScalaVersion = "2.12.5" - override final val extraScalaVersions = Seq("2.11.12") + override final val buildScalaVersion = "2.13.1" + override final val extraScalaVersions = Seq("2.11.12", "2.12.5") override final val defaultOptimize = true override final val defaultOptimizeGlobal = false - override final val extraScalacOptions = Seq("-Ypartial-unification") + override final val extraScalacOptions = Seq() // Seq("-Ypartial-unification") override final val sonatypeResolver = true diff --git a/project/build.properties b/project/build.properties index 64cf32f..a919a9b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.4 +sbt.version=1.3.8